object_attorney 2.9.0 → 2.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTk2ZjBiODdlOGJlOGRjZDRkYTZkMjViZjllOThhYjgxMTBjYzYyMQ==
+    OTNmNTI5YThjYjcxYThjNmM2YWFmZjY5NjJlNjlkYTYzNGM1MWUwMw==
   data.tar.gz: !binary |-
-    NjdhYzlhNjJiZjYyZTkzZWI3MjkzMjViYzVjZGRkNDVmYTkxN2JlMg==
+    MjY5YWNhNmI1ODUwZDUxNzExNzRiMWJhNDE0N2VjZDlkNzlkYzQ2OQ==
 SHA512:
   metadata.gz: !binary |-
-    NWE0YTk0N2FhNDZjOWJiYmU5ZDE0Mjg0ZWQwZWZkNDQ1ZTE5ZWQyMDRhM2E0
-    M2VhMWM2ODU2ZjI2ZWY3MTkxOWE3OWViOGNiM2ViNmQ4YTY5OTYyNjBmNDRj
-    NTQzYmNhMTcxOGY2YjZlNDc4ZDI5M2U1N2JiNTQwNmRhNmMwMDM=
+    ODA1NzdlY2U2NmY0Mzc2YTA1NDk1NGY1ZWQ3ZDhjOTY5Zjg0ZTk1YmZjOTM1
+    MTU5NDMxODAyMmJjYjVhY2ZhZTZlYWFmY2ViOTVjNzI0NjQ1ZTk2ZWQwNGQ5
+    MmM1MzJjMjYyMTRmYWU5YjI5YTRkZDFkYzhjZTViNzBjYmU2NGQ=
   data.tar.gz: !binary |-
-    MTNlZDEzMTUwMmViMjE4OTY3YzU3MjBjYTliM2Q1N2VjM2I3MTVmMzNiN2Fj
-    NTQwZDY2N2NiMjcwYmJlMDY1Y2JhNWJlOTk2ZDIxOThiYjY3MzIzZjJiMWQy
-    ZGJmZGVjNmVlMWYxMTkxNTUyMGY2YjhhN2M5M2IwYTU5NTBmMGE=
+    NjY2YmM2NzNkZWQ0YjZlMTQyOTVmMDNlMTUyZDVjY2FmMjUxNzBhNzMxYzc0
+    ZmZjZjMwNGVlMGFkM2Y1Y2U5NGQ2YWQzMGUxMTI5MmFmNDUwNGQ1OTc5M2E1
+    ZjM4MGMyYTk3MzBkYmQ1ODhlN2YwZjY2ODIwODk3NjgyMTg1OWI=

data/lib/object_attorney/delegation.rb

@@ -36,7 +36,7 @@ module ObjectAttorney
 
     def delegate_getter(getter)
       delegate getter, to: :represented_object
-      add_exposed_data getter
+      add_attribute_key getter
     end
 
     def delegate_setter(setter)

data/lib/object_attorney/serialization.rb

@@ -0,0 +1,43 @@
+module ObjectAttorney
+
+  module Serialization
+
+    def attributes
+      self.class.attributes_keys.reduce({}) do |data, getter|
+        data[getter.to_s] = send(getter)
+        data
+      end
+    end
+
+    def to_hash(options = {})
+      serializable_hash(options)
+    end
+
+    def to_json(options = {})
+      serializable_hash(options).to_json
+    end
+
+    def self.included(base)
+      base.class_eval { include ActiveModel::Serialization }
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      
+      def attributes_keys
+        return @attributes_keys if defined?(@attributes_keys)
+
+        @attributes_keys = zuper_method(:attributes_keys)
+        
+        @attributes_keys ||= represented_object_class.present? && represented_object_class.method_defined?(:id) ? [:id] : []
+      end
+
+      def add_attribute_key(*getters)
+        attributes_keys.push(*getters) unless attributes_keys.include?(getters)
+      end
+
+    end
+
+  end
+
+end

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.9.0"
+  VERSION = "2.9.2"
 end

data/lib/object_attorney.rb

@@ -1,7 +1,6 @@
 
 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"
@@ -10,6 +9,7 @@ require "object_attorney/nested_objects"
 require "object_attorney/record"
 require "object_attorney/translation"
 require "object_attorney/representation"
+require "object_attorney/serialization"
 require 'active_record'
 
 require "object_attorney/version"
@@ -49,7 +49,7 @@ module ObjectAttorney
       include NestedObjects
       include Record
       include Representation
-      include ExposedData
+      include Serialization
 
       validate :validate_represented_object
     end

data/spec/object_attorney/{exposed_data_spec.rb → serialization_spec.rb}

@@ -14,7 +14,6 @@ describe PostForm::GrandSon do
     post_form = described_class.new(params[:post], post)
 
     post_form.save.should == true
-    described_class.exposed_data.should == [:id, :title, :email, :author, :body, :date]
 
     Post.all.count.should == 1
     post = Post.first
@@ -34,7 +33,7 @@ describe PostForm::GrandSon do
     
     data = { id:1, title: "altered title", email: "test@gmail.com", author: "test", body: "post body", date: "20-10-2010" }
 
-    post_form.to_hash.should == data
+    post_form.serializable_hash.symbolize_keys.should == data
     post_form.to_json.should == data.to_json
   end
 

data/spec/support/form_objects/post_form.rb

@@ -100,7 +100,7 @@ module PostForm
   class Father < GrandFather
     properties :title
 
-    add_exposed_data :email, :author
+    add_attribute_key :email, :author
 
     attr_accessor :email, :author
   end
@@ -112,7 +112,7 @@ module PostForm
   class GrandSon < Son
     setters :user_id
 
-    add_exposed_data :date
+    add_attribute_key :date
 
     attr_accessor :date
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.2
 platform: ruby
 authors:
 - João Gonçalves
@@ -76,7 +76,6 @@ 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
@@ -84,6 +83,7 @@ files:
 - lib/object_attorney/record.rb
 - lib/object_attorney/reflection.rb
 - lib/object_attorney/representation.rb
+- lib/object_attorney/serialization.rb
 - lib/object_attorney/translation.rb
 - lib/object_attorney/validations.rb
 - lib/object_attorney/version.rb
@@ -94,7 +94,6 @@ files:
 - 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
@@ -102,6 +101,7 @@ files:
 - 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/serialization_spec.rb
 - spec/object_attorney/user_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
@@ -155,7 +155,6 @@ test_files:
 - 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
@@ -163,6 +162,7 @@ test_files:
 - 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/serialization_spec.rb
 - spec/object_attorney/user_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb

data/lib/object_attorney/exposed_data.rb

@@ -1,38 +0,0 @@
-module ObjectAttorney
-
-  module ExposedData
-
-    def to_hash
-      self.class.exposed_data.reduce({}) do |data, getter|
-        data[getter] = send(getter)
-        data
-      end
-    end
-
-    def to_json(options = {})
-      to_hash.to_json
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      
-      def exposed_data
-        return @exposed_data if defined?(@exposed_data)
-
-        @exposed_data = zuper_method(:exposed_data)
-        
-        @exposed_data ||= represented_object_class.present? && represented_object_class.method_defined?(:id) ? [:id] : []
-      end
-
-      def add_exposed_data(*getters)
-        exposed_data.push(*getters) unless exposed_data.include?(getters)
-      end
-
-    end
-
-  end
-
-end