mobility 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7f067617904bfb7739ce49cd155ffc0ec0b6aeeb7ebdbbf13309afd0e7a106
-  data.tar.gz: ced82292e8e99ee28bb7b3962e964147481200539db25d87bae0caa24fa783da
+  metadata.gz: f9ff30d2d033cff7555cc4a4ed4d463d7670df67e4e23302534f35fc6bf34649
+  data.tar.gz: d3097e35c0d8e6fc65c88fc038fcb056add50c4a87384ece6e71321c33a71aac
 SHA512:
-  metadata.gz: 38494c35209217644cf9b408ce0d55c671b65db3b131118d0ce934b6065eccb0d64a032ede1dba0244cf28a3960973163f0c3ac31976fd8248eb514a750a0a49
-  data.tar.gz: fe5d5ef7ea05f091eaed43330b9f8e1b23716176daf2595a61fdb01344fc25cfa92a2ba237822e5b9bcec101c60f9d22ab63ae2cd59c888ff4315ac08150d49b
+  metadata.gz: 10b8f7d41910f51e21fbf6ad5603e284070c202d224518b788067df6ea4fc77f180b2273498307a8f5d77f88963eee06917bea68f51a41d98308c60bc2091cf5
+  data.tar.gz: 20cdcc3adc28dae960ea83a58b1aa2ba92515e824a6ebe35a4bb3d896c9b0eae3aae0b8198c32304dfb9d2eec8a794b427a50f3f4f0c75e0b2e8d307ad40fb69

data/CHANGELOG.md

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

@@ -41,6 +41,7 @@ GEM
     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)
@@ -67,6 +68,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    sequel (5.57.0)
     shellany (0.0.1)
     thor (1.1.0)
     yard (0.9.26)
@@ -79,9 +81,11 @@ DEPENDENCIES
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
   mobility!
+  pg
   pry-byebug
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
+  sequel (~> 5.0)
   yard (~> 0.9.0)
 
 BUNDLED WITH

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.7'
 ```
 
 ### ActiveRecord (Rails)

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

@@ -223,10 +223,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/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 = 7
     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.7
 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-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store