object_attorney 2.5.0 → 2.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGMwYTYwMmZhY2E1MDNmYTk3ZTdmY2RmZmFiYThjZjRiYzkzN2FmYg==
+    ZWM4NWIwNTNjMjRmYzRiYzM1MTcxNWFkOTI1ZGQwY2ZhMDNmOTFjMA==
   data.tar.gz: !binary |-
-    ZDczNTc0ZjcxNmM2NGQ0ZjU0MmI2OWFiMWUzZDZhMjVhYTEwMTY5Ng==
+    NTM3MGVmZGRjOGZhNWNmZjI1ZDc1MjEyYTExY2VhNDFhNjRkZDllOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWMzZTMyZDIwNjY1YzM2OTgzOTc3MWU1NzM2ZWJiZjBjN2FjOGUyMjY2NGUy
-    Y2U1MjZjOTE5ZDA5ZjY3OTMyNDA5NjIyNGQzY2E3ZTE4Yzg3MThiYTlhZmQw
-    ZTkxYTU4MzNjYTA4YjdkYjA5OWE0MDAzOWViOTZkNmQ1MTYxYmU=
+    OTllZDFkMDJiYjk1ZWRhMDI2MWQyYzBhYjkzMDk3YWFhMDM4MGIxYTY0NmZh
+    ZmQ2MTAzODY4NzU0YjZhYjZiYWIzMDY2ZGU3MDVhZWM4YjJlODg5ZDhiYTg1
+    ZTFlYTQ1Yjg3M2Q3Zjg2ODk2NTliYTAzMDY0NWJkMTdjZWE0NTE=
   data.tar.gz: !binary |-
-    ZGFmMzQ0ZGM1NWUyMzFiYTYwYjRiYWRiYTcxNDhmZGQxMzVmZjFhMzU3N2Jm
-    MGM4NDdlMzg2NWVjN2EzZTBiMTE4ZjM1ZjRmMjE2MTVlYzM4OWRjN2IwMjJl
-    NjExZmE5MDQ5YTFjNzU3M2ZjY2FjNzM1ZGZlNTE0MzVkYjc2YTM=
+    OWM1Zjg4ZDY1NzIwMzhmYjA1MmRlOWIxYWE0NDI3MWEwMjE4YzZlYjZkNDg1
+    NGZlNDlhYzFiYjZmNTYzOTBiMTk0ZGQ4MzVhMjg1ZTU3NzE2OWU2MGZmZTBj
+    MmJhZDU0ZjEzZjVjNDZkZDY4NzM2NmIzYWYwYzhlZDBlZGI4MmI=

data/lib/object_attorney/attribute_assignment.rb

@@ -0,0 +1,32 @@
+module ObjectAttorney
+
+  module AttributeAssignment
+
+    def assign_attributes(attributes = {})
+      return if attributes.blank?
+
+      attributes.each do |name, value|
+        send("#{name}=", value) if allowed_attribute(name)
+      end
+
+      mark_for_destruction_if_necessary(self, attributes)
+    end
+
+    protected #################### PROTECTED METHODS DOWN BELOW ######################
+
+    def parsing_arguments(attributes, object)
+      if !attributes.is_a?(Hash) && object.blank?
+        object = attributes
+        attributes = nil
+      end
+
+      attributes = {} if attributes.blank?
+    end
+
+    def allowed_attribute(attribute)
+      respond_to?("#{attribute}=")
+    end
+
+  end
+
+end

data/lib/object_attorney/delegation.rb

@@ -0,0 +1,19 @@
+module ObjectAttorney
+
+  module Delegation
+
+    def zuper_method(method_name, *args)
+      self.superclass.send(method_name, *args) if self.superclass.respond_to?(method_name)
+    end
+
+    def delegate_properties(*properties, options)
+      properties.each { |property| delegate_property(property, options) }
+    end
+
+    def delegate_property(property, options)
+      delegate property, "#{property}=", options
+    end
+
+  end
+
+end

data/lib/object_attorney/naming.rb

@@ -0,0 +1,16 @@
+module ObjectAttorney
+
+  module Naming
+
+    def model_name
+      @_model_name ||= begin
+        namespace = self.parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
+        ActiveModel::Name.new(represented_object_class || self, namespace)
+      end
+    end
+
+  end
+
+end

data/lib/object_attorney/nested_objects.rb

@@ -55,13 +55,7 @@ module ObjectAttorney
     end
 
     def validate_nested_objects
-      valid = nested_objects.map do |reflection, nested_object|
-        nested_object.marked_for_destruction? ? true : nested_object.valid?
-      end.all?
-
-      import_nested_objects_errors unless valid
-      
-      valid
+      nested_objects.map { |reflection, nested_object| nested_object.valid? }.all?
     end
 
     def import_nested_objects_errors
@@ -111,9 +105,7 @@ module ObjectAttorney
         nested_instance_variable = reflection.has_many? ? get_existing_and_new_nested_objects(nested_object_name) : get_existing_or_new_nested_object(nested_object_name)
 
         [*nested_instance_variable].each do |nested_object|
-          nested_object.extend(ImportedErrors)
-
-          # nested_object.singleton_class.validate(:validate_imported_errors)
+          nested_object.extend(Validations) unless nested_object.respond_to?(:represented_object)
         end
 
         self.instance_variable_set("@#{nested_object_name}", nested_instance_variable)

data/lib/object_attorney/{orm.rb → record.rb}

@@ -1,5 +1,6 @@
 module ObjectAttorney
-  module ORM
+  
+  module Record
 
     def id
       represented_object.try(:id)
@@ -43,36 +44,34 @@ module ObjectAttorney
       end
     end
 
-    def clear_nested_imported_errors
+    def clear_nested_imposed_errors
       nested_objects.each do |reflection, nested_object|
-        nested_object.clear_imported_errors
+        nested_object.clear_imposed_errors
 
-        nested_object.clear_nested_imported_errors if nested_object.respond_to?(:clear_nested_imported_errors)
+        nested_object.clear_nested_imposed_errors if nested_object.respond_to?(:clear_nested_imposed_errors)
       end
     end
 
-    def populate_nested_imported_errors
+    def populate_nested_imposed_errors
       nested_objects.each do |reflection, nested_object|
         next if nested_object.marked_for_destruction?
         
-        nested_object.populate_imported_errors
+        nested_object.populate_imposed_errors
         
-        nested_object.populate_nested_imported_errors if nested_object.respond_to?(:populate_nested_imported_errors)
+        nested_object.populate_nested_imposed_errors if nested_object.respond_to?(:populate_nested_imposed_errors)
       end
     end
 
     protected #################### PROTECTED METHODS DOWN BELOW ######################
 
     def save_or_!
-      clear_imported_errors
-      
-      clear_imported_errors
-      clear_nested_imported_errors
+      clear_imposed_errors
+      clear_nested_imposed_errors
       
       save_result = valid? ? yield : false
       
-      populate_imported_errors
-      populate_nested_imported_errors
+      populate_imposed_errors
+      populate_nested_imposed_errors
 
       after_save if valid? && save_result
 
@@ -114,4 +113,5 @@ module ObjectAttorney
     end
 
   end
+  
 end

data/lib/object_attorney/representation.rb

