object_attorney 2.6.1 → 2.6.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI5MTNkZDE0MmUyOWMyZTFmMjgwZWVmMDgyMGY3YjIyZGRjMzFiOA==
+    N2JiOWE3MWRlMDhmY2UwYzA2OTgwYmI4MTI0NDhkMzc4ZTkyNjBjYw==
   data.tar.gz: !binary |-
-    MzU5Y2EwOWY5MzA5NzE5ZWEyZDA5NjdlMTc3Y2U3N2FlNGU3MmU2MQ==
+    MDM5ZGQyYzg4Yzg0NTkyY2I3NzY3OWU0YTk0ZGM0MzIyZWU2MDU3MQ==
 SHA512:
   metadata.gz: !binary |-
-    ODMwNmIzMjJiZWY0NGYxZjlhMjE1NzJlZmYzOTNhODE4M2VlMmFkNzU3YTA2
-    Mjg5MzczMjMwYmI5YmE0NmQ5M2FiMTJlODQ4MWM2OWQ4YjlmYmFiN2Q3Njgz
-    NWFkZTU3OWE5Njk5ODk4NjUzMDNhYmM0NDE4MzA3YWNhYmM4YTc=
+    NzFiNGU0Yjg0ODBkYjdjZWUzMzUzOGM5ODAxNDM0NzE5YTY5ODkzMWU1OGEz
+    ZDM1OWNiNjI5NmQ4MjZjYzE5MTM0ZGYxMDc1ZTM1ZDQ5OGU3NzU2NmRmMWZk
+    NTM3ZTQ0ZGUyODM1YjAwNzA4ODE2NzIwNzljNDMxZmFmMjlhYjE=
   data.tar.gz: !binary |-
-    OThjNGRhYThjZmU2NWQ4OGU2ZGY5YzU5MzVkODNiMDViYjM5OGY4N2I5OGQ3
-    OTc3YjRhNWMyMTEwNTFmMWUyYjhhN2ZjNTMyNDEyMzM1MThkMjc5YjExMTE1
-    OWNkZmUzMDFhZDU0OTdiMTk4ZDk1NzM4ZGFjMTZhZTExOTg1OTU=
+    YTZkYWY4NmUzMDAxZjBiZmE5MWVjNDdiMGM3YjAzNzFhMzAyZmI1NmRiZDM0
+    ODE1NjcyOWJlZmVlZjYzYTdiYmM5MjljOTNiMjRkM2ViZTk0YjAwNzkxNDk3
+    MjIxNDE2MWY3MDIxZDVhYjcyMzIzYjQ0MGE5NzlhMjAwMTk5ODk=

data/lib/object_attorney/attribute_assignment.rb

@@ -22,6 +22,8 @@ module ObjectAttorney
 
       attributes = {} if attributes.blank?
 
+      attributes.symbolize_keys!
+      
       [attributes, object]
     end
 

data/lib/object_attorney/nested_objects.rb

@@ -153,6 +153,8 @@ module ObjectAttorney
 
     def build_nested_object(nested_object_name, attributes = {})
       reflection = self.class.reflect_on_association(nested_object_name)
+
+      return nil if reflection.options[:no_new_records]
       
       if can_represented_object_build_nested?(reflection, nested_object_name)
         new_nested_object = build_from_represented_object(reflection, nested_object_name)
@@ -197,9 +199,11 @@ 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) || (nested_relection.has_many? ? [] : nil))
+      return [] if nested_relection.options[:no_existing_records]
+
+      existing = represented_object.nil? ? (nested_relection.klass.try(:all) || []) : (represented_object.send(nested_object_name) || (nested_relection.has_many? ? [] : nil))
       
-      if represented_object.present? && nested_relection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
+      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) }
         else
@@ -225,6 +229,7 @@ module ObjectAttorney
       end
 
       def accepts_nested_objects(nested_object_name, options = {})
+        options.symbolize_keys!
         reflection = AssociationReflection.new(nested_object_name, represented_object_reflection, options)
 
         self.instance_variable_set("@#{nested_object_name}_reflection", reflection)

data/lib/object_attorney/record.rb

@@ -103,7 +103,11 @@ module ObjectAttorney
     module ClassMethods
 
       def all(*args)
-        represented_object_class.all(*args).map { |represented_object| self.new({}, represented_object) }
+        if represented_object_class.respond_to?(:all)
+          represented_object_class.all(*args).map { |represented_object| self.new({}, represented_object) }
+        else
+          []
+        end
       end
 
     end

data/lib/object_attorney/representation.rb

@@ -61,12 +61,11 @@ module ObjectAttorney
         
         delegate_properties(*options[:properties], to: represented_object_name) if options.include?(:properties)
         
-        delegate(*options[:readers], to: represented_object_name) if options.include?(:readers)
+        initiate_getters(options[:getter], represented_object_name)
+        initiate_getters(options[:getters], represented_object_name)
 
-        if options.include?(:writers)
-          writers = options[:writers].map { |writer| "#{writer}=" }
-          delegate(*writers, to: represented_object_name)
-        end
+        initiate_setters(options[:setter], represented_object_name)
+        initiate_setters(options[:setters], represented_object_name)
       end
 
       def represented_object_reflection
@@ -83,6 +82,21 @@ module ObjectAttorney
         represented_object_class.reflect_on_association(association)
       end
 
+
+      private ############### PRIVATE #################
+
+      def initiate_getters(getters, represented_object_name)
+        delegate(*getters, to: represented_object_name) unless getters.nil?
+      end
+
+      def initiate_setters(setters, represented_object_name)
+        return nil if setters.nil?
+        
+        setters = [*setters].map { |setter| "#{setter}=" }
+
+        delegate(*setters, to: represented_object_name) 
+      end
+
     end
 
   end

data/lib/object_attorney/validations.rb

@@ -22,9 +22,9 @@ module ObjectAttorney
 
     def populate_imposed_errors
       if respond_to?(:represented_object)
-        represented_object.errors.each { |key, value| @imposed_errors[key] = value } if Helpers.has_errors_method?(represented_object)
+        represented_object.errors.each { |key, value| imposed_errors[key] = value } if Helpers.has_errors_method?(represented_object)
       else
-        errors.each { |key, value| @imposed_errors[key] = value } if Helpers.has_errors_method?(self)
+        errors.each { |key, value| imposed_errors[key] = value } if Helpers.has_errors_method?(self)
       end
     end
 
@@ -35,7 +35,11 @@ module ObjectAttorney
     private #################### PRIVATE METHODS DOWN BELOW ######################
 
     def load_errors_from(errors)
-      errors.each { |key, value| self.errors.add(key, value) }
+      errors.each do |key, value|
+        [*value].each do |_value|
+          self.errors.add(key, _value) unless self.errors.added?(key, _value)
+        end
+      end
     end
 
   end

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.6.1"
+  VERSION = "2.6.9"
 end

data/spec/object_attorney/post_validations_form_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe PostValidationsForm do
 
