object_attorney 2.9.2 → 2.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTNmNTI5YThjYjcxYThjNmM2YWFmZjY5NjJlNjlkYTYzNGM1MWUwMw==
+    OWNjMWJhMWQwZjk1MTUyYTM2OWM3ZmI1NTRlYmZlYmRlMDMzYzAwNg==
   data.tar.gz: !binary |-
-    MjY5YWNhNmI1ODUwZDUxNzExNzRiMWJhNDE0N2VjZDlkNzlkYzQ2OQ==
+    NjIwMjYxYzU1MmI5YjJkNTA4MTkxM2NjNzQzYTdmODI1Y2JhODM5Mg==
 SHA512:
   metadata.gz: !binary |-
-    ODA1NzdlY2U2NmY0Mzc2YTA1NDk1NGY1ZWQ3ZDhjOTY5Zjg0ZTk1YmZjOTM1
-    MTU5NDMxODAyMmJjYjVhY2ZhZTZlYWFmY2ViOTVjNzI0NjQ1ZTk2ZWQwNGQ5
-    MmM1MzJjMjYyMTRmYWU5YjI5YTRkZDFkYzhjZTViNzBjYmU2NGQ=
+    N2VmY2M4NTg2OGM4NzEyYzM0ODQ2OGQ1NTFlOWYxMmY3N2Y5OTRjNmQyNmU4
+    MWYxZjViZjZlNWY2MTI0MWY3MjY3MGRiOTlhZGNiOTk1YmNiMzJmNTc4YTM2
+    NGJjMDk3MjczZmQwYzkxMzgzY2UyZGE4NTg5MzdjMDQ4N2NlY2M=
   data.tar.gz: !binary |-
-    NjY2YmM2NzNkZWQ0YjZlMTQyOTVmMDNlMTUyZDVjY2FmMjUxNzBhNzMxYzc0
-    ZmZjZjMwNGVlMGFkM2Y1Y2U5NGQ2YWQzMGUxMTI5MmFmNDUwNGQ1OTc5M2E1
-    ZjM4MGMyYTk3MzBkYmQ1ODhlN2YwZjY2ODIwODk3NjgyMTg1OWI=
+    N2NjOGY3MDcyOWU2M2Q3MTdlMzdhMmM2YmFhMzI1MGEwOGZiODc3YTdjODZi
+    ZWZkNTJkYmYxNWY5NGE3ODgzODAzMzQ0MWYzYWM4YmFkZGY0NzgxZDQ2N2Mw
+    YWJmMDUxYmM3YWQ4NzQ0YzcyNmIyMzJjOWFjYjkwNmQxMTc5YmY=

data/.rspec

@@ -1,3 +1,4 @@
 --tty
 --color
 --format documentation
+--format html -o "tmp/rspec_result.html"

data/lib/object_attorney/nested_objects.rb

@@ -208,17 +208,25 @@ module ObjectAttorney
 
       existing = represented_object.nil? ? (nested_relection.klass.try(:all) || []) : (represented_object.send(nested_object_name) || (nested_relection.has_many? ? [] : nil))
       
-      if represented_object.present? && self.class.represented_object_class.respond_to?(:reflect_on_association) && 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) }
+      if represented_object.present?
+        if self.class.represented_object_class.respond_to?(:reflect_on_association)
+          existing = _existing_in_form_objects(existing, nested_relection) if nested_relection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
         else
-          existing = nested_relection.klass.new({}, existing)
+          existing = _existing_in_form_objects(existing, nested_relection) 
         end
       end
 
       existing
     end
 
+    def _existing_in_form_objects(existing, nested_relection)
+      if existing.respond_to?(:map)
+        existing.map { |existing_nested_object| nested_relection.klass.new({}, existing_nested_object) }
+      else
+        nested_relection.klass.new({}, existing)
+      end
+    end
+
     module ClassMethods
 
       def has_many(nested_object_name, options = {})

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.9.2"
+  VERSION = "2.9.3"
 end

data/spec/object_attorney/post_with_comment_form_spec.rb

@@ -112,6 +112,19 @@ shared_examples "a PostWithCommentForm" do
     comment.post_id.should == 1
   end
 
+  it "5. Editing a 'Post', creating new nested 'Comment' (with errors), editing another and deleting yet another (none of the changes should take place)." do
+    Post.create(title: "My title1")
+    Post.first.title.should == 'My title1'
+    Comment.create(post_id: 1, body: "body1")
+    Comment.create(post_id: 1, body: "body2")
+    Comment.all.count.should == 2
+
+    post_form = described_class.new({}, Post.find(1))
+    
+    
+    post_form.comments.first.class.should == CommentForm
+  end
+
 end
 
 describe PostWithCommentForm::Base do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler