object_attorney 1.1.2 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM2ZTM1ZmE4MmYzMmMxYjdhMDdiNjY3Y2IzZWM2YzY4MjE0MDM3Yw==
+    ZDBmMmQ5OTNkMjI2MzRkZGVkNjM5NzgwMDg1NzQ0ZjYzNjhiODUwMQ==
   data.tar.gz: !binary |-
-    NGJjOGY0OGRjMzYzNzZjMTVhZDExMzliMTAzN2I5NzlkMmZmZTBiMg==
+    YmQxOGY0OGNiMzEyNDQzOTcxOGM3MGRmZjhiOTVlYTdiOTdlNGVmMw==
 SHA512:
   metadata.gz: !binary |-
-    OTQyOWQ5OWMxMWY5MWQ0ZWJiOTM2MGFjYTJmY2U1MWZiODE3ZmQwYjJkN2My
-    YzA0ODY1N2U5ZGMzMTYyNTYwYWJhZjQ0YmU3NThiNjBmMmQ0ODQ2ZGUyMDkw
-    OTA4Y2MzNDU5NjVjZjFmYzhjNjIwZTNkYWQxNzI4ZWU5MDY5Y2Q=
+    ZTU2YjYyYzQ4M2JkZDJjZTZlZTg1N2JjMjNmM2JkZjhmMzczNWRiZjQ1MTBk
+    YzZkYzBiNDg2ZjlhMTU5ZGNhZDIzNWJmNDI4MTQzZWFiYWFjYmQzZjBhZWRl
+    ZjZlYWY1MDk4ZmVlZThkMGE1YTE5OTg1ODVlOTZmMDJjNjIxNjc=
   data.tar.gz: !binary |-
-    NTgzNTc1OTUzYWM5ZDc0YmEwMWI2NDgxZTE3ODE4NTE5OGM5YzAwZDllNzQ2
-    ODgzYzNjNTc4OGM0YTc1NmViOGNjNWE1NGNlNzU3MjQwNDkwMWQyOTc0NDhl
-    YWNhNGY5NmVmYzkxOTRjYTc2ZTJiOGI1OGQ4NmRmMmM0ZTJiYzk=
+    NzY5MmJjMTMxMWU0NzVlYzZlZDYwNzM3YzNkM2Y0MzY2ZWIxYWU3MTUwNWYx
+    NWUxNzE3NWUzNWMzZjc4YjI5YjQ3YTM1Y2Q1YWQ2YWZjZDllOGVjM2YzODMw
+    YzRkYTA0ODI4NTMwZjRkZTU5MWM3MDJkYWQxYWNlYzA0ZmFiOTY=

data/lib/object_attorney/association_reflection.rb

@@ -0,0 +1,33 @@
+module ObjectAttorney
+
+  class AssociationReflection
+    attr_reader :klass, :macro, :options, :name
+
+    def initialize(association, options)
+      options = options.is_a?(Hash) ? options : { class_name: options }
+      
+      @name = association
+      @macro = options[:macro] || macro_default(association)
+      @klass = options[:class_name] || klass_default(association)
+      @options = options
+
+      @klass = @klass.constantize if @klass.is_a?(String)
+    end
+
+    private ################################# private
+
+    def macro_default(association)
+      Helpers.plural?(association) ? :has_many : :belongs_to
+    end
+
+    def klass_default(association)
+      if Helpers.plural?(association)
+        association.to_s.singularize.camelize
+      else
+        association.to_s.camelize
+      end
+    end
+
+  end
+
+end

data/lib/object_attorney/helpers.rb

@@ -0,0 +1,19 @@
+module ObjectAttorney
+
+  module Helpers
+
+    extend self
+
+    def plural?(string)
+      string = string.to_s
+      string == string.pluralize
+    end
+
+    def try_or_return(object, method, default_value)
+      returning_value = object.try(method)
+      returning_value.nil? ? default_value : returning_value
+    end
+
+  end
+  
+end

data/lib/object_attorney/nested_objects.rb

@@ -116,28 +116,29 @@ module ObjectAttorney
 
     module ClassMethods
 
-      def accepts_nested_objects(*nested_objects_list)
-        self.instance_variable_set("@nested_objects", nested_objects_list)
-        self.send(:attr_accessor, *nested_objects_list.map { |attribute| "#{attribute}_attributes".to_sym })
-        define_nested_objects_getter_methods nested_objects_list
+      def accepts_nested_objects(nested_object_name, options = {})
+        reflection = AssociationReflection.new(nested_object_name, options)
+        self.instance_variable_set("@#{nested_object_name}_reflection", reflection)
+        self.instance_variable_set("@association_reflections", association_reflections | [reflection])
+
+        self.send(:attr_accessor, "#{nested_object_name}_attributes".to_sym)
+        define_method(nested_object_name) { nested_getter(nested_object_name) }
       end
 
-      def reflect_on_association(association)
-        nil
+      def association_reflections
+        self.instance_variable_get("@association_reflections") || zuper_method('association_reflections') || []
       end
 
-      def nested_objects
-        self.instance_variable_get("@nested_objects") || zuper_method('nested_objects') || []
+      def reflect_on_association(association)
+        self.instance_variable_get("@#{association}_reflection") || zuper_method('reflect_on_association', association)
       end
 
-      private #################### PRIVATE METHODS DOWN BELOW ######################
+      def reflect_on_all_associations(macro = nil)
+        macro ? association_reflections.select { |reflection| reflection.macro == macro } : association_reflections
+      end
 
