active_delegate 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b7e693e22c66982f05158ef1df7ac3a1f5f1f2
-  data.tar.gz: 198ecbb8547fe818fea48ddf07eb1ca5fdb879ea
+  metadata.gz: 4d157fcd42a41e6a9106addbf103a551543d9443
+  data.tar.gz: 181bc82d7f83e017d77438bee17a3fd1ff4225f5
 SHA512:
-  metadata.gz: 168cede4634ec480bab04354409d72f6306cceccfb27ad5c18e6a51ea686d3e308da13a81572540cb461ab4735e73c46124f4f10d217d094f1d1707edbd3b7ff
-  data.tar.gz: e71530500911af1ac072a82c4e0d29feb0e03a76ef0f23dfcd0b5ac9ec6a7ad79e1bd5286da0c29e41b4e4b9eeb6168b32d7bd07fb4e142fbe5aa85e81b20e66
+  metadata.gz: 19ab087839bd3766cb65f23caa4e9fc33d5bc7043b6488ccab65b67b2b5f222fd480a95f5c31474d1af6b06f8ddc473bbde2851d997530565816052cda366b16
+  data.tar.gz: 4c89f450c882dc11f0b0200c5631c82dabfbde717c319e2e107ed9a4fc8f559673595c65967a7294b0803061a097675de148565d3eb0cee8c819941a3b43321a

data/Gemfile.lock

@@ -1,28 +1,29 @@
 PATH
   remote: .
   specs:
-    active_delegate (0.1.1)
+    active_delegate (0.1.2)
       activerecord (~> 5.0)
       i18n (~> 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (8.0.0)
     concurrent-ruby (1.0.5)
-    i18n (0.8.4)
-    minitest (5.10.2)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.10.3)
     rake (10.5.0)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
@@ -38,4 +39,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.14.6
+   1.15.4

data/lib/active_delegate/attributes.rb

@@ -180,11 +180,13 @@ module ActiveDelegate
         attr_method = :"find_by_#{attrib}"
 
         @model.send(:define_singleton_method, attr_method) do |value|
-          includes(attr_assoc).find_by(attr_table => { attr_name => value })
+          value = type_caster.type_cast_for_database(attr_name, value)
+          joins(attr_assoc).find_by(attr_table => { attr_name => value })
         end
 
         @model.send(:define_singleton_method, :"#{attr_method}!") do |value|
-          includes(attr_assoc).find_by!(attr_table => { attr_name => value })
+          value = type_caster.type_cast_for_database(attr_name, value)
+          joins(attr_assoc).find_by!(attr_table => { attr_name => value })
         end
       end
 
@@ -195,23 +197,25 @@ module ActiveDelegate
         attr_blank = { attr_table => { attr_name => nil } }
 
         @model.scope :"with_#{attrib}", -> (*names) do
-          named = { attr_table => { attr_name => names } }
-
           if names.empty?
-            includes(attr_assoc).where.not(attr_blank)
+            left_outer_joins(attr_assoc).where.not(attr_blank)
           else
-            includes(attr_assoc).where(named)
+            names = names.map { |n| type_caster.type_cast_for_database(attr_name, n) }
+            named = { attr_table => { attr_name => names } }
+
+            left_outer_joins(attr_assoc).where(named)
           end
         end
 
         @model.scope :"without_#{attrib}", -> (*names) do
-          named = { attr_table => { attr_name => names } }
-
           if names.empty?
-            includes(attr_assoc).where(attr_blank)
+            left_outer_joins(attr_assoc).where(attr_blank)
           else
-            includes(attr_assoc).where(attr_blank)
-            .or(includes(attr_assoc).where.not(named))
+            names = names.map { |n| type_caster.type_cast_for_database(attr_name, n) }
+            named = { attr_table => { attr_name => names } }
+
+            left_outer_joins(attr_assoc).where(attr_blank)
+            .or(left_outer_joins(attr_assoc).where.not(named))
           end
         end
       end

data/lib/active_delegate/version.rb

@@ -1,3 +1,3 @@
 module ActiveDelegate
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_delegate
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord