object_attorney 2.2.6 → 2.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjVkNTljNjRiNzdkYzJhMTU2N2ZkM2UzYTU2ZmFkZTQ5ODUxMmQ4Mw==
+    MTk2Njg3MTNjZmFiOGMwYzc3MjQ4MDNjZmFmZmQ0YzcwYjA5YjdmMQ==
   data.tar.gz: !binary |-
-    MWQwZGRhNzkzNmYyMGY5ZGIxMWVhZDQ2ZDQ3ZGY0ZDQxYzViNzI0ZA==
+    MWJiYTU4MjkzOTZhYTU0ODUxYjZmZjViNWE1YTBmNDlhMjA2NGQ2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    M2U0Mjc0NWIwYzVmZTUzNDA5Y2I5NGQ0MDg1NDQxNzE0MGMwNmNiNWJkYTc3
-    NGViYzY3MmYxMmU3MzQ0MGE3MjBjYmM2ZjNkOWQ1OGViZjVjZTRhMDYzYTNj
-    ODc5YTFjYjk5OGQxNzMzYjAxZTU3NjA3YWY3YmQ4OTYwNWZiYTA=
+    OTNkZjU2MTUyNGMzNDk2ZWU0NGJhNDA3YjYyNmJiZDI4OTE5NGZhOWM0OWU0
+    YWUyMzNjY2Q2YTA1YTVhNTYyZThhZTZmNTVjYTU3YjQ5YzFjZDE0MmFmMDY2
+    NjVjNWQwYTQyMDFmNDIwZWJhYjFmZDkxNGZjMjMwNTJlNzU1Mjk=
   data.tar.gz: !binary |-
-    M2UwZmQ2MWJiZGMwNTc5NTIxZjQ0YjA5MzJlZjFkYTE2NjAzNGQyN2U1NjZh
-    ZjJmZjE1MzAzNzkzNmY5OGMzODZiZDFlMDkzMjliOTUwYWQ1MDdiMTg5NDUx
-    YTRjOTNmMDI4ODZhZTIwNGEwYjRhZDYxNjgyYTBhMTQ1MjM4YWM=
+    ZDA3NmVkZmY1ZjI0NWQ2OWYwMTg5MzFmYjIyN2UwMDM3NDY3NTRkODA5NWVm
+    OTlkMGZkNDhmNTJhMjNjYmMxNzhlYjU4NDg4MzhjYjAwNTQ3MDJhNDE2MzA3
+    NzE5YzI2N2MyMjcxNzY2NWQ3ZDA1Y2U1MzBlMWQwYmNiMTczYjI=

data/lib/object_attorney/nested_objects.rb

@@ -3,6 +3,12 @@ require "object_attorney/association_reflection"
 module ObjectAttorney
   module NestedObjects
 
+    def initialize_nested_attributes
+      self.class.reflect_on_all_associations.each do |reflection|
+        self.instance_variable_set("@#{reflection.name}_attribtues", {})
+      end
+    end
+
     def mark_for_destruction
       @marked_for_destruction = true
     end
@@ -218,7 +224,7 @@ module ObjectAttorney
         self.instance_variable_set("@#{nested_object_name}_reflection", reflection)
         self.instance_variable_set("@association_reflections", association_reflections | [reflection])
 
-        define_nested_attributes_accessor(nested_object_name)
+        self.send(:attr_accessor, "#{nested_object_name}_attributes".to_sym)
 
         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) }
@@ -242,12 +248,12 @@ module ObjectAttorney
 
       private ############################### PRIVATE METHODS ###########################
 
-      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_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?

data/lib/object_attorney/version.rb

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

data/lib/object_attorney.rb

@@ -8,13 +8,15 @@ require 'active_record'
 module ObjectAttorney
 
   def initialize(attributes = {}, object = nil)
-    before_initialize(attributes)
+    initialize_nested_attributes
 
     if !attributes.is_a?(Hash) && object.blank?
       object = attributes
       attributes = nil
     end
 
+    before_initialize(attributes)
+
     attributes = {} if attributes.blank?
 
     @represented_object = object if object.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - João Gonçalves