@@ -0,0 +1,90 @@
+module ObjectAttorney
+
+  module Representation
+
+    def read_attribute_for_serialization(attribute)
+      respond_to?(attribute) ? send(attribute) : nil
+    end
+
+    def send_to_representative(method_name, *args)
+      return false if represented_object.blank?
+
+      represented_object.send(method_name, *args)
+    end
+
+    def represented_object
+      @represented_object ||= self.class.represented_object_class.try(:new)
+    end
+
+    protected #################### PROTECTED METHODS DOWN BELOW ######################
+
+    def validate_represented_object
+      represented_object_valid = Helpers.try_or_return(represented_object, :valid?, true)
+      
+      load_errors_from represented_object.errors unless represented_object_valid
+
+      nested_valid = add_errors_entry_if_nested_invalid
+
+      represented_object_valid && nested_valid
+    end
+
+    private #################### PRIVATE METHODS DOWN BELOW ######################
+
+    def add_errors_entry_if_nested_invalid
+      nested_vs_invalid = {}
+
+      nested_objects.each do |reflection, nested_object|
+        if !nested_object.errors.empty? && !nested_vs_invalid.include?(reflection.name)
+          message = errors.send(:normalize_message, reflection.name, :invalid, {})
+
+          if !errors.messages[reflection.name].try(:include?, message)
+            nested_vs_invalid[reflection.name] = message
+          end
+        end
+      end
+
+      load_errors_from nested_vs_invalid
+
+      nested_vs_invalid.empty?
+    end
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def represents(represented_object_name, options = {})
+        self.instance_variable_set("@represented_object_reflection", Reflection.new(represented_object_name, options))
+
+        define_method(represented_object_name) { represented_object }
+        
+        delegate_properties(*options[:properties], to: represented_object_name) if options.include?(:properties)
+        
+        delegate(*options[:readers], to: represented_object_name) if options.include?(:readers)
+
+        if options.include?(:writers)
+          writers = options[:writers].map { |writer| "#{writer}=" }
+          delegate(*writers, to: represented_object_name)
+        end
+      end
+
+      def represented_object_reflection
+        self.instance_variable_get("@represented_object_reflection") || zuper_method('represented_object_reflection')
+      end
+
+      def represented_object_class
+        represented_object_reflection.try(:klass)
+      end
+
+      def represented_object_reflect_on_association(association)
+        return nil if represented_object_class.nil?
+
+        represented_object_class.reflect_on_association(association)
+      end
+
+    end
+
+  end
+
+end

data/lib/object_attorney/translation.rb

@@ -0,0 +1,25 @@
+module ObjectAttorney
+
+  module Translation
+
+    def human_attribute_name(attribute_key_name, options = {})
+      no_translation = "-- no translation --"
+      
+      defaults = ["object_attorney.attributes.#{name.underscore}.#{attribute_key_name}".to_sym]
+      defaults << options[:default] if options[:default]
+      defaults.flatten!
+      defaults << no_translation
+      options[:count] ||= 1
+      
+      translation = I18n.translate(defaults.shift, options.merge(default: defaults))
+
+      if translation == no_translation && represented_object_class.respond_to?(:human_attribute_name)
+        translation = represented_object_class.human_attribute_name(attribute_key_name, options)
+      end
+
+      translation
+    end
+
+  end
+
+end

data/lib/object_attorney/validations.rb

@@ -0,0 +1,42 @@
+module ObjectAttorney
+  module Validations
+
+    def valid?(context = nil)
+      return true if override_validations?
+
+      context ||= (new_record? ? :create : :update)
+      output = super(context)
+
+      load_errors_from imposed_errors
+
+      errors.empty? && output
+    end
+    
+    def override_validations?
+      marked_for_destruction?
+    end
+
+    def clear_imposed_errors
+      @imposed_errors = {}
+    end
+
+    def populate_imposed_errors
+      if respond_to?(:represented_object)
+        represented_object.errors.each { |key, value| @imposed_errors[key] = value } if represented_object.present?
+      else
+        errors.each { |key, value| @imposed_errors[key] = value }
+      end
+    end
+
+    def imposed_errors
+      @imposed_errors ||= {}
+    end
+
+    private #################### PRIVATE METHODS DOWN BELOW ######################
+
+    def load_errors_from(errors)
+      errors.each { |key, value| self.errors.add(key, value) }
+    end
+
+  end
+end

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.5.0"
+  VERSION = "2.5.2"
 end

data/lib/object_attorney.rb

@@ -1,71 +1,39 @@
-require "object_attorney/version"
+
+require "object_attorney/attribute_assignment"
+require "object_attorney/delegation"
 require "object_attorney/helpers"
+require "object_attorney/naming"
 require "object_attorney/reflection"
-require "object_attorney/imported_errors"
+require "object_attorney/validations"
 require "object_attorney/nested_objects"
-require "object_attorney/orm"
+require "object_attorney/record"
+require "object_attorney/translation"
+require "object_attorney/representation"
 require 'active_record'
 
+require "object_attorney/version"
+
 module ObjectAttorney
 
   def initialize(attributes = {}, object = nil)
     initialize_nested_attributes
 
-    if !attributes.is_a?(Hash) && object.blank?
-      object = attributes
-      attributes = nil
-    end
+    parsing_arguments(attributes, object)
 
     before_initialize(attributes)
 
