mobility 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e8866b69b091c9fd411212b4f262382dc00da3
-  data.tar.gz: 45f61733fe33af52d7b4be9e35d75aa0344b6c54
+  metadata.gz: e7e38eaafcd681f7aa78b56427f07460f7b995ce
+  data.tar.gz: 62b77800ad18af59905506a5a65fc30285a14299
 SHA512:
-  metadata.gz: a942928eba9620bdfccede2153501fa994c475d5174b1e7fdab2c76c2acaaf9a1787ec92938c46103afbb156aba5c70c729130311cbceed6903efd00a782c031
-  data.tar.gz: d455f2eb6fd95cf6a6a4a8a02293917a450be4a272bef424dd292d57bfab466caea1adce71ba3f64fb20770cbbb8dd681f8809b4f4112c111c40f2fd9fd38f88
+  metadata.gz: 473fbcc6e40aab4c828478959896d90e8403a96eca495c0df31bb8d9b2faa0e2e49fe3ecd8913035c38c3a69004284f17be963e1cb3aae1744a0f3191df69479
+  data.tar.gz: 31545c9e848c7c60ee7ef638063ed66999cded527ba115f943e7acbf84c72ae1944094a3e10a871131ee4ff35a52baf2640d5b1c22d01fc7daad5c5c8cd42e5d

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-<Qw1&�l{�Ȣ���<̦X̭��ɘ=��!�N���*
-�ѥjj��Dc�F����-ހAGɆր}I��I�ab��u~�>�
�@�i�����ü(��}E_��Q0�bɫ"�V�+�蘡�ͥ`~f�[P���
-���D7>�P{��M�b��L�������!Ck����)[
+~|O�;������5��n���NB�-�=R0���=��v��f8����(O�˥��B�#Q��]�|�tR��~,N�,�4�������g,�ȕcv

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.3
 
+### 0.3.4 (December 6, 2017)
+* Move `translated_attribute_names` to `Mobility::ActiveRecord`
+  ([#132](https://github.com/shioyama/mobility/pull/129))
+* Refactor AR pg query methods ([#129](https://github.com/shioyama/mobility/pull/129))
+
 ### 0.3.3 (December 5, 2017)
 * Fix duping for AR KeyValue backend ([#126](https://github.com/shioyama/mobility/pull/126))
 * Pass locale and options to Proc in default plugin ([#122](https://github.com/shioyama/mobility/pull/122))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.3.2)
+    mobility (0.3.3)
       i18n (>= 0.6.10, < 0.10)
       request_store (~> 1.0)
 

data/README.md

@@ -54,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.3.3'
+gem 'mobility', '~> 0.3.4'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't
@@ -673,9 +673,9 @@ WHERE "content_mobility_text_translations"."value" = 'bar'
 As can be seen in the query above, behind the scenes Mobility joins two tables,
 one with string translations and one with text translations, and aliases the
 joins for each attribute so as to match the particular values passed in to the
-query. Details of how this is done can be found in the [API documentation for
-AR query
-methods](http://www.rubydoc.info/gems/mobility/Mobility/Backend/ActiveRecord/KeyValue/QueryMethods).
+query. Details of how this is done can be found in the [Wiki page for the
+KeyValue
+backend](https://github.com/shioyama/mobility/wiki/KeyValue-Backend#querying).
 
 If you would prefer to avoid the `i18n` scope everywhere, define it as a
 default scope on your model:

data/lib/mobility/active_record.rb

@@ -16,6 +16,7 @@ Module loading ActiveRecord-specific classes for Mobility models.
       model_class.extend query_method
       model_class.const_set(:UniquenessValidator,
                             Class.new(::Mobility::ActiveRecord::UniquenessValidator))
+      model_class.delegate :translated_attribute_names, to: :class
     end
   end
 end

data/lib/mobility/backends/active_record/hstore/query_methods.rb

@@ -12,18 +12,16 @@ module Mobility
             opts = opts.with_indifferent_access
             infix = Arel::Nodes::InfixOperation
 
-            i18n_query = i18n_keys.inject(nil) { |ops, attr|
-              column = m[attr.to_sym]
-              value = opts.delete(attr)
+            i18n_query = i18n_keys.map { |key|
+              column = m[key.to_sym]
+              value = opts.delete(key)
 
-              op =
-                if value.nil?
-                  infix.new(:'?', column, locale).not
-                else
-                  infix.new(:'->', m[attr.to_sym], locale).eq(value)
-                end
-              ops ? ops.and(op) : op
-            }
+              if value.nil?
+                infix.new(:'?', column, locale).not
+              else
+                infix.new(:'->', m[key.to_sym], locale).eq(value)
+              end
+            }.inject(&:and)
 
             opts.empty? ? super(i18n_query) : super(opts, *rest).where(i18n_query)
           else
@@ -44,14 +42,13 @@ module Mobility
               opts = opts.with_indifferent_access
               infix = Arel::Nodes::InfixOperation
 
-              i18n_query = i18n_keys.inject(nil) { |ops, attr|
-                column = m[attr.to_sym]
-                value = Arel::Nodes.build_quoted(opts.delete(attr).to_s)
+              i18n_query = i18n_keys.map { |key|
+                column = m[key.to_sym]
+                value = Arel::Nodes.build_quoted(opts.delete(key).to_s)
                 has_key = infix.new(:'?', column, locale)
                 not_eq_value = infix.new(:'->', column, locale).not_eq(value)
-                op = has_key.and(not_eq_value)
-                ops ? ops.and(op) : op
-              }
+                has_key.and(not_eq_value)
+              }.inject(&:and)
 
               super(opts, *rest).where(i18n_query)
             else

data/lib/mobility/backends/active_record/jsonb/query_methods.rb

@@ -14,19 +14,17 @@ module Mobility
             opts = opts.with_indifferent_access
             infix = Arel::Nodes::InfixOperation
 
-            i18n_query = i18n_keys.inject(nil) { |ops, attr|
-              column = m[attr.to_sym]
-              value = opts.delete(attr)
+            i18n_query = i18n_keys.map { |key|
+              column = m[key.to_sym]
+              value = opts.delete(key)
 
-              op =
-                if value.nil?
-                  infix.new(:'?', column, locale).not
-                else
-                  predicate = Arel::Nodes.build_quoted({ Mobility.locale => value }.to_json)
-                  infix.new(:'@>', m[attr.to_sym], predicate)
-                end
-              ops ? ops.and(op) : op
-            }
+              if value.nil?
+                infix.new(:'?', column, locale).not
+              else
+                predicate = Arel::Nodes.build_quoted({ Mobility.locale => value }.to_json)
+                infix.new(:'@>', m[key.to_sym], predicate)
+              end
+            }.inject(&:and)
 
             opts.empty? ? super(i18n_query) : super(opts, *rest).where(i18n_query)
           else
@@ -47,14 +45,13 @@ module Mobility
               opts = opts.with_indifferent_access
               infix = Arel::Nodes::InfixOperation
 
-              i18n_query = i18n_keys.inject(nil) { |ops, attr|
-                column = m[attr.to_sym]
+              i18n_query = i18n_keys.map { |key|
+                column = m[key.to_sym]
                 has_key = infix.new(:'?', column, locale)
-                predicate = Arel::Nodes.build_quoted({ Mobility.locale => opts.delete(attr) }.to_json)
-                not_eq_value = infix.new(:'@>', m[attr.to_sym], predicate).not
-                op = has_key.and(not_eq_value)
-                ops ? ops.and(op) : op
-              }
+                predicate = Arel::Nodes.build_quoted({ Mobility.locale => opts.delete(key) }.to_json)
+                not_eq_value = infix.new(:'@>', m[key.to_sym], predicate).not
+                has_key.and(not_eq_value)
+              }.inject(&:and)
 
               super(opts, *rest).where(i18n_query)
             else

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

@@ -25,7 +25,6 @@ instance. See {Mobility::Plugins::AttributeMethods} for further details.
               attributes.merge(name.to_s => send(name))
             end)
           end
-          delegate :translated_attribute_names, to: :class
         end
 
         def included(model_class)

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store