object_attorney 2.10.7 → 2.10.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdkN2UzMGQ0YjgwNTMxN2Q4YjEyMDY1OWE1YmZiN2JjYmZhMDI4Mw==
+    ZTZjYmJlOTBjNzg4MWNmZTUxMTI2MzZjZGFkZmE4NTlhOTMxNjUyNg==
   data.tar.gz: !binary |-
-    MWM2YzBmZTg1NzBmMTRkZWM2YmE1YWQ5YzVkZjc5OWUxZTU1YzZkYg==
+    YjdiNzA3MTlhMDMxYjZlNzM0NmFjMDMzMzdiYTMzNmRiZGYwZGFjZQ==
 SHA512:
   metadata.gz: !binary |-
-    NmUwODRmNmEzOWY4Zjg2YTNiY2QyZWYwNDMwMjlkNjBmODJlMWIzOWZjOTUw
-    N2E0MzgyZGI4MTMyYTNmZDRkNDBkYjYyM2E2ZDdjYjQ5YThhNGEyMjFhZDY3
-    ODc4MzhmMmRhNmI2YjZkMGU3N2Y4ZTljYTkxOGJmNmNkMWEwZTc=
+    NDEyY2NmYTM0ODVkMjA2NDZkMWJhZWFiYTBmMjFmODVmNmIzZWQ0NDc3MGRm
+    YjhkZWVmNjFhZTc5NGUxMThlNDI2Njg2NDRjODQ0MTA1ZDNlNmYzZmFmYTE0
+    ZDc4NTUwN2M0YjI2ZGNjZWU1MGRhMTg4MjYyMzVkYmQzNDFlYTk=
   data.tar.gz: !binary |-
-    NGJjM2ZhNDdkMGZiZDc1YzMyMWI2M2ZlOTU5M2QzMjQ4YThlYWMzNjkzNTVi
-    Y2ExNzhhYTIyZjExYTBmZjQwZjdhMWRlZjM2Nzk0NGUwZWIxZDQyNjAwYjI2
-    M2E1ZGU5NTkxNjY4YjFmMmRjNDhjN2U3N2JlMmEyNmVlYzdkN2E=
+    OTFkNjY0NmNkNzZmYzU4NjIwMGM1NDgxYTNiMjZlYzU0OTY2ZDU4MTM5OGRj
+    NjNiZTU2NDI1OWMzN2MyMGFiNjAyODhmMDVkMzY0NTZmZGU0Yjg2MWMxYzA0
+    MWUwM2UyYTBlNmNiOGVjMjc2ZTBhNzBlNGU4YmNkNTZhODEwYmE=

data/console.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << './'
+$LOAD_PATH << './lib'
+
+require 'spec/require_helper'
+
+address_attributes = {
+  street: 'street',
+  city: 'city'
+}
+
+p = PostWithCommentsAndAddressForm.new(address_attributes: address_attributes)
+
+a = AddressForm.new(post_attributes: { title: 'asd', body: 'body' })
+
+binding.pry

data/lib/object_attorney/attribute_assignment.rb

@@ -6,6 +6,7 @@ module ObjectAttorney
       return if attributes.blank?
 
       attributes.each do |name, value|
+        name, value = check_for_hidden_nested_attributes(name, value)
         send("#{name}=", value) if allowed_attribute(name)
       end
 
@@ -14,6 +15,25 @@ module ObjectAttorney
 
     protected #################### PROTECTED METHODS DOWN BELOW ######################
 
+    def check_for_hidden_nested_attributes(name, value)
+      name_sym = name.to_sym
+
+      reflection = self.class.reflect_on_association(name_sym)
+
+      if reflection
+        if reflection.has_many? && value.is_a?(Array)
+          hash = {}
+          value.each_with_index do |_value, index|
+            hash[index.to_s] = _value
+          end
+          value = hash
+        end
+        name = "#{name}_attributes"
+      end
+
+      [name, value]
+    end
+
     def parsing_arguments(attributes, object)
       if !attributes.is_a?(Hash) && object.blank?
         object = attributes
@@ -21,7 +41,7 @@ module ObjectAttorney
       end
 
       attributes = {} if attributes.blank?
-      
+
       [attributes.symbolize_keys, object]
     end
 

data/lib/object_attorney/nested_objects.rb

@@ -48,7 +48,7 @@ module ObjectAttorney
 
     def save_or_destroy_nested_objects(save_method, association_macro)
       nested_objects(association_macro).map do |reflection, nested_object|
-        
+
         populate_foreign_key(self, nested_object, reflection, :has_many)
         populate_foreign_key(self, nested_object, reflection, :has_one)
 
@@ -73,7 +73,7 @@ module ObjectAttorney
 
     def get_attributes_for_existing(nested_object_name, existing_nested_object)
       attributes = send("#{nested_object_name}_attributes")
-      
+
       if attributes.present?
         (attributes.values.select { |x| x[:id].to_i == existing_nested_object.id }.first || {}).symbolize_keys
       else
@@ -134,7 +134,7 @@ module ObjectAttorney
 
     def get_existing_and_new_nested_objects(nested_object_name)
       existing_and_new_nested_objects = []
-      
+
       update_existing_nested_objects(existing_and_new_nested_objects, nested_object_name)
       build_new_nested_objects(existing_and_new_nested_objects, nested_object_name)
 
@@ -169,7 +169,7 @@ module ObjectAttorney
       reflection = self.class.reflect_on_association(nested_object_name)
 
       return nil if reflection.options[:new_records] == false
-      
+
       if new_nested_object.present?
         new_nested_object = assign_attributes_or_build_nested_object(reflection, attributes, new_nested_object)
 
@@ -200,7 +200,7 @@ module ObjectAttorney
 
     def can_represented_object_build_nested?(reflection, nested_object_name)
       return false if represented_object.blank?
-      
+
       represented_object.respond_to?("build_#{nested_object_name}") || represented_object.send(nested_object_name).respond_to?(:build)
     end
 
@@ -218,18 +218,18 @@ module ObjectAttorney
       nested_relection = self.class.reflect_on_association(nested_object_name)
 
       return [] if nested_relection.options[:existing_records] == false
-      
+
       if nested_relection.options[:standalone] == true
         return nested_relection.has_many? ? (nested_relection.klass.try(:all) || []) : nil
       end
 
       existing = represented_object.nil? ? (nested_relection.klass.try(:all) || []) : (represented_object.send(nested_object_name) || (nested_relection.has_many? ? [] : nil))
-      
+
       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 = _existing_in_form_objects(existing, nested_relection) 
+          existing = _existing_in_form_objects(existing, nested_relection)
         end
       end
 
@@ -239,8 +239,10 @@ module ObjectAttorney
     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
+      elsif existing.present?
         nested_relection.klass.new({}, existing)
+      else
+        nil
       end
     end
 

data/lib/object_attorney/version.rb

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

data/spec/object_attorney/address_form_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe AddressForm do
+
+  it "FormObject with a belongs_to with a differente class then the represented_object's relation" do
+    params = {
+      address: {
+        post_attributes: { title: 'asd', body: 'body' }
+      }
+    }
+
+    address_form = AddressForm.new(params[:address])
+
+    address_form.address.post.should == nil
+    address_form.post
+    address_form.address.post.should_not == nil
+  end
+
+end

data/spec/object_attorney/test_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe UserForm do
+
+  it "..." do
+    params = {
+      user: {
+        email: 'email@gmail.com',
+        address: { street: "street1" },
+        comments: [
+          { body: "body1" },
+          { body: "body2" }
+        ]
+      }
+    }
+
+    user_form = UserAndCommentsForm.new(params[:user])
+
+    expect(user_form.address.nil?).to eq(false)
+    expect(user_form.comments.length).to eq(2)
+  end
+
+end

data/spec/require_helper.rb

@@ -0,0 +1,32 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'bundler'
+Bundler.setup
+require 'rspec'
+require 'pry'
+#require 'database_cleaner'
+
+require 'object_attorney'
+require 'support/database_setup'
+require 'support/active_model/validations'
+require 'support/models/address'
+require 'support/models/comment'
+require 'support/models/post'
+require 'support/models/user'
+
+require 'support/form_objects/post_form'
+require 'support/form_objects/address_form'
+require 'support/form_objects/post_validations_form'
+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'
+require 'support/form_objects/bulk_posts_with_form_objects_form'
+require 'support/form_objects/user_and_comments_form'
+require 'support/form_objects/user_form'

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ require 'support/models/post'
 require 'support/models/user'
 
 require 'support/form_objects/post_form'
+require 'support/form_objects/address_form'
 require 'support/form_objects/post_validations_form'
 require 'support/form_objects/comment_form'
 require 'support/form_objects/post_with_comment_form'
@@ -35,7 +36,7 @@ require 'support/form_objects/user_form'
 RSpec.configure do |config|
   #config.treat_symbols_as_metadata_keys_with_true_values = true
   #config.filter_run :current
-  
+
   I18n.enforce_available_locales = false
 
   # see: http://iain.nl/testing-activerecord-in-isolation

data/spec/support/form_objects/address_form.rb

@@ -0,0 +1,9 @@
+class AddressForm
+
+  include ObjectAttorney
+
+  represents :address, properties: [:street, :city]
+
+  belongs_to :post, class_name: PostForm::Base
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.10.7
+  version: 2.10.9
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- console.rb
 - db/migrate/20131205114000_create_users.rb
 - db/migrate/20131205114900_create_posts.rb
 - db/migrate/20131205114901_create_comments.rb
@@ -89,6 +90,7 @@ files:
 - lib/object_attorney/version.rb
 - not_used/nested_uniqueness_validator.rb
 - object_attorney.gemspec
+- spec/object_attorney/address_form_spec.rb
 - spec/object_attorney/bulk_post_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_existing_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
@@ -103,11 +105,14 @@ files:
 - 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/serialization_spec.rb
+- spec/object_attorney/test_spec.rb
 - spec/object_attorney/user_and_comments_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
+- spec/require_helper.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
+- spec/support/form_objects/address_form.rb
 - spec/support/form_objects/bulk_posts_allow_only_existing_form.rb
 - spec/support/form_objects/bulk_posts_allow_only_new_form.rb
 - spec/support/form_objects/bulk_posts_form.rb
@@ -146,13 +151,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem allows you to extract the code responsible for 'validations', 'nested
   objects' and 'strong parameters' from your model onto a specific class for a specific
   use case.
 test_files:
+- spec/object_attorney/address_form_spec.rb
 - spec/object_attorney/bulk_post_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_existing_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
@@ -167,11 +173,14 @@ test_files:
 - 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/serialization_spec.rb
+- spec/object_attorney/test_spec.rb
 - spec/object_attorney/user_and_comments_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
+- spec/require_helper.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
+- spec/support/form_objects/address_form.rb
 - spec/support/form_objects/bulk_posts_allow_only_existing_form.rb
 - spec/support/form_objects/bulk_posts_allow_only_new_form.rb
 - spec/support/form_objects/bulk_posts_form.rb