mobility 1.2.9 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2836c1681d1832331e807e58fa61956426ddc3cc730c15e6b3d6ebac2fce40
-  data.tar.gz: 61c798b73769f7d73bb5a3a97b3a1a27ac8884a186df89aeb5ceef0ecb92b692
+  metadata.gz: e29c8ed1c4b5ff644843c06c90fa46ce9fa9dd951a64dfb40b2ff33961483edd
+  data.tar.gz: '0708f6107d1ac5a80fd99c7d7d098e6915c10ad457cf962fdcc8510bced56f58'
 SHA512:
-  metadata.gz: e8693fb2b5d997a1d7029413aee5c5f064eeafbef6f8a10ad2c947bd545fff72e238f6d57ebaae8761d5948e036446d310f7ce9da3c047a7577818919dfd7908
-  data.tar.gz: e980cc7d53a32c517c04994105540fd9635aae5899d35cecb1544a36ef052619adb0647b58ec666902402e8ad642c85aa576f0301d3708211e83b5f3d0e6d95b
+  metadata.gz: 87975b6d967a5944c5cc5f1b0bc154eeff73437fd3a0bde826195236e070533cfc2ffbaa1188a3791d8bfb439179005210712a9a91894a9212881113b74a1910
+  data.tar.gz: d77ff76539f6f847ded56cada8746cd64a2398ddd2fe1fd33758f129ba737e996e083797e7dabe0769f9e41ab06f73b50b2f56635f8e9d5ab2e23f9c787408fa

data/CHANGELOG.md

@@ -1,5 +1,61 @@
 # Mobility Changelog
 
