mobility 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488c8b1ec0f603d226b7a0dd54064a27ede153b1c8c3bd1ae078bcfec0dd74e2
-  data.tar.gz: ebce70b5815c7618b908459c59bc514647b55f2e792641bc3d400547fb5ae533
+  metadata.gz: e29c8ed1c4b5ff644843c06c90fa46ce9fa9dd951a64dfb40b2ff33961483edd
+  data.tar.gz: '0708f6107d1ac5a80fd99c7d7d098e6915c10ad457cf962fdcc8510bced56f58'
 SHA512:
-  metadata.gz: 8d8dc37e4dd38ead1eb16b593ca153876179770a23b32a63b2c6850509326590c8c80596351328b48c6e40e25df48b99f106e6cbcddd0b940381eaf0c7e41fd6
-  data.tar.gz: b0afa4c0962c240658c0e5fe109c76e6db533b7f1ad1679b4ed38094c8dd48cb581fb15f8ac50d57078238d98cade3198b562ee64d2ed1ca9c9af3f3bda5e72c
+  metadata.gz: 87975b6d967a5944c5cc5f1b0bc154eeff73437fd3a0bde826195236e070533cfc2ffbaa1188a3791d8bfb439179005210712a9a91894a9212881113b74a1910
+  data.tar.gz: d77ff76539f6f847ded56cada8746cd64a2398ddd2fe1fd33758f129ba737e996e083797e7dabe0769f9e41ab06f73b50b2f56635f8e9d5ab2e23f9c787408fa

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    mobility (1.3.0.rc3)
+    mobility (1.3.0)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
+    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 (7.1.5)
+    activesupport (8.0.0)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     base64 (0.2.0)
     benchmark (0.4.0)
     benchmark-ips (2.14.0)
@@ -62,9 +62,7 @@ GEM
     logger (1.6.1)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    mini_portile2 (2.8.8)
     minitest (5.25.2)
-    mutex_m (0.3.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -75,7 +73,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    rack (3.1.8)
+    rack (2.2.7)
     rake (12.3.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
@@ -97,19 +95,19 @@ GEM
     rspec-support (3.13.1)
     securerandom (0.3.2)
     shellany (0.0.1)
-    sqlite3 (1.5.4)
-      mini_portile2 (~> 2.8.0)
+    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 (~> 7.1.0)
+  activerecord (~> 8.0.0)
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
@@ -117,7 +115,7 @@ DEPENDENCIES
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
-  sqlite3 (~> 1.5.0)
+  sqlite3 (>= 2.1.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH

data/README.md

@@ -54,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.3.0.rc3'
+gem 'mobility', '~> 1.3.1'
 ```
 
 ### ActiveRecord (Rails)

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/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)
@@ -171,7 +174,7 @@ enabled for any one attribute on the model.
               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" && query.order_values.any?
+                if method_name == "select"
                   keys[index] = keys[index]
                     .as(::Mobility::Plugins::ActiveRecord::Query.attribute_alias(key.to_s))
                 end
@@ -182,6 +185,27 @@ enabled for any one attribute on the model.
             end
           end
 
+          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
+
           # Return backend node for attribute name.
           # @param [Symbol,String] name Name of attribute
           # @param [Symbol] locale Locale

data/lib/mobility/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -35,7 +35,7 @@ cert_chain:
   3I5AfnFAG4/1IwhadqwF5cl3jOUa7n3mS2OJl3tRCGuPvwAA9MV10hmwbQTXMrNK
   tD9kfT9eseUE4mfPnIaHOs4FiIoHniA7zdtjB7GIQ4cEpB6o
   -----END CERTIFICATE-----
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store