mobility 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca3c693e765d0214134a9aba41659f40f74f3a0
-  data.tar.gz: 4f3fd42701ae4dd0bfa0c6ee990a296ec4364d7c
+  metadata.gz: 5b4475c1c4828150f79f535dd8974561e2d5b819
+  data.tar.gz: 03ce38c5557fb60468f07b3eae5b8f797625c798
 SHA512:
-  metadata.gz: 97ffa08e1c6cea2d3301bd642c1ce5c7ea86aae11d59402471afc236cdcc53b6daea6ac9bcfaf34b6cc7e509f09aed205e8b1cba65e1614adb2fd75f0107fda8
-  data.tar.gz: dc1581bded2b253d645172ad28b1e0f1cede386633d1a4d343603869da6561a165b408b7b6ca7722eca5ada6c1c29052b7c7c3f2f9f24f122b25db0fdc9001f2
+  metadata.gz: 2a19d72816a4c76d79a6e46a7d5a5f3eb63e6620a38a0bd29f1cc0dd7ed2361dbae12b3678afde7277d29397d8de1aed4788d99718edbea5139b0c3b0899a754
+  data.tar.gz: d9d15056bd2bfdc5238e5bb4003ae3352df6581175abd6d899546064bda8e1f41f3377124ea5309df78715fdb4d3e6262624ccdccf9c8203d94e84c3a19f86d3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.4
 
+### 0.4.1 (January 29, 2018)
+* Use element operator instead of contains for jsonb query8ing
+  ([#159](https://github.com/shioyama/mobility/pull/159))
+
 ### 0.4.0 (January 24, 2018)
 * Add new jsonb Container backend
   ([#157](https://github.com/shioyama/mobility/pull/157))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.4.0.alpha.1)
+    mobility (0.4.0)
       i18n (>= 0.6.10, < 0.10)
       request_store (~> 1.0)
 
@@ -61,7 +61,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -73,7 +73,7 @@ GEM
     lumberjack (1.0.12)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     mysql2 (0.4.10)
     nenv (0.3.0)
     nokogiri (1.8.1)

data/README.md

@@ -54,7 +54,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.4.0'
+gem 'mobility', '~> 0.4.1'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't

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

@@ -14,10 +14,10 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
-        build_infix(:'@>',
+      def matches(key, value, locale)
+        build_infix(:'->',
                     build_infix(:'->', column, quote(locale)),
-                    quote({ key => value }.to_json))
+                    quote(key)).eq(quote(value.to_json))
       end
 
       def has_locale(key, locale)

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

@@ -8,7 +8,7 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
+      def matches(key, value, locale)
         build_infix(:'->', arel_table[key], quote(locale)).eq(quote(value.to_s))
       end
     end

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

@@ -8,8 +8,8 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
-        build_infix(:'@>', arel_table[key], quote({locale => value }.to_json))
+      def matches(key, value, locale)
+        build_infix(:'->', arel_table[key], quote(locale)).eq(quote(value.to_json))
       end
     end
   end

data/lib/mobility/backends/active_record/pg_query_methods.rb

@@ -4,7 +4,7 @@ module Mobility
 =begin
 
 Defines query methods for Postgres backends. Including class must define a
-single method, +contains_value+, which accepts a column, value and locale to
+single method, +matches+, which accepts a column, value and locale to
 match, and returns an Arel node.
 
 This module avoids 99% duplication between hstore and jsonb backend querying
@@ -70,7 +70,7 @@ code.
             Array.wrap(values).map { |value|
               value.nil? ?
                 has_locale(key, locale).not :
-                contains_value(key, value, locale)
+                matches(key, value, locale)
             }.inject(&:or)
           }.inject(&:and)
         end
@@ -87,14 +87,14 @@ code.
             values = opts.delete(key)
 
             Array.wrap(values).map { |value|
-              contains_value(key, value, locale).not
+              matches(key, value, locale).not
             }.inject(has_locale(key, locale), &:and)
           }.inject(&:and)
         end
 
         private
 
-        def contains_value(_key, _value, _locale)
+        def matches(_key, _value, _locale)
           raise NotImplementedError
         end
 

data/lib/mobility/backends/sequel/container/query_methods.rb

@@ -25,8 +25,8 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
-        build_op(column_name)[locale].contains({ key.to_s => value }.to_json)
+      def matches(key, value, locale)
+        build_op(column_name)[locale][key.to_s] =~ value.to_json
       end
 
       def has_locale(key, locale)

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

@@ -23,7 +23,7 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
+      def matches(key, value, locale)
         build_op(key).contains(locale => value.to_s)
       end
 

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

@@ -23,8 +23,8 @@ module Mobility
 
       private
 
-      def contains_value(key, value, locale)
-        build_op(key).contains({ locale => value }.to_json)
+      def matches(key, value, locale)
+        build_op(key)[locale] =~ value.to_json
       end
 
       def has_locale(key, locale)

data/lib/mobility/backends/sequel/pg_query_methods.rb

@@ -6,14 +6,14 @@ module Mobility
 Defines query methods for Postgres backends. Including class must define two
 private methods:
 
-- a private method +contains_value+ which takes a key (column name), value and
+- a private method +matches+ which takes a key (column name), value and
   locale and returns an SQL expression, and checks that the column has the
   specified value in the specified locale
 - a private method +has_locale+ which takes a key (column name) and locale, and
   returns an SQL expression which checks that the column has a value in the
   locale
 
-(The +contains_value+ method is implemented slightly differently for hstore and
+(The +matches+ method is implemented slightly differently for hstore and
 jsonb columns.)
 
 =end
@@ -66,13 +66,13 @@ jsonb columns.)
           locale = Mobility.locale.to_s
 
           if invert
-            has_locale(key, locale) & ~contains_value(key, value, locale)
+            has_locale(key, locale) & ~matches(key, value, locale)
           else
-            value.nil? ? ~has_locale(key, locale) : contains_value(key, value, locale)
+            value.nil? ? ~has_locale(key, locale) : matches(key, value, locale)
           end
         end
 
-        def contains_value(_key, _value, _locale)
+        def matches(_key, _value, _locale)
           raise NotImplementedError
         end
 

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store