-      def define_nested_objects_getter_methods(nested_objects_list)
-        nested_objects_list.each do |nested_object_name|
-          define_method(nested_object_name) do
-            nested_getter(nested_object_name)
-          end
-        end
+      def nested_objects
+        association_reflections.map(&:name)
       end
 
     end

data/lib/object_attorney/orm.rb

@@ -6,11 +6,11 @@ module ObjectAttorney
     end
   
     def new_record?
-      try_or_return(represented_object, :new_record?, true)
+      Helpers.try_or_return(represented_object, :new_record?, true)
     end
 
     def persisted?
-      try_or_return(represented_object, :persisted?, false)
+      Helpers.try_or_return(represented_object, :persisted?, false)
     end
 
     def save

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

data/lib/object_attorney.rb

@@ -1,4 +1,6 @@
 require "object_attorney/version"
+require "object_attorney/helpers"
+require "object_attorney/association_reflection"
 require "object_attorney/nested_objects"
 require "object_attorney/orm"
 require 'active_record'
@@ -44,7 +46,7 @@ module ObjectAttorney
   end
 
   def validate_represented_object
-    valid = override_validations? ? true : try_or_return(represented_object, :valid?, true)
+    valid = override_validations? ? true : Helpers.try_or_return(represented_object, :valid?, true)
     import_represented_object_errors unless valid
     valid
   end
@@ -81,23 +83,20 @@ module ObjectAttorney
     marked_for_destruction?
   end
 
-  def try_or_return(object, method, default_value)
-    returning_value = object.try(method)
-    returning_value.nil? ? default_value : returning_value
-  end
-
   module ClassMethods
 
-    def represents(represented_object_name, represented_object_class = nil)
-      self.instance_variable_set("@represented_object_class", represented_object_class || represented_object_name.to_s.camelize.constantize)
+    def represents(represented_object_name, options = {})
+      self.instance_variable_set("@represented_object_reflection", AssociationReflection.new(represented_object_name, options))
 
-      define_method(represented_object_name) do
-        represented_object
-      end
+      define_method(represented_object_name) { represented_object }
+    end
+
+    def represented_object_reflection
+      self.instance_variable_get("@represented_object_reflection") || zuper_method('represented_object_reflection')
     end
 
     def represented_object_class
-      self.instance_variable_get("@represented_object_class") || zuper_method('represented_object_class')
+      represented_object_reflection.try(:klass)
     end
 
     def zuper_method(method_name, *args)

data/object_attorney.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "activerecord"
 end

data/spec/object_attorney/bulk_posts_form_child_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe BulkPostsFormChild do
 
-  it "Creating multiple Posts, with a tabless model 'BulkPostsFormChild' has if it had 'accepts_nested_attributes_for :posts'" do
+  it "Creating multiple Posts, with a tabless model 'BulkPostsFormChild' has if it had 'accepts_nested_attributes_for :posts'", current: true do
     params = {
       bulk_post: {
         admin: true,
@@ -49,7 +49,7 @@ describe BulkPostsFormChild do
         }
       }
     }
-
+    
     existing_post = Post.create(title: "My title1")
     BulkPostsFormChild.new(params[:bulk_post]).save
     existing_post.reload

data/spec/spec_helper.rb

@@ -13,13 +13,15 @@ require 'object_attorney'
 require 'support/database_setup'
 require 'support/active_model/validations'
 require 'support/models/post'
+require 'support/models/item'
 require 'support/models/post_form'
 require 'support/models/post_form_child'
 require 'support/models/bulk_posts_form'
 require 'support/models/bulk_posts_form_child'
 
 RSpec.configure do |config|
-
+  config.filter_run :current
+  
   I18n.enforce_available_locales = false
 
   # see: http://iain.nl/testing-activerecord-in-isolation

data/spec/support/models/bulk_posts_form_child.rb

@@ -2,6 +2,18 @@ class BulkPostsFormChild < BulkPostsForm
 
   attr_accessor :admin
 
+  accepts_nested_objects :items
+
   validates_presence_of :admin
 
+  ##################### BODY BELLOW THIS LINE ####################
+
+  def build_item(attributes = {}, item = nil)
+    Item.new(attributes, item)
+  end
+
+  def existing_items
+    []
+  end
+
 end

data/spec/support/models/item.rb

@@ -0,0 +1,3 @@
+class Item
+  # fake model
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Form Object pattern implementation for Rails
 email:
 - goncalves.joao@gmail.com
@@ -56,6 +70,8 @@ files:
 - db/migrate/20131205114900_create_posts.rb
 - db/schema.rb
 - lib/object_attorney.rb
+- lib/object_attorney/association_reflection.rb
+- lib/object_attorney/helpers.rb
 - lib/object_attorney/nested_objects.rb
 - lib/object_attorney/nested_uniqueness_validator.rb
 - lib/object_attorney/orm.rb
@@ -71,6 +87,7 @@ files:
 - spec/support/database_setup.rb
 - spec/support/models/bulk_posts_form.rb
 - spec/support/models/bulk_posts_form_child.rb
+- spec/support/models/item.rb
 - spec/support/models/post.rb
 - spec/support/models/post_form.rb
 - spec/support/models/post_form_child.rb
@@ -110,6 +127,7 @@ test_files:
 - spec/support/database_setup.rb
 - spec/support/models/bulk_posts_form.rb
 - spec/support/models/bulk_posts_form_child.rb
+- spec/support/models/item.rb
 - spec/support/models/post.rb
 - spec/support/models/post_form.rb
 - spec/support/models/post_form_child.rb