+## 1.3
+
+### 1.3.1
+
+- Use classify to generate table name
+  ([#634](https://github.com/shioyama/mobility/pull/634)), thanks
+  [divanburger](https://github.com/divanburger)!
+- Fix select + count in ActiveRecord
+  8 ([#659](https://github.com/shioyama/mobility/pull/659))
+
+### 1.3.0
+
+- Only support ActiveRecord >= 7.0
+- Allow `I18n.available_locales` to contain Strings
+  ([#612](https://github.com/shioyama/mobility/pull/612))
+- Update CI config, add support for Rails 8
+  ([#653](https://github.com/shioyama/mobility/pull/653)), thanks
+  [d-rodriguez](https://github.com/n-rodriguez)!
+- Fix broken count statements in Active Record 8.0
+  ([#655](https://github.com/shioyama/mobility/pull/655)), thanks
+  [jukra](https://github.com/jukra)!
+
+### 1.3.0.rc3
+
+- Don't try to load generators if Rails is loaded but AR is not
+  ([#627](https://github.com/shioyama/mobility/pull/627)), thanks
+  [flop](https://github.com/flop)!
+- Allow compound foreign keys
+  ([#632](https://github.com/shioyama/mobility/pull/632)), thanks
+  [mival](https://github.com/mival)!
+- Fix active model `*_previously_changed?` and active record
+  `will_save_change_to_*?` and `saved_change_to_*?` dirty methods to accept
+  kwargs ([#639](https://github.com/shioyama/mobility/pull/639)) thanks
+  [doits](https://github.com/doits)!
+
+### 1.3.0.rc2
+
+- Pass `coder` as keyword argument to `serialize` (ActiveRecord version > 7.1)
+  ([#617](https://github.com/shioyama/mobility/pull/617))
+
+### 1.3.0.rc1
+
+This version includes potentially breaking chnages for jsonb and hstore
+backends. See PRs below for details.
+
+- Fix ActiveRecord JSONB blank values
+  ([#536](https://github.com/shioyama/mobility/pull/536))
+- Support primary keys other then :id on model classes
+  ([#542](https://github.com/shioyama/mobility/pull/542))
+- Clean up and refactor container backend
+  ([#543](https://github.com/shioyama/mobility/pull/543)),
+  thanks [doits](https://github.com/doits)!
+- Update fallthrough_accessor regex to allow for ISO 639-2 codes
+  ([#580](https://github.com/shioyama/mobility/pull/580))
+  thanks [phil-allcock](https://github.com/phil-allcock)!
+
 ## 1.2
 
 ### 1.2.9
@@ -11,7 +67,8 @@
 - Fix issues with subclassing, such as when using AR STI,
   fixes [#566](https://github.com/shioyama/mobility/issues/566)
   ([#568](https://github.com/shioyama/mobility/pull/568))
-- Handle attribute_method_matchers rename (part of #560)
+- Handle `attribute_method_matchers` rename (part of
+  [#560](https://github.com/shioyama/mobility/pull/560))
 
 ### 1.2.7
 - Do not query same attribute more than once, fixes

data/Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   when 'active_record'
     orm_version ||= '7.0'
     case orm_version
-    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0'
+    when '6.1', '7.0', '7.1', '7.2', '8.0'
       gem 'activerecord', "~> #{orm_version}.0"
     when 'edge'
       git 'https://github.com/rails/rails.git', branch: 'main' do
@@ -45,19 +45,15 @@ group :development, :test do
     gem 'pry-byebug'
     case ENV['DB']
     when 'sqlite3'
-      if orm == 'active_record' && orm_version < '5.2'
-        gem 'sqlite3', '~> 1.3.13'
+      if orm == 'active_record' && orm_version >= '8.0'
+        gem 'sqlite3', '>= 2.1.0'
       else
-        gem 'sqlite3', '~> 1.4.1'
+        gem 'sqlite3', '~> 1.5.0'
       end
     when 'mysql'
       gem 'mysql2'
     when 'postgres'
-      if orm == 'active_record' && orm_version < '5.0'
-        gem 'pg', '< 1.0'
-      else
-        gem 'pg'
-      end
+      gem 'pg'
     end
   end
 end

data/Gemfile.lock

@@ -1,32 +1,46 @@
 PATH
   remote: .
   specs:
-    mobility (1.2.8)
+    mobility (1.3.0)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activerecord (7.0.3)
-      activemodel (= 7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
+      timeout (>= 0.4.0)
+    activesupport (8.0.0)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    benchmark-ips (2.10.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    benchmark-ips (2.14.0)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     database_cleaner (1.99.0)
-    diff-lcs (1.5.0)
-    ffi (1.15.5)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    ffi (1.17.0-x86_64-linux-gnu)
     formatador (1.1.0)
-    guard (2.18.0)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -40,67 +54,69 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.10.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    minitest (5.16.1)
+    logger (1.6.1)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    minitest (5.25.2)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pg (1.3.5)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rack (2.2.3.1)
+      pry (>= 0.13, < 0.15)
+    rack (2.2.7)
     rake (12.3.3)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    request_store (1.5.1)
+    request_store (1.7.0)
       rack (>= 1.4)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.2)
     shellany (0.0.1)
-    thor (1.2.1)
-    tzinfo (2.0.4)
+    sqlite3 (2.3.1-x86_64-linux-gnu)
+    thor (1.3.2)
+    timeout (0.4.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    uri (1.0.2)
+    yard (0.9.37)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  activerecord (~> 7.0.0)
+  activerecord (~> 8.0.0)
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
   mobility!
-  pg
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
+  sqlite3 (>= 2.1.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.10

data/README.md

@@ -4,7 +4,6 @@ Mobility
 [![Gem Version](https://badge.fury.io/rb/mobility.svg)][gem]
 [![Build Status](https://github.com/shioyama/mobility/workflows/CI/badge.svg)][actions]
 [![Code Climate](https://api.codeclimate.com/v1/badges/72200f2b00c339ec4537/maintainability.svg)][codeclimate]
-[![Gitter Chat](https://badges.gitter.im/mobility-ruby/mobility.svg)](https://gitter.im/mobility-ruby/mobility)
 
 [gem]: https://rubygems.org/gems/mobility
 [actions]: https://github.com/shioyama/mobility/actions
@@ -55,17 +54,13 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.2.9'
+gem 'mobility', '~> 1.3.1'
 ```
 
 ### ActiveRecord (Rails)
 
 Requirements:
-- ActiveRecord >= 5.0 (including 6.x)
-
-(Support for most backends and features is also supported with
-ActiveRecord/Rails 4.2, but there are some tests still failing. To see exactly
-what might not work, check pending specs in Rails 4.2 builds.)
+- ActiveRecord >= 7.0
 
 To translate attributes on a model, extend `Mobility`, then call `translates`
 passing in one or more attributes as well as a hash of options (see below).
@@ -1027,6 +1022,7 @@ Integrations
 * [mobility-actiontext](https://github.com/sedubois/mobility-actiontext): Translate
   Rails [Action Text](https://guides.rubyonrails.org/action_text_overview.html) rich text
   with Mobility.
+* [mobility_typed](https://github.com/GeorgeGorbanev/mobility_typed): Add type checking to Rails models accessors.
 
 Tutorials
 ---------

data/lib/mobility/backends/active_record/container.rb

@@ -22,7 +22,11 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
       # @param [Hash] options
       # @return [String,Integer,Boolean] Value of translation
       def read(locale, _ = nil)
-        model_translations(locale)[attribute]
+        locale_translations = model_translations(locale)
+
+        return unless locale_translations
+
+        locale_translations[attribute.to_s]
       end
 
       # @note Translation may be a string, integer, boolean, hash or array
@@ -33,7 +37,7 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
       # @return [String,Integer,Boolean] Updated value
       def write(locale, value, _ = nil)
         set_attribute_translation(locale, value)
-        model_translations(locale)[attribute]
+        read(locale)
       end
       # @!endgroup
 
@@ -42,8 +46,7 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
         # @option options [Symbol] column_name (:translations) Name of column on which to store translations
         # @raise [InvalidColumnType] if the type of the container column is not json or jsonb
         def configure(options)
-          options[:column_name] ||= :translations
-          options[:column_name] = options[:column_name].to_sym
+          options[:column_name] = options[:column_name]&.to_sym || :translations
         end
         # @!endgroup
 
@@ -78,61 +81,31 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
 
       # @!macro backend_iterator
       def each_locale
-        model[column_name].each do |l, v|
-          yield l.to_sym if v.present?
-        end
-      end
-
-      setup do |_attributes, options|
-        store options[:column_name], coder: Coder
-
-        # Fix for duping depth-2 jsonb column in AR < 5.0
-        if ::ActiveRecord::VERSION::STRING < '5.0'
-          column_name = options[:column_name]
-          module_name = "MobilityArContainer#{column_name.to_s.camelcase}"
-          unless const_defined?(module_name)
-            dupable = Module.new do
-              class_eval <<-EOM, __FILE__, __LINE__ + 1
-                def initialize_dup(source)
-                  super
-                  self.#{column_name} = source.#{column_name}.deep_dup
-                end
-              EOM
-            end
-            include const_set(module_name, dupable)
-          end
+        model[column_name].each_key do |l|
+          yield l.to_sym
         end
       end
 
       private
 
       def model_translations(locale)
-        model[column_name][locale] ||= {}
+        model[column_name][locale.to_s]
       end
 
       def set_attribute_translation(locale, value)
-        translations = model[column_name] || {}
-        translations[locale.to_s] ||= {}
-        translations[locale.to_s][attribute] = value
-        model[column_name] = translations
-      end
+        locale_translations = model_translations(locale)
 
-      class Coder
-        def self.dump(obj)
-          if obj.is_a? ::Hash
-            obj.inject({}) do |translations, (locale, value)|
-              value.each do |k, v|
-                (translations[locale] ||= {})[k] = v if v.present?
-              end
-              translations
-            end
+        if locale_translations
+          if value.nil?
+            locale_translations.delete(attribute.to_s)
+
+            # delete empty locale hash if last attribute was just deleted
+            model[column_name].delete(locale.to_s) if locale_translations.empty?
           else
-            raise ArgumentError, "Attribute is supposed to be a Hash, but was a #{obj.class}. -- #{obj.inspect}"
+            locale_translations[attribute.to_s] = value
           end
-        end
-
-        def self.load(obj)
-          obj
+        elsif !value.nil?
+          model[column_name][locale.to_s] = { attribute.to_s => value }
         end
       end
 

data/lib/mobility/backends/active_record/key_value.rb

@@ -138,7 +138,7 @@ Implements the {Mobility::Backends::KeyValue} backend for ActiveRecord models.
                          on(t[key_column].eq(key).
                             and(t[:locale].eq(locale).
                                 and(t[:"#{belongs_to}_type"].eq(model_class.base_class.name).
-                                    and(t[:"#{belongs_to}_id"].eq(m[:id]))))).join_sources)
+                                    and(t[:"#{belongs_to}_id"].eq(m[model_class.primary_key] || m[:id]))))).join_sources)
         end
 
         def already_joined?(relation, name, locale, join_type)

data/lib/mobility/backends/active_record/pg_hash.rb

@@ -15,34 +15,25 @@ Internal class used by ActiveRecord backends backed by a Postgres data type
         include ActiveRecord
         include HashValued
 
-        # @!macro backend_iterator
-        def each_locale
-          super { |l| yield l.to_sym }
+        def read(locale, _options = nil)
+          translations[locale.to_s]
         end
 
-        def translations
-          model.read_attribute(column_name)
+        def write(locale, value, _options = nil)
+          if value.nil?
+            translations.delete(locale.to_s)
+          else
+            translations[locale.to_s] = value
+          end
         end
 
-        setup do |attributes, options = {}|
-          attributes.each { |attribute| store (options[:column_affix] % attribute), coder: Coder }
+        # @!macro backend_iterator
+        def each_locale
+          super { |l| yield l.to_sym }
         end
 
-        class Coder
-          def self.dump(obj)
-            if obj.is_a? ::Hash
-              obj.inject({}) do |translations, (locale, value)|
-                translations[locale] = value unless value.nil?
-                translations
-              end
-            else
-              raise ArgumentError, "Attribute is supposed to be a Hash, but was a #{obj.class}. -- #{obj.inspect}"
-            end
-          end
-
-          def self.load(obj)
-            obj
-          end
+        def translations
+          model[column_name]
         end
       end
       private_constant :PgHash

data/lib/mobility/backends/active_record/serialized.rb

@@ -51,7 +51,13 @@ Implements {Mobility::Backends::Serialized} backend for ActiveRecord models.
 
       setup do |attributes, options|
         coder = { yaml: YAMLCoder, json: JSONCoder }[options[:format]]
-        attributes.each { |attribute| serialize (options[:column_affix] % attribute), coder }
+        attributes.each do |attribute|
+          if (::ActiveRecord::VERSION::STRING >= "7.1")
+            serialize (options[:column_affix] % attribute), coder: coder
+          else
+            serialize (options[:column_affix] % attribute), coder
+          end
+        end
       end
 
       # @!group Cache Methods

data/lib/mobility/backends/active_record/table.rb

@@ -102,14 +102,20 @@ columns to that table.
         def configure(options)
           table_name = model_class.table_name
           options[:table_name]  ||= "#{table_name.singularize}_translations"
-          options[:foreign_key] ||= table_name.downcase.singularize.camelize.foreign_key
+          options[:foreign_key] ||= table_name.classify.foreign_key
           if (association_name = options[:association_name]).present?
             options[:subclass_name] ||= association_name.to_s.singularize.camelize.freeze
           else
             options[:association_name] = :translations
             options[:subclass_name] ||= :Translation
           end
-          %i[foreign_key association_name subclass_name table_name].each { |key| options[key] = options[key].to_sym }
+          %i[foreign_key association_name subclass_name table_name].each { |key|
+          if options[key].is_a?(Enumerable)
+              options[key] = options[key].map!(&:to_sym)
+            else
+              options[key] = options[key].to_sym
+            end
+          }
         end
         # @!endgroup
 
@@ -145,7 +151,7 @@ columns to that table.
           m = model_class.arel_table
           t = model_class.const_get(subclass_name).arel_table.alias(table_alias(locale))
           relation.joins(m.join(t, join_type).
-                         on(t[foreign_key].eq(m[:id]).
+                         on(t[foreign_key].eq(m[model_class.primary_key] || m[:id]).
                             and(t[:locale].eq(locale))).join_sources)
         end
 

data/lib/mobility/plugins/active_model/dirty.rb

@@ -119,6 +119,14 @@ the ActiveRecord dirty plugin for more information.
         class HandlerMethodsBuilder < Module
           attr_reader :klass
 
+          PATTERNS_WITH_KWARGS =
+            %w[
+              %s_changed?
+              %s_previously_changed?
+              will_save_change_to_%s?
+              saved_change_to_%s?
+            ].freeze
+
           # @param [Class] klass Dirty class to mimic
           def initialize(klass)
             @klass = klass
@@ -135,7 +143,7 @@ the ActiveRecord dirty plugin for more information.
             public_patterns.each do |pattern|
               method_name = pattern % 'attribute'
 
-              kwargs = pattern == '%s_changed?' ? ', **kwargs' : ''
+              kwargs = PATTERNS_WITH_KWARGS.include?(pattern) ? ', **kwargs' : ''
               module_eval <<-EOM, __FILE__, __LINE__ + 1
               def #{method_name}(attr_name, *rest#{kwargs})
                 if (mutations_from_mobility.attribute_changed?(attr_name) ||
@@ -298,8 +306,10 @@ the ActiveRecord dirty plugin for more information.
               (OPTION_NOT_GIVEN == to || fetch_value(attr_name) == to)
           end
 
-          def attribute_previously_changed?(attr_name)
-            previous_changes.include?(attr_name)
+          def attribute_previously_changed?(attr_name, from: OPTION_NOT_GIVEN, to: OPTION_NOT_GIVEN)
+            previous_changes.include?(attr_name) &&
+              (OPTION_NOT_GIVEN == from || attribute_previous_change(attr_name).first == from) &&
+              (OPTION_NOT_GIVEN == to || attribute_previous_change(attr_name).second == to)
           end
 
           def attribute_was(attr_name)

data/lib/mobility/plugins/active_record/dirty.rb

@@ -79,28 +79,24 @@ locale suffix, so +title_en+, +title_pt_br+, etc.)
         )
 
         module InstanceMethods
-          if ::ActiveRecord::VERSION::STRING >= '5.1' # define patterns added in 5.1
-            def saved_changes
-              super.merge(mutations_from_mobility.previous_changes)
-            end
+          def saved_changes
+            super.merge(mutations_from_mobility.previous_changes)
+          end
 
-            def changes_to_save
-              super.merge(mutations_from_mobility.changes)
-            end
+          def changes_to_save
+            super.merge(mutations_from_mobility.changes)
+          end
 
-            def changed_attribute_names_to_save
-              super + mutations_from_mobility.changed
-            end
+          def changed_attribute_names_to_save
+            super + mutations_from_mobility.changed
+          end
 
-            def attributes_in_database
-              super.merge(mutations_from_mobility.changed_attributes)
-            end
+          def attributes_in_database
+            super.merge(mutations_from_mobility.changed_attributes)
+          end
 
-            if ::ActiveRecord::VERSION::STRING >= '6.0'
-              def has_changes_to_save?
-                super || mutations_from_mobility.changed?
-              end
-            end
+          def has_changes_to_save?
+            super || mutations_from_mobility.changed?
           end
 
           def reload(*)

data/lib/mobility/plugins/active_record/query.rb

@@ -21,6 +21,9 @@ enabled for any one attribute on the model.
 
         requires :query, include: false
 
+        ATTRIBUTE_ALIAS_PREFIX = "__mobility_"
+        ATTRIBUTE_ALIAS = "#{ATTRIBUTE_ALIAS_PREFIX}%s_%s__"
+
         included_hook do |klass, backend_class|
           plugin = self
           if options[:query]
@@ -39,7 +42,7 @@ enabled for any one attribute on the model.
 
         class << self
           def attribute_alias(attribute, locale = Mobility.locale)
-            "__mobility_%s_%s__"  % [attribute, ::Mobility.normalize_locale(locale)]
+            ATTRIBUTE_ALIAS % [attribute, ::Mobility.normalize_locale(locale)]
           end
 
           def build_query(klass, locale = Mobility.locale, &block)
@@ -137,19 +140,19 @@ enabled for any one attribute on the model.
           end
 
           def order(opts, *rest)
-            return super unless @klass.respond_to?(:mobility_attribute?)
+            return super unless klass.respond_to?(:mobility_attribute?)
 
             case opts
             when Symbol, String
-              @klass.mobility_attribute?(opts) ? order({ opts => :asc }, *rest) : super
+              klass.mobility_attribute?(opts) ? order({ opts => :asc }, *rest) : super
             when ::Hash
-              i18n_keys, keys = opts.keys.partition(&@klass.method(:mobility_attribute?))
+              i18n_keys, keys = opts.keys.partition(&klass.method(:mobility_attribute?))
               return super if i18n_keys.empty?
 
               base = keys.empty? ? self : super(opts.slice(keys))
 
               i18n_keys.inject(base) do |query, key|
-                backend_class = @klass.mobility_backend_class(key)
+                backend_class = klass.mobility_backend_class(key)
                 dir, node = opts[key], backend_node(key)
                 backend_class.apply_scope(query, node).order(node.send(dir.downcase))
               end
@@ -158,28 +161,47 @@ enabled for any one attribute on the model.
             end
           end
 
-          if ::ActiveRecord::VERSION::STRING >= '5.0'
-            %w[pluck group select].each do |method_name|
-              define_method method_name do |*attrs, &block|
-                return super(*attrs, &block) if (method_name == 'select' && block.present?)
+          %w[pluck group select].each do |method_name|
+            define_method method_name do |*attrs, &block|
+              return super(*attrs, &block) if (method_name == 'select' && block.present?)
 
-                return super(*attrs, &block) unless @klass.respond_to?(:mobility_attribute?)
+              return super(*attrs, &block) unless klass.respond_to?(:mobility_attribute?)
 
-                return super(*attrs, &block) unless attrs.any?(&@klass.method(:mobility_attribute?))
+              return super(*attrs, &block) unless attrs.any?(&klass.method(:mobility_attribute?))
 
-                keys = attrs.dup
+              keys = attrs.dup
 
-                base = keys.each_with_index.inject(self) do |query, (key, index)|
-                  next query unless @klass.mobility_attribute?(key)
-                  keys[index] = backend_node(key)
-                  if method_name == "select"
-                    keys[index] = keys[index]
-                      .as(::Mobility::Plugins::ActiveRecord::Query.attribute_alias(key.to_s))
-                  end
-                  @klass.mobility_backend_class(key).apply_scope(query, backend_node(key))
+              base = keys.each_with_index.inject(self) do |query, (key, index)|
+                next query unless klass.mobility_attribute?(key)
+                keys[index] = backend_node(key)
+                if method_name == "select"
+                  keys[index] = keys[index]
+                    .as(::Mobility::Plugins::ActiveRecord::Query.attribute_alias(key.to_s))
                 end
+                klass.mobility_backend_class(key).apply_scope(query, backend_node(key))
+              end
+
+              base.public_send(method_name, *keys, &block)
+            end
+          end
 
-                base.public_send(method_name, *keys, &block)
+          if ::ActiveRecord::VERSION::MAJOR >= 8
+            # Fix for https://github.com/shioyama/mobility/pull/654#issuecomment-2503479112
+            # TODO: Make this better
+            def select_for_count
+              return super unless klass.respond_to?(:mobility_attribute?)
+
+              if select_values.any? { |value| value.right.start_with?(ATTRIBUTE_ALIAS_PREFIX) }
+                filtered_select_values = select_values.map do |value|
+                  value.right.start_with?(ATTRIBUTE_ALIAS_PREFIX) ? value.left : value
+                end
+
+                # Copied from lib/active_record/relation/calculations.rb
+                with_connection do |conn|
+                  arel_columns(filtered_select_values).map { |column| conn.visitor.compile(column) }.join(", ")
+                end
+              else
+                super
               end
             end
           end
@@ -189,7 +211,7 @@ enabled for any one attribute on the model.
           # @param [Symbol] locale Locale
           # @return [Arel::Node] Arel node for this attribute in given locale
           def backend_node(name, locale = Mobility.locale)
-            @klass.mobility_backend_class(name)[name, locale]
+            klass.mobility_backend_class(name)[name, locale]
           end
 
           class WhereChain < ::ActiveRecord::QueryMethods::WhereChain

data/lib/mobility/plugins/arel/nodes/pg_ops.rb

@@ -26,17 +26,6 @@ module Mobility
           end)
         end
 
-        # Needed for AR 4.2, can be removed when support is deprecated
-        if ::ActiveRecord::VERSION::STRING < '5.0'
-          [JsonbDashDoubleArrow, HstoreDashArrow].each do |klass|
-            klass.class_eval do
-              def quoted_node other
-                other && super
-              end
-            end
-          end
-        end
-
         class Jsonb  < JsonbDashDoubleArrow
           def to_dash_arrow
             JsonbDashArrow.new left, right

data/lib/mobility/plugins/backend.rb

@@ -45,7 +45,7 @@ Defines:
         klass.extend ClassMethods
 
         if backend
-          @backend_class = backend.build_subclass(klass, backend_options)
+          @backend_class = backend.build_subclass(klass, **backend_options)
 
           backend_class.setup_model(klass, names)
 

data/lib/mobility/plugins/fallthrough_accessors.rb

@@ -36,7 +36,7 @@ model class is generated.
       private
 
       def define_fallthrough_accessors(*names)
-        method_name_regex = /\A(#{names.join('|')})_([a-z]{2}(_[a-z]{2})?)(=?|\??)\z/.freeze
+        method_name_regex = /\A(#{names.join('|')})_([a-z]{2,3}(_[a-z]{2})?)(=?|\??)\z/.freeze
 
         define_method :method_missing do |method_name, *args, &block|
           if method_name =~ method_name_regex

data/lib/mobility/version.rb

@@ -7,8 +7,8 @@ module Mobility
 
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    TINY = 9
+    MINOR = 3
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/mobility.rb

@@ -90,7 +90,7 @@ module Mobility
   CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
   private_constant :CALL_COMPILABLE_REGEXP
 
-  require "rails/generators/mobility/generators" if defined?(Rails)
+  require "rails/generators/mobility/generators" if defined?(Rails) && defined?(ActiveRecord)
 
   class << self
     def extended(model_class)
@@ -228,9 +228,9 @@ module Mobility
     #   methods (in LocaleAccessors) than is really necessary.
     def available_locales
       if defined?(Rails) && Rails.respond_to?(:application) && Rails.application
-        Rails.application.config.i18n.available_locales&.map(&:to_sym) || I18n.available_locales
+        Rails.application.config.i18n.available_locales&.map(&:to_sym) || I18n.available_locales.map(&:to_sym)
       else
-        I18n.available_locales
+        I18n.available_locales.map(&:to_sym)
       end
     end
 

data/lib/rails/generators/mobility/templates/initializer.rb

@@ -58,6 +58,19 @@ Mobility.configure do
     # Or uncomment this line to include but disable by default, and only enable
     # per model by passing +dirty: true+ to +translates+.
     # dirty false
+    
+    # Column Fallback
+    #
+    # Uncomment line below to fallback to original column. You can pass
+    # +column_fallback: true+ to +translates+ to return original column on
+    # default locale, or pass +column_fallback: [:en, :de]+ to +translates+
+    # to return original column for those locales or pass
+    # +column_fallback: ->(locale) { ... }+ to +translates to evaluate which
+    # locales to return original column for.
+    # column_fallback
+    #
+    # Or uncomment this line to enable column fallback with a global default.
+    # column_fallback true
 
     # Fallbacks
     #
@@ -65,7 +78,7 @@ Mobility.configure do
     # fallbacks
     #
     # Or uncomment this line to enable fallbacks with a global default.
-    # fallbacks { :pt => :en }
+    # fallbacks(pt: :en)
 
     # Presence
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -10,31 +10,32 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhjaHJp
-  cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjIwMzAyMDMyMTA5WhcNMjMwMzAyMDMy
-  MTA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G
-  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDURCKbt5oY0sCp4kYK1u5SLzVHg6Q1
-  2LejeQvUGpR3gulWqrq/507XRxE/9FSpLfgo3cGGYio1/gg2Yp7pBI4ZNEz8d2Vg
-  6caWLHYtHYF0/jlo177UspEF1bt3lCCmaA/ZyQpvoLi76Jf6VCBjepMqhLjeBSsA
-  xUqSdgNT8lzduOzdYk/GWf2Trvyz72IN6rY7hSwJ/U4R2DusRNTbKC55iyu0MyqI
-  Nks33les0xQERucqes1YzSEnpott/GUQ/fFWV1Qx7M1hMnqbQIm493BueR6X95a2
-  B7/aqY7LUVVmn9p65NMBJhbbP/pbAcLYV0C+y1Jy9NaVQTpWmJXVKBpYwlAzOJOQ
-  +b/7MBzT5Zzudkq9OlA5rZJB0hFo/Bm38MOCTSTk1/RT+zmoOyb4bx/h400L4ZUt
-  bRGON33BZ99gPiYdGfd3Pc/7FooteJASjKIO4Hman2ELRIdu6Bq+fIkTdJBcruS/
-  XL6xoRitCG7CX0IqmMKuLiKA/J0amAikHGsCAwEAAaN3MHUwCQYDVR0TBAIwADAL
-  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFMNUGAhS68egZT6DOfJwrfIdCtT/MB0GA1Ud
-  EQQWMBSBEmNocmlzQGRlamltYXRhLmNvbTAdBgNVHRIEFjAUgRJjaHJpc0BkZWpp
-  bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAHJPxoU7brN6goci9iclRYUq1Prs
-  51E87VRywUDysHpaHJoGRTqRJsQxi5aGZ9pIbiXGj9WJKKnrhiv5cM5fWtAsz564
-  Ro+Zyx6UVt/2z9rcfYrnXtmC9wh+5/0UqAeoan9RiSd8lscQZ9pEY0E3cmzJRHSU
-  t8kwB2ipVkFO17mdTVgc3C2ZbWRq80eTzkELDBb+8xO0Cskyh4sGMTOKfHs2RWcJ
-  217Qeg0F9w0RcqwnORe5zmPihY9zswCPh0IUaJa1pNY+MLTff9LE/qTl3WVTgrif
-  HsSSnstQYPSLJ3hSP/cu1aOmdXlJiim//XlDQ9DNp4KWje3UW3DMRdTwjW5wPmUq
-  VA9Ij7DUPaZzUpy1NZEigf1GshvslOnvN5bgol1YFR46jpfZVlgt0K5XBQVNvp/A
-  QHgocnSksU5GOM+G2UhjVycbTamd+bCxjWAZTEDZNafFt5CmnfK1D1UTIblR/ci9
-  fUDdW+GhxhobB8N1mtDRlhELoxLLjx7mSvJ3Wg==
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQ4wDAYDVQQDDAVjaHJp
+  czEYMBYGCgmSJomT8ixkARkWCGRlamltYXRhMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTI0MDMzMTA4NTQyOFoXDTI1MDMzMTA4NTQyOFowPzEOMAwGA1UEAwwFY2hy
+  aXMxGDAWBgoJkiaJk/IsZAEZFghkZWppbWF0YTETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANdI2sGYV1Dg+eFvs/t8
+  feflYB2ZHFMYZV5dB6a62L0f9I5pndIwc9qbo4HivzVICCz2yOP/v2Yxyi4UkucM
+  dGgFEAxpBlgNzrE2vrqPJHqMN9001O0vS3jvyKwNZ0WmPO26Sf75ky1QrjPRmHEV
+  rn15+bQGu5sRMxIj5TyRgtNmy9ORJBP+hEiGD09icRvn/FG6o0/NIRyLXnX2tuOu
+  VBD64XQU3mhxxJtp2+F0Hb0E1nmUttaWsuATMlnRJ8Ksli9kfoxFAa87Cm/LrK2l
+  WCar8Nc6kw6Rixq97MAZCplEXtg6KnenXzMJLvZFBRSZM6RGj1Q9IX8EpP6HoG/u
+  WYU/rXe4YZxKy0idDBLbBfjTRKJYQu7q6bgHNTWER7Dc6cACjMhunhfgnvr4Rzu9
+  F4UNHixNagaLq+3ng19oJJcxE/9BHVOjhZWzLRn0z122KuQJVBXiLipU4r1YIUnj
+  E0m0QDb4DrYmL1Omp+vVNKBbXnj9AW8J8I9v0Lc/5QsK8wIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUJ5UzoaDdOqk4a8OQ95no0vg3
+  ROcwHQYDVR0RBBYwFIESY2hyaXNAZGVqaW1hdGEuY29tMB0GA1UdEgQWMBSBEmNo
+  cmlzQGRlamltYXRhLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAmx0ugOC2yOTQTetP
+  H8akUD7tRMeEki8Ba2F/+YP0x6cnsEBcKnp0CO5pMVY+6MssLgHh1IXDQlmKuPOW
+  oht9yh6CWgzufzi+XApY1k/TYWAjxOMZAMdvd7iHo7igRK5pPbSaP5uubQfaLn7X
+  ge1VLOBAn9XlSOvFZiYZ7Nk8zEvYrvLbQGVtcfceZK4BHC4M3pKsV+m7euWMYguz
+  ctOqZgbvGDwFvsH302xC53hld7AaFLBep6XaQZSRleVqgIEKZwlG0cX8UwG482Xt
+  WJSXNylIIbzRndVjbVdGVhhcyjnswfu1qJpl+0YlbAdHJVsd8Ux8TOXEPFMv5wz9
+  wXhTYFvkOuleWf/45E5f8BtT1iqsH2w3P2Cfy+yOo2aReAVSeR12YDCuV0q6RjTD
+  3I5AfnFAG4/1IwhadqwF5cl3jOUa7n3mS2OJl3tRCGuPvwAA9MV10hmwbQTXMrNK
+  tD9kfT9eseUE4mfPnIaHOs4FiIoHniA7zdtjB7GIQ4cEpB6o
   -----END CERTIFICATE-----
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -254,11 +255,11 @@ metadata:
   rubygems_mfa_required: 'true'
 post_install_message: |2
 
-  Warning: Mobility v1.0 includes backwards-incompatible changes (mostly around configuration).
+  Warning: Mobility v1.3.x includes potentially backwards-incompatible changes
+  for jsonb/hstore backends.
 
-  If you are upgrading from an earlier version, please see:
-  - https://github.com/shioyama/mobility/releases/tag/v1.0.0
-  - https://github.com/shioyama/mobility/wiki/Introduction-to-Mobility-v1.0
+  Please see:
+  - https://github.com/shioyama/mobility/issues/535
 rdoc_options: []
 require_paths:
 - lib
@@ -273,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Pluggable Ruby translation framework