object_attorney 2.6.12 → 2.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA1MTMzODdmNjY3M2I2NGFiZjEwNWEzYmMxN2Y5NDJkZWRkNDMyOQ==
+    YzU5MTQzODQ3Y2NjMTU0MWVkMzRmOGRmOTMwMTZmZjA4Y2Y1MmQxNw==
   data.tar.gz: !binary |-
-    ZTg0ZmJiMGNiMGNkMDNiNjFiOGY5YmNlYWY5NDRmYzkxYWNkYTdmZQ==
+    ZWRlYWQ3MjdkNmU0YjFjZjM4YzQ3MjAyODhlMzg4MGMwMmEzNDRkZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmQ5MDA2ZDk4ZGUxOThkYTM3ZmFjZmQyNWYwMGZjZDU3Yzk3MzJjMDI2NTE3
-    MDkzYWY2YzljZWUzZGQ2YjE4MDljYWNjZmRjYzY2MjA5NzI5MzRjYmEyZmNm
-    YmJhYzg4NTdhOWI3MDBiZWRhNzQ1NWRiZTQ2YWI2ZDAzZTliYjI=
+    MDBlNjIzZjBjZTIyZTQ2YzhiNTdhM2Y2OTk3ODNiYmEwZDlmNmNlNDZmMmM1
+    NjA2YmY5MTk1ODYyNzk0Y2M3ZTFhNGJjNGY3YjYzMGE1NmViNTVkNWEwMzIw
+    MTZjMTA1ZWE5N2ZlZjE2MTU2NjJkYjYxMDIzOTcyZmZkNTZiNTA=
   data.tar.gz: !binary |-
-    MGU2NTJjODU0Y2NiODM2OGFlNWQ1MTJhMGU3MWI0MjdhMDViOTc3ZTQwYzU2
-    MWQ1YjBkODI0YTMyM2VmYzlmM2M1YThlNTRlNzQ2YzBjYzM5ZjMzNDFjMmFh
-    YjJiMjIyNjRkZTk2OTEzZDEyOTZmYmJkNDkzMTE2ZTc4MDcyMWY=
+    MjhjZDA5N2Q1MzllMTBjMGExOWI2ODQyNzM2ZjEyY2FlOWZiMTY4YmEyNmRl
+    NzJlMjRhYzZiNDAzOGY1MTEzNDg5YWFjMGIxNDAzMjRlMDBhMTFlZDEyNzk5
+    N2EwMTlkYzdkNDM2NTAzMjY3OTIxZTM5OGE3YjY3NDcxZmEzMTg=

data/lib/object_attorney.rb

@@ -1,6 +1,7 @@
 
 require "object_attorney/attribute_assignment"
 require "object_attorney/delegation"
+require "object_attorney/exposed_data"
 require "object_attorney/helpers"
 require "object_attorney/naming"
 require "object_attorney/reflection"
@@ -48,6 +49,7 @@ module ObjectAttorney
       include NestedObjects
       include Record
       include Representation
+      include ExposedData
 
       validate :validate_represented_object
     end

data/lib/object_attorney/delegation.rb

@@ -6,12 +6,34 @@ module ObjectAttorney
       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) }
+    def properties(*_properties)
+      _properties.each { |property| delegate_property(property) }
     end
 
-    def delegate_property(property, options)
-      delegate property, "#{property}=", options
+    def getters(*_getters)
+      _getters.each { |getter| delegate_getter(getter) }
+    end
+
+    def setters(*_setters)
+      _setters.each { |getter| delegate_setter(getter) }
+    end
+
+    
+    protected ##################### PROTECTED #####################
+
+    def delegate_property(property)
+      delegate_getter(property)
+      delegate_setter(property)
+    end
+
+    def delegate_getter(getter)
+      delegate getter, to: :represented_object
+      add_exposed_getters(getter)
+    end
+
+    def delegate_setter(setter)
+      delegate "#{setter}=", to: :represented_object
+      add_exposed_setters(setter)
     end
 
   end

data/lib/object_attorney/exposed_data.rb

@@ -0,0 +1,42 @@
+module ObjectAttorney
+
+  module ExposedData
+
+    def exposed_data
+      self.class.exposed_getters.reduce({}) do |data, getter|
+        data[getter] = send(getter)
+        data
+      end
+    end
+
+    def to_json(options = {})
+      exposed_data.to_json
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      
+      def exposed_getters
+        @exposed_getters ||= (zuper_method(:exposed_getters) || [])
+      end
+
+      def add_exposed_getters(*getters)
+        exposed_getters.push(*getters) unless exposed_getters.include?(getters)
+      end
+
+      def exposed_setters
+        @exposed_setters ||= (zuper_method(:exposed_setters) || [])
+      end
+
+      def add_exposed_setters(*setters)
+        exposed_setters.push(*setters) unless exposed_setters.include?(setters)
+      end
+
+    end
+
+  end
+
+end

data/lib/object_attorney/representation.rb

@@ -59,13 +59,9 @@ module ObjectAttorney
 
         define_method(represented_object_name) { represented_object }
         
-        delegate_properties(*options[:properties], to: represented_object_name) if options.include?(:properties)
-        
-        initiate_getters(options[:getter], represented_object_name)
-        initiate_getters(options[:getters], represented_object_name)
-
-        initiate_setters(options[:setter], represented_object_name)
-        initiate_setters(options[:setters], represented_object_name)
+        properties(*options[:properties]) if options.include?(:properties)
+        getters(*options[:getters]) if options.include?(:getters)
+        setters(*options[:setters]) if options.include?(:setters)
       end
 
       def represented_object_reflection
@@ -82,21 +78,6 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.6.12"
+  VERSION = "2.8.0"
 end

data/spec/object_attorney/delegation_spec.rb

@@ -0,0 +1,112 @@
+require "spec_helper"
+
+shared_examples "a PostForm with delegated properties" do
+
+  it "1. Creating a 'Post' with 3 params, but only 2 are delegated" do
+    params = {
+      post: {
+        title: 'First post',
+        body: 'post body',
+        user_id: 666
+      }
+    }
+
+    post_form = described_class.new(params[:post])
+
+    post_form.save.should == true
+    described_class.exposed_getters.should == [:title, :user_id]
+    described_class.exposed_setters.should == [:title, :user_id]
+
+    Post.all.count.should == 1
+    post = Post.first
+    post.title.should == 'First post'
+    post.body.should == nil
+    post.user_id.should == 666
+  end
+
+end
+
+describe PostForm::Properties1 do
+  it_behaves_like 'a PostForm with delegated properties'
+end
+
+describe PostForm::Properties2 do
+  it_behaves_like 'a PostForm with delegated properties'
+end
+
+
+shared_examples "a PostForm with only delegated getters" do
+
+  it "1. Editing a 'Post' with 3 params, no changes should take place but the getters should" do
+    params = {
+      post: {
+        title: 'altered title', body: 'altered body', user_id: 666        
+      }
+    }
+
+    post = Post.create({ title: 'First post', body: 'post body', user_id: 1 })
+
+    post_form = described_class.new(params[:post], post)
+
+    post_form.save.should == true
+    described_class.exposed_getters.should == [:title, :user_id]
+    described_class.exposed_setters.should == []
+
+    Post.all.count.should == 1
+    post = Post.first
+    post.title.should == 'First post'
+    post.body.should == 'post body'
+    post.user_id.should == 1
+
+    post_form.title.should == 'First post'
+    post_form.user_id.should == 1
+    post_form.respond_to?(:body).should == false
+  end
+
+end
+
+describe PostForm::Getters1 do
+  it_behaves_like 'a PostForm with only delegated getters'
+end
+
+describe PostForm::Getters2 do
+  it_behaves_like 'a PostForm with only delegated getters'
+end
+
+
+shared_examples "a PostForm with only delegated setters" do
+
+  it "1. Editing a 'Post' with 3 params, changes should take place and the getters should not work" do
+    params = {
+      post: {
+        title: 'altered title', body: 'altered body', user_id: 666
+      }
+    }
+
+    post = Post.create({ title: 'First post', body: 'post body', user_id: 1 })
+
+    post_form = described_class.new(params[:post], post)
+
+    post_form.save.should == true
+    described_class.exposed_getters.should == []
+    described_class.exposed_setters.should == [:title, :user_id]
+
+    Post.all.count.should == 1
+    post = Post.first
+    post.title.should == 'altered title'
+    post.body.should == 'post body'
+    post.user_id.should == 666
+
+    post_form.respond_to?(:title).should == false
+    post_form.respond_to?(:user_id).should == false
+  end
+
+end
+
+describe PostForm::Setters1 do
+  it_behaves_like 'a PostForm with only delegated setters'
+end
+
+describe PostForm::Setters2 do
+  it_behaves_like 'a PostForm with only delegated setters'
+end

data/spec/object_attorney/exposed_data_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe PostForm::GrandSon do
+
+  it "1. Editing a 'Post' with 6 params, only 2 should take place, and only 2 getters should be active" do
+    params = {
+      post: {
+        title: 'altered title', body: 'altered body', user_id: 666, author: 'test', email: 'test@gmail.com', date: '20-10-2010'
+      }
+    }
+
+    post = Post.create({ title: 'First post', body: 'post body', user_id: 1 })
+
+    post_form = described_class.new(params[:post], post)
+
+    post_form.save.should == true
+    described_class.exposed_getters.should == [:title, :email, :author, :body, :date]
+    described_class.exposed_setters.should == [:title, :user_id]
+
+    Post.all.count.should == 1
+    post = Post.first
+    post.title.should == 'altered title'
+    post.body.should == 'post body'
+    post.user_id.should == 666
+    post.respond_to?(:author).should == false
+    post.respond_to?(:email).should == false
+    post.respond_to?(:date).should == false
+
+    post_form.title.should == 'altered title'
+    post_form.body.should == 'post body'
+    post_form.author.should == 'test'
+    post_form.email.should == 'test@gmail.com'
+    post_form.date.should == '20-10-2010'
+    post_form.respond_to?(:user_id).should == false
+    
+    data = { title: "altered title", email: "test@gmail.com", author: "test", body: "post body", date: "20-10-2010" }
+
+    post_form.exposed_data.should == data
+    post_form.to_json.should == data.to_json
+  end
+
+end

data/spec/support/form_objects/comment_form.rb

@@ -4,7 +4,7 @@ class CommentForm
 
   represents :comment
 
-  delegate_properties :body, to: :comment
+  properties :body
 
   validates_presence_of :body
 

data/spec/support/form_objects/post_form.rb

@@ -4,9 +4,7 @@ module PostForm
 
     include ObjectAttorney
 
-    represents :post
-
-    delegate_properties :title, :body, to: :post
+    represents :post, properties: [:title, :body]
 
     has_many :comments
 
@@ -51,4 +49,66 @@ module PostForm
 
   end
   
+
+  class Properties1
+    include ObjectAttorney
+    represents :post
+    properties :title, :user_id
+  end
+
+  class Properties2
+    include ObjectAttorney
+    represents :post, properties: [:title, :user_id]
+  end
+
+
+  class Getters1
+    include ObjectAttorney
+    represents :post
+    getters :title, :user_id
+  end
+
+  class Getters2
+    include ObjectAttorney
+    represents :post, getters: [:title, :user_id]
+  end
+
+
+  class Setters1
+    include ObjectAttorney
+    represents :post
+    setters :title, :user_id
+  end
+
+  class Setters2
+    include ObjectAttorney
+    represents :post, setters: [:title, :user_id]
+  end
+
+
+  class GrandFather
+    include ObjectAttorney
+    represents :post
+  end
+
+  class Father < GrandFather
+    properties :title
+
+    add_exposed_getters :email, :author
+
+    attr_accessor :email, :author
+  end
+
+  class Son < Father
+    getters :body
+  end
+
+  class GrandSon < Son
+    setters :user_id
+
+    add_exposed_getters :date
+
+    attr_accessor :date
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.6.12
+  version: 2.8.0
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - lib/object_attorney/association_reflection.rb
 - lib/object_attorney/attribute_assignment.rb
 - lib/object_attorney/delegation.rb
+- lib/object_attorney/exposed_data.rb
 - lib/object_attorney/helpers.rb
 - lib/object_attorney/naming.rb
 - lib/object_attorney/nested_objects.rb
@@ -92,6 +93,8 @@ files:
 - spec/object_attorney/bulk_posts_allow_only_existing_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
 - spec/object_attorney/bulk_posts_with_form_objects_form_spec.rb
+- spec/object_attorney/delegation_spec.rb
+- spec/object_attorney/exposed_data_spec.rb
 - spec/object_attorney/post_form_spec.rb
 - spec/object_attorney/post_validations_form_spec.rb
 - spec/object_attorney/post_with_comment_form_spec.rb
@@ -153,6 +156,8 @@ test_files:
 - spec/object_attorney/bulk_posts_allow_only_existing_form_spec.rb
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
 - spec/object_attorney/bulk_posts_with_form_objects_form_spec.rb
+- spec/object_attorney/delegation_spec.rb
+- spec/object_attorney/exposed_data_spec.rb
 - spec/object_attorney/post_form_spec.rb
 - spec/object_attorney/post_validations_form_spec.rb
 - spec/object_attorney/post_with_comment_form_spec.rb