active_delegate 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b25f154bc3bf1b847b20e9b4b410523881d47f1
-  data.tar.gz: 99f6ddd155f8d6e52fc72d0de2fab400604366a0
+  metadata.gz: 1b9615c5b90ac00644880da87395a7540564480f
+  data.tar.gz: eb3b41a9fb3433b2a607e05b60561eedd89dc46c
 SHA512:
-  metadata.gz: a37d3dc37ab0f5a6bc55ba414179758c470e73cd8dbf95df474e8783f7b262abd2d59b69cb961582de5aad7dd997b84ac46b62549e5f96d76c35dba65959490f
-  data.tar.gz: f8fe8f1bcec56fda65430bc519d05d5092c66b46dfa0ecaea64a70f2c17ad7ba66825fee08591e89c4b6c309344a7fbc4f9817fc227e5cbae8ed8e8fa5b2dfdb
+  metadata.gz: 963a209b92c4c07ef31784e7d3fdd47420e40c3982309f477034cf9fc714acb74c84ae8b45dc2376bc6c018c15100e627107e6152d85d44e9f21ae04486cc025
+  data.tar.gz: 2df53eb000aa943ac0683e661b7fc38e1e40773f67db68ec1a61cee2913691b797ba331a901c46547a21d512845649861db124a8ab22379e73cc4f5dbfd598f3

data/lib/active_delegate.rb

@@ -17,7 +17,15 @@ module ActiveDelegate
 
     # Delegate attributes
     def delegate_attributes(*args)
-      options = args.extract_options!
+      options = args.extract_options!.except(:single, :cast_type, :alias)
+      Attributes.new(self, options)
+    end
+
+    # Delegate attribute
+    def delegate_attribute(attribute, cast_type, options={})
+      options = options.except(:only, :except)
+      options = options.merge(only: [attribute], single: true, cast_type: cast_type)
+
       Attributes.new(self, options)
     end
   end

data/lib/active_delegate/attributes.rb

@@ -48,18 +48,11 @@ module ActiveDelegate
         [:id, :created_at, :updated_at] + poly_attr.to_a
       end
 
-      # Get method attributes
-      def association_valid_methods(attributes)
-        assoc_methods = association_class.public_instance_methods
-        attributes.to_a.select { |a| a.in? assoc_methods }
-      end
-
       # Get delegatable attributes
       def delegatable_attributes
         attributes = association_attribute_names.map(&:to_sym)
         attributes = attributes & @options[:only].to_a   if @options[:only].present?
         attributes = attributes - @options[:except].to_a if @options[:except].present?
-        attributes = attributes + association_valid_methods(@options[:only])
         attributes = attributes - default_excluded_attributes
 
         attributes.map(&:to_sym)
@@ -119,16 +112,18 @@ module ActiveDelegate
 
       # Save delagated attributes in model class
       def save_delegated_attributes
-        dl_method = :"#{@options[:to]}_attribute_names"
+        dl_atable = association_reflection.klass.table_name
+        dl_method = :"#{dl_atable}_attribute_names"
+
         delegated = prefix_attributes(delegatable_attributes)
-        delegated = @model.try(dl_method).to_a.concat(delegated)
+        define_attribute_names_and_types(delegated)
 
+        delegated = @model.try(dl_method).to_a.concat(delegated)
         @model.send(:define_singleton_method, dl_method) { delegated }
-        define_attribute_names_and_types(delegated)
 
         if @options[:localized].present?
           localized = prefix_attributes(localized_attributes)
-          lc_method = :"#{@options[:to]}_localized_attribute_names"
+          lc_method = :"#{dl_atable}_localized_attribute_names"
 
           @model.send(:define_singleton_method, lc_method) { localized }
         end
@@ -136,11 +131,20 @@ module ActiveDelegate
 
       # Define attribute names and types
       def define_attribute_names_and_types(attributes)
-        attributes.each do |attrib|
+        existing  = association_attribute_names.map(&:to_sym)
+        undefined = attributes.reject { |a| a.in? existing }
+
+        undefined.each do |attrib|
           attr_name = attrib.to_s.sub("#{attribute_prefix}_", '')
-          cast_type = association_class.attribute_types["#{attr_name}"]
+          attr_deft = @options[:default] || association_class.column_defaults["#{attr_name}"]
+          cast_type = @options[:cast_type] || association_class.attribute_types["#{attr_name}"]
+
+          @model.attribute(attrib, cast_type, default: attr_deft)
 
-          @model.attribute(attrib, cast_type) unless cast_type.nil?
+          if @options[:alias].present?
+            @model.attribute(@options[:alias], cast_type, default: attr_deft)
+            @model.alias_attribute(@options[:alias], attrib)
+          end
         end
       end
   end

data/lib/active_delegate/version.rb

@@ -1,3 +1,3 @@
 module ActiveDelegate
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

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