object_attorney 2.10.6 → 2.10.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI5YjAyYzdlODkyZWZhMjNlNGJjNzljNDI3YmRkYmY0NzRiMjFmMQ==
+    MjdkN2UzMGQ0YjgwNTMxN2Q4YjEyMDY1OWE1YmZiN2JjYmZhMDI4Mw==
   data.tar.gz: !binary |-
-    MDc0OTc4MGQ0ZDY4NWNhYTQyYTUyMDYxZTg3NWQ4NzQzM2NhYmI3Ng==
+    MWM2YzBmZTg1NzBmMTRkZWM2YmE1YWQ5YzVkZjc5OWUxZTU1YzZkYg==
 SHA512:
   metadata.gz: !binary |-
-    NTBkNmRhNjBkM2RkMTBiMWY3ZjYzZTVkMjc5Yjg4OWE5ZWYxZjhkY2ExZDE5
-    NjEwMmQzZWUyMDg1ZWI4YWJiZDQzNTFkNjU3Zjc4Y2UzZDViZjcwZTI0OWYx
-    NzY3ZWJkODFmZmRkYzgxNzJiZjU3MjU2NjNhZTc2Y2U1ZTA5NWU=
+    NmUwODRmNmEzOWY4Zjg2YTNiY2QyZWYwNDMwMjlkNjBmODJlMWIzOWZjOTUw
+    N2E0MzgyZGI4MTMyYTNmZDRkNDBkYjYyM2E2ZDdjYjQ5YThhNGEyMjFhZDY3
+    ODc4MzhmMmRhNmI2YjZkMGU3N2Y4ZTljYTkxOGJmNmNkMWEwZTc=
   data.tar.gz: !binary |-
-    ZTNlMzMwNmQyOTIwZTNhZjJkMDZlMjAxOTQzYjEzYWVmMzIxOTU0MDlhZjdh
-    ZjQ1MGM0OTAwOGI3Y2JmNTFhNTlhNDA0MDc1OTg0YzQ3NzBhN2Q4Y2UwMTE1
-    ODRkMWNjMmFhYmNhYTkxZGVkMjE5ZDkwOTM4ZDViOWNkMTk4MDE=
+    NGJjM2ZhNDdkMGZiZDc1YzMyMWI2M2ZlOTU5M2QzMjQ4YThlYWMzNjkzNTVi
+    Y2ExNzhhYTIyZjExYTBmZjQwZjdhMWRlZjM2Nzk0NGUwZWIxZDQyNjAwYjI2
+    M2E1ZGU5NTkxNjY4YjFmMmRjNDhjN2U3N2JlMmEyNmVlYzdkN2E=

data/lib/object_attorney/nested_objects.rb

@@ -263,7 +263,7 @@ module ObjectAttorney
         reflection = AssociationReflection.new(nested_object_name, represented_object_reflection, options)
 
         self.instance_variable_set("@#{nested_object_name}_reflection", reflection)
-        self.instance_variable_set("@association_reflections", association_reflections | [reflection])
+        self.instance_variable_set("@association_reflections", association_reflections.merge(nested_object_name => reflection))
 
         self.send(:attr_accessor, "#{nested_object_name}_attributes".to_sym)
 
@@ -273,7 +273,7 @@ module ObjectAttorney
       end
 
       def association_reflections
-        self.instance_variable_get("@association_reflections") || zuper_method('association_reflections') || []
+        self.instance_variable_get("@association_reflections") || zuper_method('association_reflections') || {}
       end
 
       def reflect_on_association(association)
@@ -281,9 +281,12 @@ module ObjectAttorney
       end
 
       def reflect_on_all_associations(macro = nil)
-        macro ? association_reflections.select { |reflection| reflection.macro == macro } : association_reflections
+        macro ? association_reflections.values.select { |reflection| reflection.macro == macro } : association_reflections.values
       end
 
+      def reflections
+        association_reflections
+      end
 
       private ############################### PRIVATE METHODS ###########################
 

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.10.6"
+  VERSION = "2.10.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.10.7
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler