mobility 1.3.0.rc3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0b53980f62d9538827053f6e08b8ffd287d44a7a4aa87602c5d85e87bf30fc
-  data.tar.gz: 540af4290175ec08b109a8cc0e783c1a634c66fe87bf97fd014d5c5a0f78b79c
+  metadata.gz: e29c8ed1c4b5ff644843c06c90fa46ce9fa9dd951a64dfb40b2ff33961483edd
+  data.tar.gz: '0708f6107d1ac5a80fd99c7d7d098e6915c10ad457cf962fdcc8510bced56f58'
 SHA512:
-  metadata.gz: 25fc7f6a40125020f7425691a3d183a290bfaa3381594d1ad218a924797a0329f76ca39494742f380a3310fbe9d3c879849e366de20bd695219b247c90161d17
-  data.tar.gz: 8b02e9620070979a64e71d2774495a1be0054e92180116e4e40790575d05faff38fb78001ab460581de2524598af3823f312734b67804d2debe1de428737801a
+  metadata.gz: 87975b6d967a5944c5cc5f1b0bc154eeff73437fd3a0bde826195236e070533cfc2ffbaa1188a3791d8bfb439179005210712a9a91894a9212881113b74a1910
+  data.tar.gz: d77ff76539f6f847ded56cada8746cd64a2398ddd2fe1fd33758f129ba737e996e083797e7dabe0769f9e41ab06f73b50b2f56635f8e9d5ab2e23f9c787408fa

checksums.yaml.gz.sig

@@ -1,3 +1,4 @@
-2�5g�=�s�`�7x4C1�
-�+�uT�'����}{؏�K�C�g \�iV�.s���Ɍ�koB�k�]�̯X�Ds�
�(
-���aK
Xi�1�8��#~���b{U�q�3�qF��Ԁʈ�?�$�]�F���Gx���n@��{�ߍopZT��Op}�ݻ	����x�:߅U��n��l�ʙ�0\Y�$]�	�g\PɋR�*���<��g����.�l{�a�UDϔ�g��>书��8I�^p�a��5�U��#�7@�4gs
+z��1���'
��J���5M�mά�/n(����B�D�V�ҘxI�_"�`�X�[�X(�Y2ׄ�@#��Ŭ\��w53>\qsi���!�Y�ű��
D8Ě}v�E"��&{��HA��[���e��tI�㈕!��N]�m��~�!��
+c���E3b@��|���eغ�&S�l�����}ɔ �ly9."�N��X��YG
+i�_�F+�"ڶ�"��@3.�������ɓ����'|0��S*Y�f;������gľ�Q��@���s��_��~EF�*	7n�%�a�~��
+.b�Zh24Oj����~VÌ���F>\��fd�z9ª��Dq�_�y9F�2M��S��q��D�0�d=Q����iS#�S&ev,A��S�.

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## 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

data/Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   when 'active_record'
     orm_version ||= '7.0'
     case orm_version
-    when '6.1', '7.0', '7.1'
+    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,22 +1,46 @@
 PATH
   remote: .
   specs:
-    mobility (1.3.0.rc1)
+    mobility (1.3.0)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark-ips (2.13.0)
+    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)
+      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.2.3)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     database_cleaner (1.99.0)
     diff-lcs (1.5.1)
-    ffi (1.16.3)
+    drb (2.2.1)
+    ffi (1.17.0-x86_64-linux-gnu)
     formatador (1.1.0)
-    guard (2.18.1)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -30,13 +54,15 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.14.4)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
     lumberjack (1.2.10)
-    method_source (1.0.0)
+    method_source (1.1.0)
+    minitest (5.25.2)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -47,35 +73,41 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    rack (3.0.9.1)
+    rack (2.2.7)
     rake (12.3.3)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    request_store (1.6.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
+    securerandom (0.3.2)
     shellany (0.0.1)
-    sqlite3 (1.4.4)
-    thor (1.3.1)
-    yard (0.9.36)
+    sqlite3 (2.3.1-x86_64-linux-gnu)
+    thor (1.3.2)
+    timeout (0.4.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.2)
+    yard (0.9.37)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activerecord (~> 8.0.0)
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
@@ -83,7 +115,7 @@ DEPENDENCIES
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
-  sqlite3 (~> 1.4.1)
+  sqlite3 (>= 2.1.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH

data/README.md

@@ -54,13 +54,13 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.3.0.rc3'
+gem 'mobility', '~> 1.3.1'
 ```
 
 ### ActiveRecord (Rails)
 
 Requirements:
-- ActiveRecord >= 6.1
+- 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).

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

@@ -86,25 +86,6 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
         end
       end
 
-      setup do |_attributes, options|
-        # 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
-        end
-      end
-
       private
 
       def model_translations(locale)

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

@@ -102,7 +102,7 @@ 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

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

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

data/lib/mobility.rb

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

@@ -78,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.3.0.rc3
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -35,7 +35,7 @@ cert_chain:
   3I5AfnFAG4/1IwhadqwF5cl3jOUa7n3mS2OJl3tRCGuPvwAA9MV10hmwbQTXMrNK
   tD9kfT9eseUE4mfPnIaHOs4FiIoHniA7zdtjB7GIQ4cEpB6o
   -----END CERTIFICATE-----
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -270,9 +270,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.6
 signing_key: