mobility 1.2.4 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0dd974f8a077b31fc0ab41df158e4cac50c6aee4e7fd66348db1ed2ef5f78f9
-  data.tar.gz: ea72521a4bb8daedf08d3012353c591ec47f76e3fe6ec3c10b87e331a5404db9
+  metadata.gz: f9ff30d2d033cff7555cc4a4ed4d463d7670df67e4e23302534f35fc6bf34649
+  data.tar.gz: d3097e35c0d8e6fc65c88fc038fcb056add50c4a87384ece6e71321c33a71aac
 SHA512:
-  metadata.gz: 15b9df45774c9b3d4ae343b2f083b2a85ddfd7585283998b0dc624aa62eee5c6e5fade0737ae78b3dd728dd273a03dcf10afecabcca6eb8f90400619de0a7fa4
-  data.tar.gz: 1f199821139bf35b4e176f52dac0249f482ffb5edc9d7957d437e9262a908812fab01ba5dea52e18a9b1f37f92744b345c34ca0c84d97da0641f9fab19577704
+  metadata.gz: 10b8f7d41910f51e21fbf6ad5603e284070c202d224518b788067df6ea4fc77f180b2273498307a8f5d77f88963eee06917bea68f51a41d98308c60bc2091cf5
+  data.tar.gz: 20cdcc3adc28dae960ea83a58b1aa2ba92515e824a6ebe35a4bb3d896c9b0eae3aae0b8198c32304dfb9d2eec8a794b427a50f3f4f0c75e0b2e8d307ad40fb69

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## 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))
+
+### 1.2.5
+- Avoid referencing ActiveRecord::Base
+  ([#550](https://github.com/shioyama/mobility/pull/550))
+
 ### 1.2.4
 - Fix fallbacks performance regression
   ([#548](https://github.com/shioyama/mobility/pull/548))

data/Gemfile

@@ -8,11 +8,11 @@ orm, orm_version = ENV['ORM'], ENV['ORM_VERSION']
 group :development, :test do
   case orm
   when 'active_record'
-    orm_version ||= '6.1'
+    orm_version ||= '7.0'
     case orm_version
-    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1'
+    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0'
       gem 'activerecord', "~> #{orm_version}.0"
-    when '7.0'
+    when 'edge'
       git 'https://github.com/rails/rails.git', branch: 'main' do
         gem 'activerecord'
         gem 'activesupport'

data/Gemfile.lock

@@ -1,19 +1,3 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 5647a9c1ced68d20338552d47a3b755e10a271c4
-  branch: main
-  specs:
-    activemodel (7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-    activerecord (7.0.0.alpha2)
-      activemodel (= 7.0.0.alpha2)
-      activesupport (= 7.0.0.alpha2)
-    activesupport (7.0.0.alpha2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-
 PATH
   remote: .
   specs:
@@ -53,12 +37,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.4)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pg (1.2.3)
+    pg (1.3.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -85,18 +68,15 @@ 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)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     yard (0.9.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord!
-  activesupport!
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec
@@ -105,6 +85,7 @@ DEPENDENCIES
   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.4'
+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 = 4
+    TINY = 7
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/rails/generators/mobility/backend_generators/base.rb

@@ -46,7 +46,9 @@ module Mobility
         connection.data_source_exists?(table_name)
       end
 
-      delegate :connection, to: ::ActiveRecord::Base
+      def connection
+        ::ActiveRecord::Base.connection
+      end
 
       def truncate_index_name(index_name)
         if index_name.size < connection.index_name_length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.7
 platform: ruby
 authors:
 - Chris Salzberg
@@ -11,8 +11,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhjaHJp
-  cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjEwMjE4MTMxMzA5WhcNMjIwMjE4MTMx
-  MzA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G
+  cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjIwMzAyMDMyMTA5WhcNMjMwMzAyMDMy
+  MTA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G
   CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDURCKbt5oY0sCp4kYK1u5SLzVHg6Q1
   2LejeQvUGpR3gulWqrq/507XRxE/9FSpLfgo3cGGYio1/gg2Yp7pBI4ZNEz8d2Vg
   6caWLHYtHYF0/jlo177UspEF1bt3lCCmaA/ZyQpvoLi76Jf6VCBjepMqhLjeBSsA
@@ -24,17 +24,17 @@ cert_chain:
   XL6xoRitCG7CX0IqmMKuLiKA/J0amAikHGsCAwEAAaN3MHUwCQYDVR0TBAIwADAL
   BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFMNUGAhS68egZT6DOfJwrfIdCtT/MB0GA1Ud
   EQQWMBSBEmNocmlzQGRlamltYXRhLmNvbTAdBgNVHRIEFjAUgRJjaHJpc0BkZWpp
-  bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAH1RnWhD9bum/ijqzAAlkGWYzGza
-  h/3seA2bg1r5bbttFjD48f7RepfoAMxAqfiUWcukoukJeu7UY8jWmUIn9ut1oXct
-  Fh0YnueLFzzmppCCU+/SX5mc1y7mHYZHiU5n8qy1wJ6ljLWXVeprgJ96NdnmxuVU
-  dzPPSDTex/x7xBvHiaPc/uZSLc173N3qdY/Cd0B3/OflYeU2h5UpIHnmXrsONdMC
-  Xohy+Rrr2yT09MPYG+llpLHDnXmTnPsOZUSL5Q4c/iolodv4xJZKwLMZwrm2hQl9
-  9Or9Os+qxY0zWxmWuAtTFrskLAMhckCPDEcqSZmW4CT1a/quC2Oh0y1GsXPcqtqt
-  hLRuwfTXGor6bg4CrU7GRbSqjvnBepct5lwZiZrOCnMEUpY+9Q8fwmG3o3B+wBsw
-  eBMcZq0d1tbtv1M1UXND9mOfhLZ31YvoSTPkrJiRpljUNgD0+ugelnr1/5X/9k8y
-  J9QOd3C5jpSShf/HMvpJnFuSYFm19cH9GrHjvw==
+  bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAHJPxoU7brN6goci9iclRYUq1Prs
+  51E87VRywUDysHpaHJoGRTqRJsQxi5aGZ9pIbiXGj9WJKKnrhiv5cM5fWtAsz564
+  Ro+Zyx6UVt/2z9rcfYrnXtmC9wh+5/0UqAeoan9RiSd8lscQZ9pEY0E3cmzJRHSU
+  t8kwB2ipVkFO17mdTVgc3C2ZbWRq80eTzkELDBb+8xO0Cskyh4sGMTOKfHs2RWcJ
+  217Qeg0F9w0RcqwnORe5zmPihY9zswCPh0IUaJa1pNY+MLTff9LE/qTl3WVTgrif
+  HsSSnstQYPSLJ3hSP/cu1aOmdXlJiim//XlDQ9DNp4KWje3UW3DMRdTwjW5wPmUq
+  VA9Ij7DUPaZzUpy1NZEigf1GshvslOnvN5bgol1YFR46jpfZVlgt0K5XBQVNvp/A
+  QHgocnSksU5GOM+G2UhjVycbTamd+bCxjWAZTEDZNafFt5CmnfK1D1UTIblR/ci9
+  fUDdW+GhxhobB8N1mtDRlhELoxLLjx7mSvJ3Wg==
   -----END CERTIFICATE-----
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -249,7 +249,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/shioyama/mobility
   source_code_uri: https://github.com/shioyama/mobility
+  bug_tracker_uri: https://github.com/shioyama/mobility/issues
   changelog_uri: https://github.com/shioyama/mobility/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: |2
 
   Warning: Mobility v1.0 includes backwards-incompatible changes (mostly around configuration).