-    attributes = {} if attributes.blank?
-
-    @represented_object = object if object.present?
+    @represented_object = object
 
     assign_attributes attributes
-    mark_for_destruction_if_necessary(self, attributes)
 
     after_initialize(attributes)
   end
 
-  def assign_attributes(attributes = {})
-    return if attributes.blank?
-
-    attributes.each do |name, value|
-      send("#{name}=", value) if allowed_attribute(name)
-    end
-  end
-
-  def read_attribute_for_serialization(attribute)
-    respond_to?(attribute) ? send(attribute) : nil
-  end
-
-  def send_to_representative(method_name, *args)
-    return false if represented_object.blank?
-
-    represented_object.send(method_name, *args)
-  end
-
   protected #################### PROTECTED METHODS DOWN BELOW ######################
 
   def before_initialize(attributes); end
-  def after_initialize(attributes); end
-
-  def allowed_attribute(attribute)
-    respond_to?("#{attribute}=")
-  end
-
-  def validate_represented_object
-    valid = override_validations? ? true : Helpers.try_or_return(represented_object, :valid?, true)
-    
-    incorporate_errors_from(represented_object.errors) unless valid
 
-    valid
-  end
-
-  def represented_object
-    @represented_object ||= self.class.represented_object_class.try(:new)
-  end
+  def after_initialize(attributes); end
 
   private #################### PRIVATE METHODS DOWN BELOW ######################
 
@@ -74,95 +42,23 @@ module ObjectAttorney
       include ActiveModel::Validations
       include ActiveModel::Validations::Callbacks
       include ActiveModel::Conversion
-      include ObjectAttorney::ImportedErrors
-      include ObjectAttorney::NestedObjects
-      include ObjectAttorney::ORM
 
-      validate :validate_represented_object
-      validate :validate_imported_errors
+      include AttributeAssignment
+      include Validations
+      include NestedObjects
+      include Record
+      include Translation
+      include Representation
 
-      def valid?(context = nil)
-        override_validations? ? true : super(context)
-      end
+      validate :validate_represented_object
     end
 
     base.extend(ClassMethods)
   end
 
-  def override_validations?
-    marked_for_destruction?
-  end
-
   module ClassMethods
-
-    def represents(represented_object_name, options = {})
-      self.instance_variable_set("@represented_object_reflection", Reflection.new(represented_object_name, options))
-
-      define_method(represented_object_name) { represented_object }
-      
-      delegate_properties(*options[:properties], to: represented_object_name) if options.include?(:properties)
-      
-      delegate(*options[:readers], to: represented_object_name) if options.include?(:readers)
-
-      if options.include?(:writers)
-        writers = options[:writers].map { |writer| "#{writer}=" }
-        delegate(*writers, to: represented_object_name)
-      end
-    end
-
-    def represented_object_reflection
-      self.instance_variable_get("@represented_object_reflection") || zuper_method('represented_object_reflection')
-    end
-
-    def represented_object_class
-      represented_object_reflection.try(:klass)
-    end
-
-    def represented_object_reflect_on_association(association)
-      return nil if represented_object_class.nil?
-
-      represented_object_class.reflect_on_association(association)
-    end
-
-    def zuper_method(method_name, *args)
-      self.superclass.send(method_name, *args) if self.superclass.respond_to?(method_name)
-    end
-
-    def delegate_properties(*properties, options)
-      properties.each { |property| delegate_property(property, options) }
-    end
-
-    def delegate_property(property, options)
-      delegate property, "#{property}=", options
-    end
-
-    def human_attribute_name(attribute_key_name, options = {})
-      no_translation = "-- no translation --"
-      
-      defaults = ["object_attorney.attributes.#{name.underscore}.#{attribute_key_name}".to_sym]
-      defaults << options[:default] if options[:default]
-      defaults.flatten!
-      defaults << no_translation
-      options[:count] ||= 1
-      
-      translation = I18n.translate(defaults.shift, options.merge(default: defaults))
-
-      if translation == no_translation && represented_object_class.respond_to?(:human_attribute_name)
-        translation = represented_object_class.human_attribute_name(attribute_key_name, options)
-      end
-
-      translation
-    end
-
-    def model_name
-      @_model_name ||= begin
-        namespace = self.parents.detect do |n|
-          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
-        end
-        ActiveModel::Name.new(represented_object_class || self, namespace)
-      end
-    end
-
+    include Naming
+    include Delegation
   end
 
 end

