mobility 1.2.6 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7f067617904bfb7739ce49cd155ffc0ec0b6aeeb7ebdbbf13309afd0e7a106
-  data.tar.gz: ced82292e8e99ee28bb7b3962e964147481200539db25d87bae0caa24fa783da
+  metadata.gz: 9a2836c1681d1832331e807e58fa61956426ddc3cc730c15e6b3d6ebac2fce40
+  data.tar.gz: 61c798b73769f7d73bb5a3a97b3a1a27ac8884a186df89aeb5ceef0ecb92b692
 SHA512:
-  metadata.gz: 38494c35209217644cf9b408ce0d55c671b65db3b131118d0ce934b6065eccb0d64a032ede1dba0244cf28a3960973163f0c3ac31976fd8248eb514a750a0a49
-  data.tar.gz: fe5d5ef7ea05f091eaed43330b9f8e1b23716176daf2595a61fdb01344fc25cfa92a2ba237822e5b9bcec101c60f9d22ab63ae2cd59c888ff4315ac08150d49b
+  metadata.gz: e8693fb2b5d997a1d7029413aee5c5f064eeafbef6f8a10ad2c947bd545fff72e238f6d57ebaae8761d5948e036446d310f7ce9da3c047a7577818919dfd7908
+  data.tar.gz: e980cc7d53a32c517c04994105540fd9635aae5899d35cecb1544a36ef052619adb0647b58ec666902402e8ad642c85aa576f0301d3708211e83b5f3d0e6d95b

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## 1.2
 
+### 1.2.9
+- Fix missing method `mobility_attribute?` on Rails 7
+  ([#582](https://github.com/shioyama/mobility/pull/582) and
+  [#584](https://github.com/shioyama/mobility/pull/584))
+
+### 1.2.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)
+
+### 1.2.7
+- Do not query same attribute more than once, fixes
+  [#564](https://github.com/shioyama/mobility/pull/578)
+  ([#577](https://github.com/shioyama/mobility/pull/577))
+
 ### 1.2.6
 - Require mfa on rubygems
   ([#545](https://github.com/shioyama/mobility/pull/545))

data/Gemfile.lock

@@ -1,21 +1,31 @@
 PATH
   remote: .
   specs:
-    mobility (1.3.0.alpha)
+    mobility (1.2.8)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    benchmark-ips (2.9.1)
+    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)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    benchmark-ips (2.10.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     database_cleaner (1.99.0)
-    diff-lcs (1.4.4)
-    ffi (1.15.4)
-    formatador (0.3.0)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -30,55 +40,63 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    listen (3.7.0)
+    listen (3.7.1)
       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)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    pg (1.3.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (12.3.3)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     shellany (0.0.1)
-    thor (1.1.0)
-    yard (0.9.26)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 7.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)

data/README.md

@@ -55,7 +55,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.2.6'
+gem 'mobility', '~> 1.2.9'
 ```
 
 ### ActiveRecord (Rails)

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

@@ -153,7 +153,13 @@ the ActiveRecord dirty plugin for more information.
           # suffixes is simplest given they change from Rails version to version.
           def patterns
             @patterns ||=
-              (klass.attribute_method_matchers.map { |p| "#{p.prefix}%s#{p.suffix}" } - excluded_patterns)
+              begin
+                # Method name changes in Rails 7.1
+                attribute_method_patterns = klass.respond_to?(:attribute_method_patterns) ?
+                  klass.attribute_method_patterns :
+                  klass.attribute_method_matchers
+                attribute_method_patterns.map { |p| "#{p.prefix}%s#{p.suffix}" } - excluded_patterns
+              end
           end
 
           private

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

@@ -163,9 +163,8 @@ enabled for any one attribute on the model.
               define_method method_name do |*attrs, &block|
                 return super(*attrs, &block) if (method_name == 'select' && block.present?)
 
-                if ::ActiveRecord::VERSION::STRING < '7.0'
-                  return super(*attrs, &block) unless @klass.respond_to?(:mobility_attribute?)
-                end
+                return super(*attrs, &block) unless @klass.respond_to?(:mobility_attribute?)
+
                 return super(*attrs, &block) unless attrs.any?(&@klass.method(:mobility_attribute?))
 
                 keys = attrs.dup
@@ -223,10 +222,13 @@ enabled for any one attribute on the model.
 
                 keys, predicates = opts.keys.map(&:to_s), []
 
+                used_keys = []
+
                 query_map = mods.inject(IDENTITY) do |qm, mod|
-                  i18n_keys = mod.names & keys
+                  i18n_keys = mod.names & keys - used_keys
                   next qm if i18n_keys.empty?
 
+                  used_keys += i18n_keys
                   mod_predicates = i18n_keys.map do |key|
                     build_predicate(scope.backend_node(key.to_sym, locale), opts.delete(key))
                   end

data/lib/mobility/plugins/backend.rb

@@ -159,16 +159,22 @@ Defines:
           raise KeyError, "No backend for: #{name}"
         end
 
-        def inherited(klass)
-          parent_classes = mobility_backend_classes.freeze # ensure backend classes are not modified after being inherited
-          klass.class_eval { @mobility_backend_classes = parent_classes.dup }
-          super
-        end
-
         protected
 
         def mobility_backend_classes
-          @mobility_backend_classes ||= {}
+          if @mobility_backend_classes
+            @mobility_backend_classes
+          else
+            @mobility_backend_classes = {}
+            parent_class = self.superclass
+            while parent_class&.respond_to?(:mobility_backend_classes, true)
+              # ensure backend classes are not modified after being inherited
+              parent_class_classes = parent_class.mobility_backend_classes.freeze
+              @mobility_backend_classes.merge!(parent_class_classes)
+              parent_class = parent_class.superclass
+            end
+            @mobility_backend_classes
+          end
         end
       end
 

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

@@ -135,10 +135,13 @@ ActiveRecord query plugin.
               keys, predicates = cond.keys, []
               model = dataset.model
 
+              used_keys = []
+
               query_map = attribute_modules(model).inject(IDENTITY) do |qm, mod|
-                i18n_keys = mod.names.map(&:to_sym) & keys
+                i18n_keys = mod.names.map(&:to_sym) & keys - used_keys
                 next qm if i18n_keys.empty?
 
+                used_keys += i18n_keys
                 mod_predicates = i18n_keys.map do |key|
                   build_predicate(dataset.backend_op(key, locale), cond.delete(key))
                 end

data/lib/mobility/version.rb

@@ -8,7 +8,7 @@ module Mobility
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY = 6
+    TINY = 9
     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.2.6
+  version: 1.2.9
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   QHgocnSksU5GOM+G2UhjVycbTamd+bCxjWAZTEDZNafFt5CmnfK1D1UTIblR/ci9
   fUDdW+GhxhobB8N1mtDRlhELoxLLjx7mSvJ3Wg==
   -----END CERTIFICATE-----
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store