object_attorney 2.2.5 → 2.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTA4OTVjZjA2YTQxNTgwMzJlYThkYmVkMzU4M2M1MmY4ODUzM2RjOA==
+    NjVkNTljNjRiNzdkYzJhMTU2N2ZkM2UzYTU2ZmFkZTQ5ODUxMmQ4Mw==
   data.tar.gz: !binary |-
-    Njc5MjUzNjdiZWUwNWY4NmNmZmNhMTY4OGQ3YTNhZmNkOTczNTA2ZQ==
+    MWQwZGRhNzkzNmYyMGY5ZGIxMWVhZDQ2ZDQ3ZGY0ZDQxYzViNzI0ZA==
 SHA512:
   metadata.gz: !binary |-
-    OGFjYWQ2ZWM5ODE1YmJlNmQ1YTY2YmYxZDNkZTM4YTM0N2FhMjBkOTU4NTNk
-    NjMxMGUzNjhjNWUwYzE2OGQ3NDc0ZDA2NmE4MDAzM2YwNmExMjc4ZjEyNDE0
-    Y2VjNDA1MWRiN2NkZmRiNTlmNWIwMjM2ZjY5MzI5YzUzMWVhMzE=
+    M2U0Mjc0NWIwYzVmZTUzNDA5Y2I5NGQ0MDg1NDQxNzE0MGMwNmNiNWJkYTc3
+    NGViYzY3MmYxMmU3MzQ0MGE3MjBjYmM2ZjNkOWQ1OGViZjVjZTRhMDYzYTNj
+    ODc5YTFjYjk5OGQxNzMzYjAxZTU3NjA3YWY3YmQ4OTYwNWZiYTA=
   data.tar.gz: !binary |-
-    ZGU3MmU1NmY5NzFjYTkwMTM5YmNkNWNjYWUwODgxN2FjNmY0YjdmNjhkMzMw
-    NzgwMDk0Yzc3OTRiYjM3OGFjMTI0ZTQzNDhhMTBjNTU5MWQxNGM4NTAyOTZl
-    NGI5ZTlkNjVhMmIwNmRmODg5Nzg2ODdkY2E3ODZhMDc0OWNjMWY=
+    M2UwZmQ2MWJiZGMwNTc5NTIxZjQ0YjA5MzJlZjFkYTE2NjAzNGQyN2U1NjZh
+    ZjJmZjE1MzAzNzkzNmY5OGMzODZiZDFlMDkzMjliOTUwYWQ1MDdiMTg5NDUx
+    YTRjOTNmMDI4ODZhZTIwNGEwYjRhZDYxNjgyYTBhMTQ1MjM4YWM=

data/lib/object_attorney.rb

@@ -8,6 +8,8 @@ require 'active_record'
 module ObjectAttorney
 
   def initialize(attributes = {}, object = nil)
+    before_initialize(attributes)
+
     if !attributes.is_a?(Hash) && object.blank?
       object = attributes
       attributes = nil
@@ -20,7 +22,7 @@ module ObjectAttorney
     assign_attributes attributes
     mark_for_destruction_if_necessary(self, attributes)
 
-    init(attributes)
+    after_initialize(attributes)
   end
 
   def assign_attributes(attributes = {})
@@ -43,7 +45,8 @@ module ObjectAttorney
 
   protected #################### PROTECTED METHODS DOWN BELOW ######################
 
-  def init(attributes); end
+  def before_initialize(attributes); end
+  def after_initialize(attributes); end
 
   def allowed_attribute(attribute)
     respond_to?("#{attribute}=")

data/lib/object_attorney/nested_objects.rb

@@ -185,11 +185,14 @@ module ObjectAttorney
     def existing_nested_objects(nested_object_name)
       nested_relection = self.class.reflect_on_association(nested_object_name)
 
-      existing = represented_object.blank? ? nested_relection.klass.all : represented_object.send(nested_object_name)
-      existing ||= (nested_relection.has_many? ? [] : nil)
+      existing = represented_object.blank? ? nested_relection.klass.all : (represented_object.send(nested_object_name) || (nested_relection.has_many? ? [] : nil))
       
-      if represented_object.present? && existing.respond_to?(:map) && nested_relection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
-        existing = existing.map { |existing_nested_object| nested_relection.klass.new({}, existing_nested_object) }
+      if represented_object.present? && nested_relection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
+        if existing.respond_to?(:map)
+          existing = existing.map { |existing_nested_object| nested_relection.klass.new({}, existing_nested_object) }
+        else
+          existing = nested_relection.klass.new({}, existing)
+        end
       end
 
       existing
@@ -198,15 +201,15 @@ module ObjectAttorney
     module ClassMethods
 
       def has_many(nested_object_name, options = {})
-        _accepts_nested_objects_overwrite_macro(nested_object_name, options, :has_many)
+        accepts_nested_objects_overwrite_macro(nested_object_name, options, :has_many)
       end
 
       def has_one(nested_object_name, options = {})
-        _accepts_nested_objects_overwrite_macro(nested_object_name, options, :has_one)
+        accepts_nested_objects_overwrite_macro(nested_object_name, options, :has_one)
       end
 
       def belongs_to(nested_object_name, options = {})
-        _accepts_nested_objects_overwrite_macro(nested_object_name, options, :belongs_to)
+        accepts_nested_objects_overwrite_macro(nested_object_name, options, :belongs_to)
       end
 
       def accepts_nested_objects(nested_object_name, options = {})
@@ -215,11 +218,13 @@ module ObjectAttorney
         self.instance_variable_set("@#{nested_object_name}_reflection", reflection)
         self.instance_variable_set("@association_reflections", association_reflections | [reflection])
 
-        self.send(:attr_accessor, "#{nested_object_name}_attributes".to_sym)
+        define_nested_attributes_accessor(nested_object_name)
 
         define_method(nested_object_name) { nested_getter(nested_object_name) }
         define_method("build_#{reflection.single_name}") { |attributes = {}, nested_object = nil| build_nested_object(nested_object_name, attributes) }
         define_method("existing_#{nested_object_name}") { existing_nested_objects(nested_object_name) }
+
+        define_nested_ids_accessor(nested_object_name, reflection)
       end
 
       def association_reflections
@@ -237,7 +242,24 @@ module ObjectAttorney
 
       private ############################### PRIVATE METHODS ###########################
 
-      def _accepts_nested_objects_overwrite_macro(nested_object_name, options, macro)
+      def define_nested_attributes_accessor(nested_object_name)
+        self.send(:attr_writer, "#{nested_object_name}_attributes".to_sym)
+        module_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+          def #{nested_object_name}_attributes; @#{nested_object_name}_attributes ||= {}; end
+        RUBY_EVAL
+      end
+
+      def define_nested_ids_accessor(nested_object_name, reflection)
+        return nil unless reflection.has_many?
+
+        module_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+          def #{reflection.single_name}_ids
+            @#{reflection.single_name}_ids ||= nested_object_name.map(&:#{reflection.primary_key})
+          end
+        RUBY_EVAL
+      end
+
+      def accepts_nested_objects_overwrite_macro(nested_object_name, options, macro)
         default_options = { macro: macro }
         options = options.is_a?(Hash) ? options.merge(default_options) : default_options
         accepts_nested_objects(nested_object_name, options)

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,4 +157,3 @@ test_files:
 - spec/support/models/comment.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
-has_rdoc: