gettext_i18n_rails 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae7769503d78af47afa65bce415dcf9ed13465b6a561ea91b314ccc624149ff
-  data.tar.gz: 801ac8e2d1a5c02911e27112ba80c4478de3f41aaf2cb0aef16c518c5231ac47
+  metadata.gz: 69d12d7e3eebbd04ad80e403f237187601791f071ca5ff28d014b5c4a9bb08d8
+  data.tar.gz: cb74abbea8ef5e823ba2e6cf34c8f739ce3305d30cd7a5e431644c78e63dcc5a
 SHA512:
-  metadata.gz: cce87a14ed24586cb8617d78b10f4e9b7888ed88e7e1c18789a6543992f990a102bf6517e04507158d63c08d9a43218f97705bd5c8f22709cbf5e0b76e8bde37
-  data.tar.gz: 3453bc4d44067f5927880805ebd51d9d74fc3cf4f8a83ac8db3bdc6cedf7ade2f9db523d5f0e5ba6d16b0819856c911bf4f7df783c267560df64e430be2056b7
+  metadata.gz: a30e6228cc71ec651fcbb0a69ccc37ded90217a03e273fc3ed01eabed2993344681b4a0c40f4ae674574fd19acd3400c7913397a03573c35dfd16929ab8d5a79
+  data.tar.gz: fa9ec02c26510fc184b3c0d1476ca595e7f5212a30037c597cf04f535e1ecad8538f452fbd707b438073f21b979f147a26bee2b817097d5bc79055b145325409

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/model_attributes_finder.rb

@@ -46,6 +46,17 @@ module GettextI18nRails
       @existing_tables = (Rails::VERSION::MAJOR >= 5 ? connection.data_sources : connection.tables)
     end
 
+    # Rails 7.0 has deprecated direct_descendants in favor of subclasses.
+    # It was removed completely in Rails 7.1.
+    # This will maintain backwards compatibility with Rails 3.0 - 6.1
+    def subclass_method
+      if Rails::VERSION::MAJOR < 7
+        :direct_descendants
+      else
+        :subclasses
+      end
+    end
+
     # Rails < 3.0 doesn't have DescendantsTracker.
     # Instead of iterating over ObjectSpace (slow) the decision was made NOT to support
     # class hierarchies with abstract base classes in Rails 2.x
@@ -53,7 +64,7 @@ module GettextI18nRails
       return [] if model.abstract_class? && Rails::VERSION::MAJOR < 3
 
       if model.abstract_class?
-        model.direct_descendants.reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
+        model.send(subclass_method).reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
           attrs.push(model_attributes(m, ignored_tables, ignored_cols)).flatten.uniq
         end
       elsif !ignored?(model.table_name, ignored_tables) && @existing_tables.include?(model.table_name)
@@ -68,11 +79,11 @@ module GettextI18nRails
         # 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
+        descendants = ::ActiveRecord::Base.send(subclass_method)
 
         # In rails 5+ user models are supposed to inherit from ApplicationRecord
         if defined?(::ApplicationRecord)
-          descendants += ApplicationRecord.direct_descendants
+          descendants += ApplicationRecord.send(subclass_method)
           descendants.delete ApplicationRecord
         end
 

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '1.11.0'
+  Version = VERSION = '1.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -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
@@ -224,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Simple FastGettext Rails integration.

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