Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-gettext_i18n_rails for openSUSE:Factory checked in at 2023-11-15 21:07:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-gettext_i18n_rails (Old) and /work/SRC/openSUSE:Factory/.rubygem-gettext_i18n_rails.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-gettext_i18n_rails" Wed Nov 15 21:07:36 2023 rev:27 rq:1126262 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-gettext_i18n_rails/rubygem-gettext_i18n_rails.changes 2022-10-30 18:29:01.530445832 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-gettext_i18n_rails.new.17445/rubygem-gettext_i18n_rails.changes 2023-11-15 21:08:39.516410161 +0100 @@ -1,0 +2,5 @@ +Tue Nov 14 15:01:31 UTC 2023 - Dan Äermák <dan.cer...@posteo.net> + +- New upstream release 1.12.0, no changelog found + +------------------------------------------------------------------- Old: ---- gettext_i18n_rails-1.9.0.gem New: ---- gettext_i18n_rails-1.12.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-gettext_i18n_rails.spec ++++++ --- /var/tmp/diff_new_pack.jxpIrb/_old 2023-11-15 21:08:43.868570736 +0100 +++ /var/tmp/diff_new_pack.jxpIrb/_new 2023-11-15 21:08:43.884571327 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-gettext_i18n_rails # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,10 @@ # Name: rubygem-gettext_i18n_rails -Version: 1.9.0 +Version: 1.12.0 Release: 0 %define mod_name gettext_i18n_rails %define mod_full_name %{mod_name}-%{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{ruby >= 2.1.0} BuildRequires: %{rubygem gem2rpm} BuildRequires: ruby-macros >= 5 @@ -37,7 +36,6 @@ Source1: gem2rpm.yml Summary: Simple FastGettext Rails integration License: MIT -Group: Development/Languages/Ruby %description Simple FastGettext Rails integration. ++++++ gettext_i18n_rails-1.9.0.gem -> gettext_i18n_rails-1.12.0.gem ++++++ Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/backend.rb new/lib/gettext_i18n_rails/backend.rb --- old/lib/gettext_i18n_rails/backend.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/backend.rb 2023-06-21 16:49:14.000000000 +0200 @@ -5,8 +5,6 @@ cattr_accessor :translate_defaults attr_accessor :backend - RUBY19 = (RUBY_VERSION > "1.9") - def initialize(*args) self.backend = I18n::Backend::Simple.new(*args) end @@ -16,17 +14,21 @@ end def translate(locale, key, options) - current_locale = FastGettext.set_locale locale - if gettext_key = gettext_key(key, options) - translation = - plural_translate(gettext_key, options) || FastGettext._(gettext_key) - interpolate(translation, options) - else - result = backend.translate(locale, key, options) - (RUBY19 and result.is_a?(String)) ? result.force_encoding("UTF-8") : result + I18n.with_locale(locale) do + if gettext_key = gettext_key(key, options) + translation = + plural_translate(gettext_key, options) || FastGettext._(gettext_key) + interpolate(translation, options) + else + result = backend.translate(locale, key, options) + if result.is_a?(String) + result = result.dup if result.frozen? + result.force_encoding("UTF-8") + else + result + end + end end - ensure - FastGettext.set_locale current_locale end def method_missing(method, *args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/base_parser.rb new/lib/gettext_i18n_rails/base_parser.rb --- old/lib/gettext_i18n_rails/base_parser.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/base_parser.rb 2023-06-21 16:49:14.000000000 +0200 @@ -6,13 +6,10 @@ File.extname(file) == ".#{extension}" end - def self.parse(file, _options = {}, msgids = []) - return msgids unless load_library + def self.parse(file, options = {}, _msgids = []) + return _msgids unless load_library code = convert_to_code(File.read(file)) - RubyGettextExtractor.parse_string(code, msgids, file) - rescue Racc::ParseError => e - $stderr.puts "file ignored: ruby_parser cannot read #{extension} files with 1.9 syntax --- #{file}: (#{e.message.strip})" - return msgids + GetText::RubyParser.new(file, options).parse_source(code) end def self.libraries @@ -37,7 +34,7 @@ return false end - require 'gettext_i18n_rails/ruby_gettext_extractor' + require 'gettext/tools/parser/ruby' @library_loaded = loaded end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/gettext_hooks.rb new/lib/gettext_i18n_rails/gettext_hooks.rb --- old/lib/gettext_i18n_rails/gettext_hooks.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/gettext_hooks.rb 2023-06-21 16:49:14.000000000 +0200 @@ -1,22 +1,14 @@ module GettextI18nRails module GettextHooks - # shoarter call / maybe the interface changes again ... + # shorter call / maybe the interface changes again ... def self.add_parser(parser) xgettext.add_parser(parser) end def self.xgettext @xgettext ||= begin - require 'gettext/tools/xgettext' # 2.3+ + require 'gettext/tools/xgettext' GetText::Tools::XGetText - rescue LoadError - begin - require 'gettext/tools/rgettext' # 2.0 - 2.2 - GetText::RGetText - rescue LoadError # # 1.x - require 'gettext/rgettext' - GetText::RGetText - end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/model_attributes_finder.rb new/lib/gettext_i18n_rails/model_attributes_finder.rb --- old/lib/gettext_i18n_rails/model_attributes_finder.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/model_attributes_finder.rb 2023-06-21 16:49:14.000000000 +0200 @@ -65,6 +65,8 @@ def models if Rails::VERSION::MAJOR >= 3 + # Ensure autoloaders are set up before we attempt to eager load! + Rails.application.autoloaders.each(&:setup) if Rails.application.respond_to?(:autoloaders) Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works descendants = ::ActiveRecord::Base.direct_descendants diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/ruby_gettext_extractor.rb new/lib/gettext_i18n_rails/ruby_gettext_extractor.rb --- old/lib/gettext_i18n_rails/ruby_gettext_extractor.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/ruby_gettext_extractor.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -gem 'ruby_parser', '>= 3.7.1' # sync with gemspec -require 'ruby_parser' - -gem 'sexp_processor' -require 'sexp_processor' - -module RubyGettextExtractor - extend self - - def parse(file, targets = []) # :nodoc: - parse_string(File.read(file), targets, file) - end - - def parse_string(content, targets = [], file) - syntax_tree = RubyParser.for_current_ruby.parse(content, file) - - processor = Extractor.new(targets) - processor.require_empty = false - processor.process(syntax_tree) - - processor.results - end - - class Extractor < SexpProcessor - attr_reader :results - - def initialize(targets) - @targets = {} - @results = [] - - targets.each do |a| - k, _v = a - # things go wrong if k already exists, but this - # should not happen (according to the gettext doc) - @targets[k] = a - @results << a - end - - super() - end - - def extract_string(node) - case node.first - when :str - node.last - when :call - type, recv, meth, args = node - # node has to be in form of "string" + "other_string" - return nil unless recv && meth == :+ - - first_part = extract_string(recv) - second_part = extract_string(args) - - first_part && second_part ? first_part.to_s + second_part.to_s : nil - else - nil - end - end - - def extract_key_singular(args, separator) - key = extract_string(args) if args.size == 2 || args.size == 4 - - return nil unless key - key.gsub("\n", '\n').gsub("\t", '\t').gsub("\0", '\0') - end - - def extract_key_plural(args, separator) - # this could be n_("aaa", "aaa plural", @retireitems.length) - # s(s(:str, "aaa"), - # s(:str, "aaa plural"), - # s(:call, s(:ivar, :@retireitems), :length)) - # all strings arguments are extracted and joined with \004 or \000 - arguments = args[0..(-2)] - - res = [] - arguments.each do |a| - next unless a.kind_of? Sexp - str = extract_string(a) - res << str if str - end - - key = res.empty? ? nil : res.join(separator) - - return nil unless key - key.gsub("\n", '\n').gsub("\t", '\t').gsub("\0", '\0') - end - - def store_key(key, args) - if key - res = @targets[key] - - unless res - res = [key] - @results << res - @targets[key] = res - end - - res << "#{args.file}:#{args.line}" - end - end - - def gettext_simple_call(args) - # args comes in 2 forms: - # s(s(:str, "Button Group Order:")) - # s(:str, "Button Group Order:") - # normalizing: - args = args.first if Sexp === args.sexp_type - - key = extract_key_singular(args, "\004") - store_key(key, args) - end - - def gettext_plural_call(args) - key = extract_key_plural(args, "\000") - store_key(key, args) - end - - def process_call exp - _call = exp.shift - _recv = process exp.shift - meth = exp.shift - - case meth - when :_, :p_, :N_, :pgettext, :s_ - gettext_simple_call(exp) - when :n_ - gettext_plural_call(exp) - end - - until exp.empty? do - process(exp.shift) - end - - s() - end - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/gettext_i18n_rails/version.rb new/lib/gettext_i18n_rails/version.rb --- old/lib/gettext_i18n_rails/version.rb 2022-10-13 06:12:32.000000000 +0200 +++ new/lib/gettext_i18n_rails/version.rb 2023-06-21 16:49:14.000000000 +0200 @@ -1,3 +1,3 @@ module GettextI18nRails - Version = VERSION = '1.9.0' + Version = VERSION = '1.12.0' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2022-10-13 06:12:32.000000000 +0200 +++ new/metadata 2023-06-21 16:49:14.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: gettext_i18n_rails version: !ruby/object:Gem::Version - version: 1.9.0 + version: 1.12.0 platform: ruby authors: - Michael Grosser autorequire: bindir: bin cert_chain: [] -date: 2022-10-13 00:00:00.000000000 Z +date: 2023-06-21 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: fast_gettext @@ -199,7 +199,6 @@ - lib/gettext_i18n_rails/i18n_hacks.rb - lib/gettext_i18n_rails/model_attributes_finder.rb - lib/gettext_i18n_rails/railtie.rb -- lib/gettext_i18n_rails/ruby_gettext_extractor.rb - lib/gettext_i18n_rails/slim_parser.rb - lib/gettext_i18n_rails/string_interpolate_fix.rb - lib/gettext_i18n_rails/tasks.rb