-  it "1. 'PostValidationsForm' becomes invalid if 'Post' has errors after the #submit method and incorporates its errors.", current: true do
+  it "1. 'PostValidationsForm' becomes invalid if 'Post' has errors after the #submit method and incorporates its errors." do
     params = {
       post: {
         title: 'First post',

data/spec/object_attorney/post_with_comment_validations_form_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe PostWithCommentValidationsForm do
 
-  it "1. 'PostWithCommentValidationsForm' becomes invalid if 'Post' or nested 'Comment's has errors after the #submit method and incorporates its errors.", current: true do
+  it "1. 'PostWithCommentValidationsForm' becomes invalid if 'Post' or nested 'Comment's has errors after the #submit method and incorporates its errors." do
     params = {
       post: {
         title: 'First post',

data/spec/object_attorney/post_with_only_existing_comments_form_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe PostWithOnlyExistingCommentsForm do
+
+  it "1. Editing nested 'Comments' inside a PostForm that only accepts existing Comments changes and ignores new Comments." do
+    params = {
+      id: 1,
+      post: {
+        title: "altered post",
+        comments_attributes: {
+          "0" => { body: "new comment" },
+          "1" => { id: 1, _destroy: true },
+          "2" => { id: 2, body: 'altered comment' }
+        }
+      }
+    }
+
+    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 = PostWithOnlyExistingCommentsForm.new(params[:post], Post.find(params[:id]))
+    post_form.save
+    
+    comment = Comment.find_by_id(1)
+    comment.should == nil
+
+    comment = Comment.find_by_id(2)
+    comment.body.should == 'altered comment'
+
+    Comment.all.count.should == 1
+    Post.first.title.should == 'altered post'
+
+  end
+
+end

data/spec/object_attorney/post_with_only_new_comments_form_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe PostWithOnlyNewCommentsForm do
+
+  it "1. Creating nested 'Comments' inside a PostForm that only accepts new Comments and ignores existing Comments changes." do
+    params = {
+      id: 1,
+      post: {
+        title: "altered post",
+        comments_attributes: {
+          "0" => { body: "new comment" },
+          "1" => { id: 1, _destroy: true },
+          "2" => { id: 2, body: 'altered comment' }
+        }
+      }
+    }
+
+    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 = PostWithOnlyNewCommentsForm.new(params[:post], Post.find(params[:id]))
+    post_form.save
+    
+    comment = Comment.find_by_id(1)
+    comment.body.should == 'body1'
+
+    comment = Comment.find_by_id(2)
+    comment.body.should == 'body2'
+
+    comment = Comment.find_by_id(3)
+    comment.body.should == 'new comment'
+    comment.post_id.should == 1
+
+    Comment.all.count.should == 3
+    Post.first.title.should == 'altered post'
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -23,6 +23,8 @@ require 'support/form_objects/comment_form'
 require 'support/form_objects/post_with_comment_form'
 require 'support/form_objects/post_with_comment_validations_form'
 require 'support/form_objects/post_with_comments_and_address_form'
+require 'support/form_objects/post_with_only_new_comments_form'
+require 'support/form_objects/post_with_only_existing_comments_form'
 require 'support/form_objects/bulk_posts_form'
 require 'support/form_objects/bulk_posts_allow_only_existing_form'
 require 'support/form_objects/bulk_posts_allow_only_new_form'

data/spec/support/form_objects/post_with_only_existing_comments_form.rb

@@ -0,0 +1,9 @@
+class PostWithOnlyExistingCommentsForm
+
+  include ObjectAttorney
+
+  represents :post, properties: [:title, :body]
+
+  has_many :comments, no_new_records: true
+
+end

data/spec/support/form_objects/post_with_only_new_comments_form.rb

@@ -0,0 +1,9 @@
+class PostWithOnlyNewCommentsForm
+
+  include ObjectAttorney
+
+  represents :post, properties: [:title, :body]
+
+  has_many :comments, no_existing_records: true
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.9
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,8 @@ files:
 - spec/object_attorney/post_with_comment_form_spec.rb
 - spec/object_attorney/post_with_comment_validations_form_spec.rb
 - spec/object_attorney/post_with_comments_and_address_form_spec.rb
+- spec/object_attorney/post_with_only_existing_comments_form_spec.rb
+- spec/object_attorney/post_with_only_new_comments_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
 - spec/object_attorney/user_form_with_ruby_errors_spec.rb
 - spec/spec_helper.rb
@@ -112,6 +114,8 @@ files:
 - spec/support/form_objects/post_with_comment_form.rb
 - spec/support/form_objects/post_with_comment_validations_form.rb
 - spec/support/form_objects/post_with_comments_and_address_form.rb
+- spec/support/form_objects/post_with_only_existing_comments_form.rb
+- spec/support/form_objects/post_with_only_new_comments_form.rb
 - spec/support/form_objects/user_form.rb
 - spec/support/form_objects/user_form_with_ruby_errors.rb
 - spec/support/models/address.rb
@@ -154,6 +158,8 @@ test_files:
 - spec/object_attorney/post_with_comment_form_spec.rb
 - spec/object_attorney/post_with_comment_validations_form_spec.rb
 - spec/object_attorney/post_with_comments_and_address_form_spec.rb
+- spec/object_attorney/post_with_only_existing_comments_form_spec.rb
+- spec/object_attorney/post_with_only_new_comments_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
 - spec/object_attorney/user_form_with_ruby_errors_spec.rb
 - spec/spec_helper.rb
@@ -169,6 +175,8 @@ test_files:
 - spec/support/form_objects/post_with_comment_form.rb
 - spec/support/form_objects/post_with_comment_validations_form.rb
 - spec/support/form_objects/post_with_comments_and_address_form.rb
+- spec/support/form_objects/post_with_only_existing_comments_form.rb
+- spec/support/form_objects/post_with_only_new_comments_form.rb
 - spec/support/form_objects/user_form.rb
 - spec/support/form_objects/user_form_with_ruby_errors.rb
 - spec/support/models/address.rb