data/spec/object_attorney/bulk_posts_with_form_objects_form_spec.rb

@@ -74,7 +74,7 @@ shared_examples "a BulkPostsWithFormObjectsForm" do
     bulk_posts_form = described_class.new(params[:bulk_post])
     bulk_posts_form.save
     
-    bulk_posts_form.should have(2).errors_on(:posts)
+    bulk_posts_form.should have(1).errors_on(:posts)
     bulk_posts_form.posts.first.should have(1).errors_on(:title)
     bulk_posts_form.posts.second.should have(:no).errors_on(:title)
     bulk_posts_form.posts.third.should have(1).errors_on(:title)

data/spec/object_attorney/post_validations_form_spec.rb

@@ -2,19 +2,7 @@ require "spec_helper"
 
 describe PostValidationsForm do
 
-  it "asd", current: true do
-    post1 = Post.new
-    post1.valid?.should == true
-    
-    post1.singleton_class.validates_presence_of :title
-    # binding.pry
-    post1.valid?.should == false
-
-    post2 = Post.new
-    post2.valid?.should == true
-  end
-
-  it "1. 'PostValidationsForm' becomes invalid if 'Post' has errors after the #submit method and incorporates its errors." do
+  it "1. 'PostValidationsForm' becomes invalid if 'Post' has errors after the #submit method and incorporates its errors.", current: true do
     params = {
       post: {
         title: 'First post',
@@ -31,22 +19,26 @@ describe PostValidationsForm do
     post_form.save
     
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.valid?.should == false
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.save
 
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.valid?.should == false
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
   end

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." 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
     params = {
       post: {
         title: 'First post',
@@ -19,22 +19,26 @@ describe PostWithCommentValidationsForm do
     post_form.save
     
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.valid?.should == false
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.save
 
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
 
     post_form.valid?.should == false
     post_form.should have(1).error_on(:title)
+    post_form.should have(1).error_on(:comments)
     post_form.errors.size.should == 2
     post_form.comments.first.should have(1).error_on(:body)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,14 +74,19 @@ files:
 - db/schema.rb
 - lib/object_attorney.rb
 - lib/object_attorney/association_reflection.rb
+- lib/object_attorney/attribute_assignment.rb
+- lib/object_attorney/delegation.rb
 - lib/object_attorney/helpers.rb
-- lib/object_attorney/imported_errors.rb
+- lib/object_attorney/naming.rb
 - lib/object_attorney/nested_objects.rb
-- lib/object_attorney/nested_uniqueness_validator.rb
-- lib/object_attorney/orm.rb
 - lib/object_attorney/orm_handlers/smooth_operator.rb
+- lib/object_attorney/record.rb
 - lib/object_attorney/reflection.rb
+- lib/object_attorney/representation.rb
+- lib/object_attorney/translation.rb
+- lib/object_attorney/validations.rb
 - lib/object_attorney/version.rb
+- not_used/nested_uniqueness_validator.rb
 - object_attorney.gemspec
 - spec/object_attorney/bulk_post_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_existing_form_spec.rb

data/lib/object_attorney/imported_errors.rb

@@ -1,33 +0,0 @@
-module ObjectAttorney
-  module ImportedErrors
-
-    protected #################### PROTECTED METHODS DOWN BELOW ######################
-
-    def clear_imported_errors
-      @imported_errors = {}
-    end
-
-    def populate_imported_errors
-      if respond_to?(:represented_object)
-        represented_object.errors.each { |key, value| @imported_errors[key] = value } if represented_object.present?
-      else
-        errors.each { |key, value| @imported_errors[key] = value }
-      end
-    end
-
-    def validate_imported_errors
-      imported_errors = (@imported_errors || {})
-      
-      incorporate_errors_from imported_errors
-
-      imported_errors.empty?
-    end
-
-    private #################### PRIVATE METHODS DOWN BELOW ######################
-    
-    def incorporate_errors_from(errors)
-      errors.each { |key, value| self.errors.add(key, value) }
-    end
-
-  end
-end