mobility 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4475c1c4828150f79f535dd8974561e2d5b819
-  data.tar.gz: 03ce38c5557fb60468f07b3eae5b8f797625c798
+  metadata.gz: 940b49f8c3a48cc006aa2a981627065adcc7a645
+  data.tar.gz: 75aef5224d15662c0297f5bf0665d496d08c2118
 SHA512:
-  metadata.gz: 2a19d72816a4c76d79a6e46a7d5a5f3eb63e6620a38a0bd29f1cc0dd7ed2361dbae12b3678afde7277d29397d8de1aed4788d99718edbea5139b0c3b0899a754
-  data.tar.gz: d9d15056bd2bfdc5238e5bb4003ae3352df6581175abd6d899546064bda8e1f41f3377124ea5309df78715fdb4d3e6262624ccdccf9c8203d94e84c3a19f86d3
+  metadata.gz: a4e0c11a3349d6761afe95d858a9c85887ddb442713076a6f064ab59bcb6e957646bbaac68c3b0d8b9715e54af5dca03b1332cc55d06defaa62e8406e5a11778
+  data.tar.gz: cff9fff5d014f38c90a81ade0ce87f8d007c02dcfd7090a61c73e0472c939c95fe05048256b7d09a3676a8cd9648d618db0a2ba14abc3ab723cbeb5d9b8040b3

data/CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## 0.4
 
+### 0.4.2 (January 29, 2018)
+* Refactor find_by for translated attributes
+  ([#160](https://github.com/shioyama/mobility/pull/160))
+
 ### 0.4.1 (January 29, 2018)
-* Use element operator instead of contains for jsonb query8ing
+* Use element operator instead of contains for jsonb querying
   ([#159](https://github.com/shioyama/mobility/pull/159))
 
 ### 0.4.0 (January 24, 2018)

data/Gemfile.lock

@@ -1,52 +1,21 @@
 PATH
   remote: .
   specs:
-    mobility (0.4.0)
+    mobility (0.4.1)
       i18n (>= 0.6.10, < 0.10)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.0.beta2)
-      actionview (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-    activerecord (5.2.0.beta2)
-      activemodel (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-      arel (>= 9.0)
-    activesupport (5.2.0.beta2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
     benchmark-ips (2.7.2)
-    builder (3.2.3)
     byebug (9.1.0)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
-    erubi (1.7.0)
     ffi (1.9.18)
     formatador (0.2.5)
-    generator_spec (0.9.4)
-      activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -67,17 +36,10 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.1.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
     lumberjack (1.0.12)
     method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
     mysql2 (0.4.10)
     nenv (0.3.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -89,19 +51,6 @@ GEM
       byebug (~> 9.1)
       pry (~> 0.10)
     rack (2.0.3)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.2.0.beta2)
-      actionpack (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -122,31 +71,27 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     ruby_dep (1.5.0)
+    sequel (5.4.0)
     shellany (0.0.1)
     sqlite3 (1.3.13)
     thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
     yard (0.9.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 5.2.0.beta1, < 5.3)
   benchmark-ips
   bundler (~> 1.12)
   database_cleaner (~> 1.5, >= 1.5.3)
-  generator_spec (~> 0.9.4)
   guard-rspec
   mobility!
   mysql2 (~> 0.4.9)
   pg (< 1.0)
   pry-byebug
-  railties (>= 5.2.0.beta1, < 5.3)
   rake (~> 12, >= 12.2.1)
   rspec (~> 3.0)
+  sequel (>= 5.0.0, < 6.0.0)
   sqlite3
   yard (~> 0.9.0)
 

data/README.md

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

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

@@ -10,12 +10,6 @@ module Mobility
         define_method :where! do |opts, *rest|
           super(q.convert_opts(opts), *rest)
         end
-
-        attributes.each do |attribute|
-          define_method :"find_by_#{attribute}" do |value|
-            find_by(Column.column_name_for(attribute) => value)
-          end
-        end
       end
 
       def extended(relation)

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

@@ -9,12 +9,6 @@ module Mobility
 
         define_join_method(association_name, class_name)
         define_query_methods(association_name)
-
-        attributes.each do |attribute|
-          define_method :"find_by_#{attribute}" do |value|
-            find_by(attribute.to_sym => value)
-          end
-        end
       end
 
       def extended(relation)

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

@@ -11,6 +11,12 @@ models. For details see backend-specific subclasses.
         # @param [Array<String>] attributes Translated attributes
         def initialize(attributes, _)
           @attributes = attributes
+
+          attributes.each do |attribute|
+            define_method :"find_by_#{attribute}" do |value|
+              find_by(attribute.to_sym => value)
+            end
+          end
         end
 
         # @param [ActiveRecord::Relation] relation Relation being extended

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

@@ -11,12 +11,6 @@ module Mobility
 
         define_join_method(association_name, translation_class, **options)
         define_query_methods(association_name, translation_class, **options)
-
-        attributes.each do |attribute|
-          define_method :"find_by_#{attribute}" do |value|
-            find_by(attribute.to_sym => value)
-          end
-        end
       end
 
       def extended(relation)

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

@@ -18,12 +18,6 @@ module Mobility
             end
           end
         end
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(attribute.to_sym => value).first
-          end
-        end
       end
     end
   end

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

@@ -11,16 +11,8 @@ module Mobility
 
       def initialize(attributes, options)
         super
-        column_name = @column_name = options[:column_name]
-
+        @column_name = options[:column_name]
         define_query_methods
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(::Sequel.pg_jsonb_op(column_name)[Mobility.locale.to_s].contains({ attribute => value })).
-              select_all(model.table_name).first
-          end
-        end
       end
 
       private

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

@@ -8,23 +8,10 @@ module Mobility
     class Sequel::Hstore::QueryMethods < Sequel::QueryMethods
       include Sequel::PgQueryMethods
 
-      def initialize(attributes, _)
-        super
-
-        define_query_methods
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(::Sequel.hstore(attribute.to_sym).contains(::Sequel.hstore({ Mobility.locale.to_s => value }))).
-              select_all(model.table_name).first
-          end
-        end
-      end
-
       private
 
       def matches(key, value, locale)
-        build_op(key).contains(locale => value.to_s)
+        build_op(key)[locale] =~ value.to_s
       end
 
       def has_locale(key, locale)

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

@@ -8,19 +8,6 @@ module Mobility
     class Sequel::Jsonb::QueryMethods < Sequel::QueryMethods
       include Sequel::PgQueryMethods
 
-      def initialize(attributes, _)
-        super
-
-        define_query_methods
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(::Sequel.pg_jsonb_op(attribute).contains({ Mobility.locale => value })).
-              select_all(model.table_name).first
-          end
-        end
-      end
-
       private
 
       def matches(key, value, locale)

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

@@ -8,12 +8,6 @@ module Mobility
 
         define_join_method(association_name, class_name)
         define_query_methods(association_name)
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(attribute => value).select_all(model.table_name).first
-          end
-        end
       end
 
       private

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

@@ -18,6 +18,10 @@ jsonb columns.)
 
 =end
       module PgQueryMethods
+        def initialize(attributes, _)
+          super
+          define_query_methods
+        end
 
         # Create query for conditions and translated keys
         # @note This is a destructive action, it will alter +cond+.

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

@@ -13,6 +13,12 @@ models. For details see backend-specific subclasses.
         # @param [Array<String>] attributes Translated attributes
         def initialize(attributes, _)
           @attributes = attributes.map!(&:to_sym)
+
+          attributes.each do |attribute|
+            define_method :"first_by_#{attribute}" do |value|
+              where(attribute.to_sym => value).select_all(model.table_name).first
+            end
+          end
         end
 
         def extract_attributes(cond)

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

@@ -9,12 +9,6 @@ module Mobility
 
         define_join_method(association_name, translation_class, **options)
         define_query_methods(association_name, translation_class, **options)
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(attribute => value).select_all(model.table_name).first
-          end
-        end
       end
 
       def define_join_method(association_name, translation_class, table_name: nil, foreign_key: nil, **)

data/lib/mobility/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Chris Salzberg