deserializer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e98ac2dd5ac22cf71de5fe17aec446999b93dec
-  data.tar.gz: 423a1b3fcc3b5a8497c9aa14de5d570c969085ef
+  metadata.gz: d7ead03cc6f7509656922f6a300a7416730840dc
+  data.tar.gz: f10fff12d9341c2c51cfcf83d4374e1cfbf82d7a
 SHA512:
-  metadata.gz: a617f0e4c52e8397fd287f0d776db9ffbf57f094ab029747eb499a2062a8ebbbc92288fc4a01aba316d2fb86eb477af298afc4d361cf49f055641f7dd666208f
-  data.tar.gz: b24342df65559de3e0fa3b8f7dc9d48974e3403d560e6da805d18d88873e2b9ead8aeb17c8ffe34d44490960ce7ac9a3249a58889e0f619886b233d197b904c6
+  metadata.gz: f922a56a0beab0caffce4555722f93c0a41c4dbcd6d41fde5bd30875346409f49e12d8d20e316f324ff026b6c5b2fd3e0112f2a73495c8dd506b43722ae6c459
+  data.tar.gz: 37cd5ed9ea2990d5af586cf309a19e4bbed380b3881802dd6f33abe2e890e2af28fb5270e882db1caa9b72cec6ec176f403b5d8577a41d9e28efe80ec210eb82

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    deserializer (0.5.0)
+    deserializer (0.6.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)

data/lib/deserializer.rb

@@ -1,6 +1,8 @@
 require "deserializer/version"
 require 'active_support'
 require 'active_support/concern'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/class/attribute'
 
 module Deserializer
   autoload :Attribute,          'deserializer/attribute'

data/lib/deserializer/attributable.rb

@@ -7,24 +7,24 @@ module Deserializer
         # deserializer interface functions
 
         def attributes( *attrs )
-          self.__attrs ||= []
+          self.__attrs = __attrs.dup
           attrs.each do |attr|
-            __attrs << Attribute::Attribute.new( Attribute::ValueAttribute, attr, {} )
+            attribute( attr, {} )
           end
         end
 
         def attribute( name, opts = {} )
-          self.__attrs ||= []
-          __attrs << Attribute::Attribute.new( Attribute::ValueAttribute, name, opts )
+          attribute = Attribute::Attribute.new( Attribute::ValueAttribute, name, opts )
+          self.__attrs = __attrs.merge attribute.key => attribute
         end
 
         def has_one( name, opts = {} )
           unless opts[:deserializer]
             raise DeserializerError, class: self, message: "has_one associations need a deserilaizer" 
           end
-
-          self.__attrs ||= []
-          __attrs << Attribute::Attribute.new( Attribute::HasOneAssociation, name, opts )
+          
+          attribute = Attribute::Attribute.new( Attribute::HasOneAssociation, name, opts )
+          self.__attrs = __attrs.merge attribute.key => attribute
         end
 
         def has_many( name, opts = {} )
@@ -32,8 +32,8 @@ module Deserializer
             raise DeserializerError, class: self, message: "has_many associations need a deserilaizer" 
           end
 
-          self.__attrs ||= []
-          __attrs << Attribute::Attribute.new( Attribute::HasManyAssociation, name, opts )
+          attribute = Attribute::Attribute.new( Attribute::HasManyAssociation, name, opts )
+          self.__attrs = __attrs.merge attribute.key => attribute
         end
 
         def belongs_to( *args )
@@ -45,8 +45,8 @@ module Deserializer
             raise DeserializerError, class: self, message: "nested associations need a deserilaizer" 
           end
 
-          self.__attrs ||= []
-          __attrs << Attribute::Attribute.new( Attribute::NestedAssociation, name, opts )
+          attribute = Attribute::Attribute.new( Attribute::NestedAssociation, name, opts )
+          self.__attrs = __attrs.merge attribute.key => attribute
         end
       end
     end

data/lib/deserializer/attribute/has_one_association.rb

@@ -18,15 +18,6 @@ module Deserializer
           if target == object.object
             return value
 
-          # has_one :thing, deserializer: ThingDeserializer
-          # has_one :gniht, deserializer: GnihtDeserializer
-          #
-          # def thing
-          #   object[:gniht]
-          # end
-          elsif target.is_a? Hash
-            return target.merge value
-
           # has_one :thing, deserializer: GnihtDeserializer
           #
           # def thing

data/lib/deserializer/attribute/value_attribute.rb

@@ -5,7 +5,7 @@ module Deserializer
       def value( params )
         value = params[key]
 
-        if opts[:ignore_empty] && empty?(value)
+        if opts[:ignore_empty] && value.blank?
           return :ignore
         end
         
@@ -19,15 +19,6 @@ module Deserializer
         
         value
       end
-
-      private
-
-      def empty?(value)
-        !value ||
-        value == "" ||
-        value == {} ||
-        value == []
-      end
     end
   end
 end

data/lib/deserializer/base.rb

@@ -4,17 +4,18 @@ module Deserializer
     ## atribute, has_one, nested, etc associations
     include Deserializer::Attributable
 
+    class_attribute :__attrs
+    self.__attrs = {}
     class << self
-      attr_accessor :__attrs
-
+      
       # deserializer usage functions
 
       def from_params( params = {} )
-        self.new( params ).deserialize
+        new( params ).deserialize
       end
 
       def permitted_params
-        self.__attrs.map(&:key)
+        __attrs.keys
       end
     end
 
@@ -25,7 +26,7 @@ module Deserializer
       object ||= {}
 
       # deserialize
-      self.class.__attrs.each do |attr|
+      self.class.__attrs.each do |_, attr|
         object.merge!( attr.to_hash( params, self ) ) do |key, old_value, new_value|
           # in the case that 2 has_ones merge into the same key. Not sure i want to support this
           if old_value.is_a?( Hash ) && new_value.is_a?( Hash )

data/lib/deserializer/version.rb

@@ -1,3 +1,3 @@
 module Deserializer
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/test/lib/deserializers.rb

@@ -127,4 +127,11 @@ end
 class HasManyDeserializer < Deserializer::Base
   attribute   :id
   has_many :attributes, deserializer: AttributeDeserializer
+end
+
+class InheritedDeserializer < HasOneWithTargetDeserializer
+  attributes  :this,
+              :that
+
+  attribute   :created_by
 end

data/test/unit/deserializer_test.rb

@@ -174,4 +174,14 @@ class DeserializerTest < Minitest::Test
   def test_nested_handles_no_input
     assert_equal ({nested_object: {}}), NestableDeserializer.from_params( {} )
   end
+
+  def test_can_inherit_from_other_deserializer
+    base_permitted_params = HasOneWithTargetDeserializer.permitted_params
+
+    assert_equal [:external, :thing], base_permitted_params, "inheritance broke the base class"
+    
+    inherited_permitted_params = base_permitted_params + [:this, :that, :created_by]
+    
+    assert_equal inherited_permitted_params, InheritedDeserializer.permitted_params
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deserializer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Greg Orlov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport