gettext_i18n_rails 1.8.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03205ca066f3c898e4da0ec0a8262e4fd0127498b5c975c0b5b2935062d146f5
-  data.tar.gz: c1d50f46d8a6e4805d3ddec69c4a1965fdafdc5b06ecea0534c2cb1e7cec4b45
+  metadata.gz: 21ca313fab159243b410640c4fdd81980a9f9a9c9f7500b904b1b520cd25a596
+  data.tar.gz: 63f42039049902975af11131868ee12906d137151f43bdd5e86551fadc733080
 SHA512:
-  metadata.gz: 660ee38d092d0538f4ced161e32c0976edbf58c2ce5a4230b32729787103728f18ba6e5435ef185314ff4696762c929c1578c2c240a5ce5ca35fe79d259ba824
-  data.tar.gz: 7fa2d67dbe95ab585c01dd3f8c988f20a23f3d46cfadc99da0b04acd41d87deb5d932a859a7d7dda6f90d137df661c704458d5091db0e2d084a389b39eba47db
+  metadata.gz: d07bbab9c35abdb23b4e208b22c08c9be2051ac64dfa043c9a47013ca6ff92c8741356b950df53e809d90003c44db6183e9167e34a83856242c6a0d80c113486
+  data.tar.gz: aba525c859c885518513c71d2086d2bfe1cb65fa48c3781bf8ac64a9e1d8009626519011b4011d7b51f9ca10ab9a8e1ffb71dcc269586fe97ecf82ceb0afa7de

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -7,7 +7,7 @@ module ActiveModel
 
     def gettext_translation_for_attribute_name(attribute)
       attribute = attribute.to_s
-      if attribute.ends_with?('_id')
+      if attribute.end_with?('_id')
         humanize_class_name(attribute)
       else
         "#{inheritance_tree_root(self)}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"

data/lib/gettext_i18n_rails/backend.rb

@@ -5,8 +5,6 @@ module GettextI18nRails
     cattr_accessor :translate_defaults
     attr_accessor :backend
 
-    RUBY19 = (RUBY_VERSION > "1.9")
-
     def initialize(*args)
       self.backend = I18n::Backend::Simple.new(*args)
     end
@@ -16,13 +14,20 @@ module GettextI18nRails
     end
 
     def translate(locale, key, options)
-      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
     end
 

data/lib/gettext_i18n_rails/base_parser.rb

@@ -6,13 +6,10 @@ module GettextI18nRails
       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 @@ module GettextI18nRails
         return false
       end
 
-      require 'gettext_i18n_rails/ruby_gettext_extractor'
+      require 'gettext/tools/parser/ruby'
       @library_loaded = loaded
     end
   end

data/lib/gettext_i18n_rails/gettext_hooks.rb

@@ -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

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -9,7 +9,11 @@ module GettextI18nRails
     def self.convert_to_code(text)
       case @library_loaded
       when "haml"
-        Haml::Engine.new(text).precompiled()
+        if Haml::VERSION.split('.').first.to_i <= 5
+          Haml::Engine.new(text).precompiled()
+        else
+          Haml::Engine.new.call(text)
+        end
       when "hamlit"
         Hamlit::Engine.new.call(text)
       end

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -65,6 +65,8 @@ module GettextI18nRails
 
     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
 

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '1.8.1'
+  Version = VERSION = '1.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: hamlit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,35 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sexp_processor
+  name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -199,7 +199,6 @@ files:
 - 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
@@ -209,7 +208,7 @@ homepage: http://github.com/grosser/gettext_i18n_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Simple FastGettext Rails integration.
 test_files: []

data/lib/gettext_i18n_rails/ruby_gettext_extractor.rb

@@ -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