mobility 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467aca5ee0a6e74cadac7d747155c0939f28d29a
-  data.tar.gz: 3dc1bb58a099f817cbfc0485c6627a4c336fe76b
+  metadata.gz: aac3bb5bf5117b879aeeeea717cfd40bca0bbf55
+  data.tar.gz: 8348b8cd48048d74457084c434488abdb5ffc73f
 SHA512:
-  metadata.gz: 0aaac38959f17591a70347eb5002a6df688964cb17c8b10225f7baf5eebb9f2fa540c98af4cfd34f681aa6e0bbf51c6718829b61d347313d5dd43e428f90484b
-  data.tar.gz: 3d8a226d567fbe9fbe64ac62393127e8f92b8e04b789cc861ac0a4ea37894344ba6de440de9627ec11af48d17a41a89c335e593d81f407f00a25c7fab51338d6
+  metadata.gz: d7f75384116e3af82a6f6d6424a0bed7532fef85868939c050abe295495adbfb9addf118c47bde7087b30942c2edf201263bed57c7ecb38ab42b1e52a6275d95
+  data.tar.gz: de8f613e3047477e9ee5d2de368bb71cbb1d3a9101404f810d765f430dedd8db626b77403e46fba047ec1573e7eb751a45f4763bbf4fe5782c802d8b881fbbad

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Mobility Changelog
+
+## 0.1.2
+
+* Fix issues with querying in ActiveRecord jsonb and hstore backends (758608294076249f1a66553c55531fc7897a71e3 and 5e6addd6f01cf255f5e71666324502ace96d3eac)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    mobility (0.0.1)
-      i18n
+    mobility (0.1.1)
+      i18n (>= 0.6.10)
       request_store (~> 1.0)
 
 GEM
@@ -147,7 +147,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   rspec-its (~> 1.2.0)
   sqlite3
-  yard
+  yard (~> 0.9.0)
 
 BUNDLED WITH
    1.12.5

data/README.md

@@ -1,4 +1,6 @@
 # Mobility
+![Build Status](https://travis-ci.org/shioyama/mobility.svg?branch=master)
+
 
 Mobility is a gem for storing and retrieving localized data through attributes
 on a class. A variety of different storage strategies are supported through
@@ -499,7 +501,7 @@ To this end, Mobility backends strictly enforce the rule that *no backend
 should modify a parent class in any way which would interfere with other
 backends operating on the same class*. This is done using a heavy dose of
 metaprogramming, details of which can be found in the [API
-documentation](http://www.rubydoc.info/gems/mobility) and in the actual code.
+documentation](http://www.rubydoc.info/gems/mobility/0.1.1) and in the actual code.
 
 In practice, this means that you can use different backends for different
 attributes *on the same class* without any conflict, e.g. (assuming we
@@ -579,7 +581,7 @@ end
 
 For details on how to define a backend class, see the {Mobility::Backend}
 module and other classes defined in the [API
-documentation](http://www.rubydoc.info/gems/mobility).
+documentation](http://www.rubydoc.info/gems/mobility/0.1.1).
 
 ### Testing Backends
 
@@ -624,7 +626,7 @@ particular implementations.
 ## More Information
 
 - [Github repository](https://www.github.com/shioyama/mobility)
-- [API documentation](http://www.rubydoc.info/gems/mobility)
+- [API documentation](http://www.rubydoc.info/gems/mobility/0.1.1)
 
 ## License
 

data/Rakefile

@@ -18,6 +18,7 @@ namespace :db do
     require "database"
     driver = Mobility::Test::Database.driver
     config = Mobility::Test::Database.config[driver]
+    exit if config["database"] == ":memory:"
     commands = {
       "mysql"    => "mysql -u #{config['username']} -e 'create database #{config["database"]};' >/dev/null",
       "postgres" => "psql -c 'create database #{config['database']};' -U #{config['username']} >/dev/null"
@@ -30,6 +31,7 @@ namespace :db do
     require "database"
     driver = Mobility::Test::Database.driver
     config = Mobility::Test::Database.config[driver]
+    exit if config["database"] == ":memory:"
     commands = {
       "mysql"    => "mysql -u #{config['username']} -e 'drop database #{config["database"]};' >/dev/null",
       "postgres" => "psql -c 'drop database #{config['database']};' -U #{config['username']} >/dev/null"
@@ -39,6 +41,10 @@ namespace :db do
 
   desc "Set up the database schema"
   task :up => :load_path do
+    require "database"
+    driver = Mobility::Test::Database.driver
+    config = Mobility::Test::Database.config[driver]
+    exit if config["database"] == ":memory:"
     require "spec_helper"
     Mobility::Test::Schema.up
   end

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

@@ -7,19 +7,25 @@ module Mobility
 
         define_method :where! do |opts, *rest|
           if i18n_keys = attributes_extractor.call(opts)
-            locale = Mobility.locale
+            m = arel_table
+            locale = Arel::Nodes.build_quoted(Mobility.locale.to_s)
             opts = opts.with_indifferent_access
+            infix = Arel::Nodes::InfixOperation
 
-            result = i18n_keys.inject(all) do |scope, attr|
+            i18n_query = i18n_keys.inject(nil) { |ops, attr|
+              column = m[attr.to_sym]
               value = opts.delete(attr)
-              if value.nil?
-                scope.where.not("#{table_name}.#{attr} ? '#{locale}'")
-              else
-                scope.where!("#{table_name}.#{attr} @> hstore('#{locale}', ?)", value.to_s)
-              end
-            end
-            result = result.where!(opts, *rest) if opts.present?
-            result
+
+              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
+            }
+
+            opts.empty? ? where(i18n_query) : super(opts, *rest).where(i18n_query)
           else
             super(opts, *rest)
           end
@@ -29,18 +35,25 @@ module Mobility
       def extended(relation)
         super
         attributes_extractor = @attributes_extractor
-        table_name = relation.model.table_name
+        m = relation.model.arel_table
 
         mod = Module.new do
           define_method :not do |opts, *rest|
             if i18n_keys = attributes_extractor.call(opts)
-              locale = Mobility.locale
+              locale = Arel::Nodes.build_quoted(Mobility.locale.to_s)
               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)
+                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
+              }
 
-              i18n_keys.inject(relation) { |scope, attr|
-                scope.where!("#{table_name}.#{attr} ? '#{locale}'").
-                  where.not("#{table_name}.#{attr} @> hstore('#{locale}', ?)", opts.delete(attr).to_s)
-              }.where.not(opts, *rest)
+              super(opts, *rest).where(i18n_query)
             else
               super(opts, *rest)
             end

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

@@ -7,19 +7,26 @@ module Mobility
 
         define_method :where! do |opts, *rest|
           if i18n_keys = attributes_extractor.call(opts)
-            locale = Mobility.locale
+            m = arel_table
+            locale = Arel::Nodes.build_quoted(Mobility.locale.to_s)
             opts = opts.with_indifferent_access
+            infix = Arel::Nodes::InfixOperation
 
-            result = i18n_keys.inject(all) do |scope, attr|
+            i18n_query = i18n_keys.inject(nil) { |ops, attr|
+              column = m[attr.to_sym]
               value = opts.delete(attr)
-              if value.nil?
-                scope.where.not("#{table_name}.#{attr} ? :locale", locale: locale)
-              else
-                scope.where!("#{table_name}.#{attr} @> (?)::jsonb", { locale => value }.to_json)
-              end
-            end
-            result = result.where!(opts, *rest) if opts.present?
-            result
+
+              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
+            }
+
+            opts.empty? ? where(i18n_query) : super(opts, *rest).where(i18n_query)
           else
             super(opts, *rest)
           end
@@ -29,18 +36,25 @@ module Mobility
       def extended(relation)
         super
         attributes_extractor = @attributes_extractor
-        table_name = relation.model.table_name
+        m = relation.model.arel_table
 
         mod = Module.new do
           define_method :not do |opts, *rest|
             if i18n_keys = attributes_extractor.call(opts)
-              locale = Mobility.locale
+              locale = Arel::Nodes.build_quoted(Mobility.locale.to_s)
               opts = opts.with_indifferent_access
+              infix = Arel::Nodes::InfixOperation
+
+              i18n_query = i18n_keys.inject(nil) { |ops, attr|
+                column = m[attr.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
+              }
 
-              i18n_keys.inject(relation) { |scope, attr|
-                scope.where!("#{table_name}.#{attr} ? :locale", locale: locale).
-                  where.not("#{table_name}.#{attr} @> (?)::jsonb", { locale => opts.delete(attr) }.to_json)
-              }.where.not(opts, *rest)
+              super(opts, *rest).where(i18n_query)
             else
               super(opts, *rest)
             end

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -130,6 +130,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile