active_delegate 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e32e13c8c9845a3a17e841ddb1eaa2d5f9121a
-  data.tar.gz: 0ed1a3d1c8ca242f17e4380b71580a67b5ee37c9
+  metadata.gz: db4ce7e906bb62440ecead0e66d21d611b9354ac
+  data.tar.gz: e6e9e1b63faaf10d0f7522f7c19cc22563976554
 SHA512:
-  metadata.gz: 5cab38ba25465170241da07c01579281f56f7ad72e423fad6c42a22b3f1769d13963533b67347835fc2a93d1eccab2bbdd1157bae6c59ea9585829136629864a
-  data.tar.gz: '0782f2d0cc0d8f9585921d3fcf4dbedd32ecfcc5768fd45a90019be9343850b4c67733e9d82e1a6bf3cf7fb66558196a00c679e9ff574e1c0ee6b78c569ea2c0'
+  metadata.gz: 11d848253fb51ced3c37e97806dcd15ef71634a501ae6003a65e18a074347406d1b1c12241904b74d58b5ebc37a386d97baf119250fe83fcd0d16ad26686265d
+  data.tar.gz: 51202fe31b97ac2fa6bf6dfa0966681d9b75fc87ef3845b9959674f59403c6f9d7dce06a62682175c14fee417f7cdfdc000c51798557f53a8c1001925dd55df9

data/Gemfile.lock

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

data/lib/active_delegate/attributes.rb

@@ -18,7 +18,11 @@ module ActiveDelegate
 
       # Get default options
       def default_options
-        { except: [], only: [], allow_nil: false, to: [], prefix: nil, localized: false, finder: false, scope: false }
+        {
+          except: [], only: [], allow_nil: false, to: [],
+          prefix: nil, localized: false, finder: false,
+          scope: false, cast: false
+        }
       end
 
       # Get association reflection
@@ -117,12 +121,22 @@ module ActiveDelegate
 
       # Get attribute default
       def attribute_default(attribute)
-        @options[:default] || association_class.column_defaults["#{attribute}"]
+        @options.fetch :default, association_class.column_defaults["#{attribute}"]
       end
 
       # Get attribute cast type
       def attribute_cast_type(attribute)
-        @options[:cast_type] || association_class.attribute_types["#{attribute}"]
+        @options.fetch :cast_type, association_class.type_for_attribute("#{attribute}")
+      end
+
+      # Check if attribute types are not the same
+      def cast_types_mismatch?(attribute)
+        attribute_cast_type(attribute) != association_class.type_for_attribute("#{attribute}")
+      end
+
+      # Check if attribute needs type cast
+      def needs_type_cast?(attribute)
+        @options[:cast] != false && cast_types_mismatch?(attribute)
       end
 
       # Check if should define attribute finders
@@ -163,6 +177,7 @@ module ActiveDelegate
           attr_name = unprefix_attribute(attrib)
 
           define_attribute_default_value(attrib, attr_name)
+          define_attribute_type_cast(attrib, attr_name)
           define_attribute_and_alias(attrib, attr_name)
           define_attribute_finders_and_scopes(attrib, attr_name)
         end
@@ -188,6 +203,29 @@ module ActiveDelegate
         end
       end
 
+      # Define attribute type casting
+      def define_attribute_type_cast(attrib, attr_name)
+        attr_assoc = @options[:to]
+        attr_cattr = :"_attribute_#{attrib}_default"
+
+        if needs_type_cast?(attr_name)
+          @model.class_eval do
+            class_eval <<-EOM, __FILE__, __LINE__ + 1
+              def #{attrib}
+                assoc_value = send(:#{attr_assoc}).try(:#{attr_name})
+                self.class.type_for_attribute('#{attrib}').cast(assoc_value) ||
+                self.class.try(:#{attr_cattr})
+              end
+
+              def #{attrib}=(value)
+                assoc_value = self.class.type_for_attribute('#{attrib}').cast(value)
+                send(:#{attr_assoc}).send(:#{attr_name}=, assoc_value)
+              end
+            EOM
+          end
+        end
+      end
+
       # Define delegated attribute alias
       def define_attribute_and_alias(attrib, attr_name)
         cast_type  = attribute_cast_type(attr_name)
@@ -213,15 +251,11 @@ module ActiveDelegate
 
       # Define attribute finder methods
       def define_attribute_finder_methods(attrib, attr_name, attr_assoc, attr_table)
-        attr_method = :"find_by_#{attrib}"
-
-        @model.send(:define_singleton_method, attr_method) do |value|
-          value = type_caster.type_cast_for_database(attr_name, value)
+        @model.send(:define_singleton_method, :"find_by_#{attrib}") do |value|
           joins(attr_assoc).find_by(attr_table => { attr_name => value })
         end
 
-        @model.send(:define_singleton_method, :"#{attr_method}!") do |value|
-          value = type_caster.type_cast_for_database(attr_name, value)
+        @model.send(:define_singleton_method, :"find_by_#{attrib}!") do |value|
           joins(attr_assoc).find_by!(attr_table => { attr_name => value })
         end
       end
@@ -229,12 +263,10 @@ module ActiveDelegate
       # Define attribute scope methods
       def define_attribute_scope_methods(attrib, attr_name, attr_assoc, attr_table)
         @model.scope :"with_#{attrib}", -> (*names) do
-          names = names.map { |n| type_caster.type_cast_for_database(attr_name, n) }
           joins(attr_assoc).where(attr_table => { attr_name => names })
         end
 
         @model.scope :"without_#{attrib}", -> (*names) do
-          names = names.map { |n| type_caster.type_cast_for_database(attr_name, n) }
           joins(attr_assoc).where.not(attr_table => { attr_name => names })
         end
       end

data/lib/active_delegate/version.rb

@@ -1,3 +1,3 @@
 module ActiveDelegate
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

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