object_attorney 2.5.4 → 2.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY5NmUzNmMwOWVjOWQ0ZjQ5MGQ1NTQzNGEzNGQ4OTA4NWRiZDIwOA==
+    MTcxNjBkZTg0NzIxZDVjN2M5ZGY4MDFmYWZmMmRjYzhkZTM3ZmZkNA==
   data.tar.gz: !binary |-
-    MjIzNTQwMzIxN2ZkY2FhNzU3ZDdjMTM3NmQ1ZWMxOGJiNTBlMjgzNg==
+    YjgyZTY1NmNkZWI2NDAzZGFhNzdhMDk3M2ZkZTIwM2JhMDAyOWRmYg==
 SHA512:
   metadata.gz: !binary |-
-    NjVkNjY1NzdlNDM1OWEyZTdhMTNkMTMxMDhiYWEzYzgzODhkMzllODYwYjM3
-    OWNmMzc0NmQyMGYwM2NlOTNlMTlhNzZkZjdkNWViODc3YjM4ZWQ0YzdlMDVi
-    NDM4YTg2NzA5NzViM2E5M2YxYjYzZmJlMjlkNmQ3YTY4ZmM1NzA=
+    OTUyOGM1OWI3NjYxY2U0NWM4MTcxMDZlNzg3NTJkM2RhOWY2NDBkOWU5Mzg1
+    ZDllZWQxYmM0OTRjZDNmMThmZTI5ZTljNDM4OWViNDU0MTUxZmIxY2MyMDc3
+    N2I3Njg4ZDhjNGYzNTJlOTYyYjU3MWMyZGM2NDRlM2Q4OTJmMTM=
   data.tar.gz: !binary |-
-    MTUyYTZjYzVkOWE1OTM0MDI2NWNkNGQzNGE5NGMwNGIyYjY2YTU4ZTZjMzU0
-    YjE0MDRmYWQ4M2UwYTc2NjM2NjU4ZTUyNjM0MGUwNTYyNzhlMGQzZDQ0ZGFl
-    MDFmZDc2YmFiMTYzOWExNjk5ZWFkYzY4YmJkNjJhYjFjNWYzY2Y=
+    ODYxZjdmY2QyYmQxZTkzYWFlNGM0MGZiNmU0ZmMxZWY1MGZkZWFiOTMwNDEx
+    NTY0NjdjODNkMWJiMmQwYzBhOWFhMjRiNTUxNjRhMGYwOWQzMzkzOWUyMDZk
+    MTZkZWQ3Njc1ZjUxZDZiZTZjZTkzZDM5MzI0MTgxYTQyZWEzODc=

data/lib/object_attorney.rb

@@ -18,7 +18,7 @@ module ObjectAttorney
   def initialize(attributes = {}, object = nil)
     initialize_nested_attributes
 
-    parsing_arguments(attributes, object)
+    attributes, object = parsing_arguments(attributes, object)
 
     before_initialize(attributes)
 

data/lib/object_attorney/attribute_assignment.rb

@@ -21,6 +21,8 @@ module ObjectAttorney
       end
 
       attributes = {} if attributes.blank?
+
+      [attributes, object]
     end
 
     def allowed_attribute(attribute)

data/lib/object_attorney/validations.rb

@@ -22,7 +22,7 @@ module ObjectAttorney
 
     def populate_imposed_errors
       if respond_to?(:represented_object)
-        represented_object.errors.each { |key, value| @imposed_errors[key] = value } if represented_object.present?
+        represented_object.errors.each { |key, value| @imposed_errors[key] = value } if represented_object.present? && represented_object.errors.present?
       else
         errors.each { |key, value| @imposed_errors[key] = value }
       end

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.5.4"
+  VERSION = "2.5.5"
 end

data/spec/object_attorney/user_form_spec.rb

@@ -58,4 +58,13 @@ describe UserForm do
     user_form.user.admin.should == false
   end
 
+  it "6. Initializing 'UserForm' with an object has its first argument." do
+    user = User.create({ email: 'email@gmail.com' })
+    user_form = UserForm.new(user)
+    user_form.terms_of_service = true
+    
+    user_form.save.should == true
+    user_form.user.should == user
+  end
+
 end

metadata

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