gettext_i18n_rails 1.12.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ca313fab159243b410640c4fdd81980a9f9a9c9f7500b904b1b520cd25a596
-  data.tar.gz: 63f42039049902975af11131868ee12906d137151f43bdd5e86551fadc733080
+  metadata.gz: d6f129920dbc0bcf74d1cb3b768fb531bd595e3cc44af83839a8fed19c1aadd0
+  data.tar.gz: c652d355c849d08f550b7389667b4ce9379ab093922a4d0e030a9b5490e75e00
 SHA512:
-  metadata.gz: d07bbab9c35abdb23b4e208b22c08c9be2051ac64dfa043c9a47013ca6ff92c8741356b950df53e809d90003c44db6183e9167e34a83856242c6a0d80c113486
-  data.tar.gz: aba525c859c885518513c71d2086d2bfe1cb65fa48c3781bf8ac64a9e1d8009626519011b4011d7b51f9ca10ab9a8e1ffb71dcc269586fe97ecf82ceb0afa7de
+  metadata.gz: e3d45fdb03b533d47c02cbacd11e73327067a0d5b21292b4ec837de0e75fd5b372684fddd7e1738b3b117ec26fb0e833a01575669f4531e53f84a269aff05cd7
+  data.tar.gz: 7ed7822538d657851887b62f4d60a8a047298d734870f950f3a4050bfbd4b43c852ba8e18e5679ed18c87f40d656b27622c5747f7ea1e44d82adbc6fcfbc16a5

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -10,7 +10,15 @@ module ActiveModel
       if attribute.end_with?('_id')
         humanize_class_name(attribute)
       else
-        "#{inheritance_tree_root(self)}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
+        attribute_key = attribute.split('.').map! {|a| a.humanize }.join('|')
+        root = inheritance_tree_root(self).to_s
+
+        # in case of STI or no inheritance, first attempt retrieving the key for the current class
+        sti_key = "#{to_s}|#{attribute_key}"
+        return sti_key if to_s == root || FastGettext.cached_find(sti_key)
+
+        # fallback to lookup for the root class
+        return "#{root}|#{attribute_key}" 
       end
     end
 

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -18,6 +18,7 @@ module GettextI18nRails
           end
         end
         f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+        f.puts "{}"
       end
     rescue
       puts "[Error] Attribute extraction failed. Removing incomplete file (#{file})"
@@ -46,6 +47,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 +65,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 +80,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.12.0'
+  Version = VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -108,34 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +140,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 description:
 email: michael@grosser.it
 executables: []
@@ -216,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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.