attributor 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e65f034891a43eb2164a43a0bd5bdf7d2a0e22
-  data.tar.gz: dc626f0b5d2cb575f490a1e1d8af6c60d232830f
+  metadata.gz: 76667cd055dc19dfec12646bbdbf1514c90f71d9
+  data.tar.gz: 828783ff925e1a52b46fba2b2bd63c658f0cb6b6
 SHA512:
-  metadata.gz: 514f798b6bcb84313fa6c840dcb0a4bf9533cb3ec7f29a1c9a8ca00db45d119e7122a2bea02289fe094a6ab8db41ff13af0bfb47fafe9568186243f44d25b3f6
-  data.tar.gz: 848e54a8cdf56ab1a498ea75fbddc3571c7723a1285cc8b8c1085a2fa55e6b0a75494968c83f8154bab58f04531a684ea05114970e83c45b53a7c10e6e6a2883
+  metadata.gz: 8aa70abf93838a54751afb73020cd949ce7aa829fd6d9c679e84d8326d5b93fb2a06275b121b59a7495159b9ae40d5fdfce3d5c81d7b17c0a170eba42d9b3b66
+  data.tar.gz: 862d52a9800f01e7dd853b2b331a1e9edda95f26634ac50907e658b4cca510888f034fc8e0c69d8bca60c4b857ae3be8ac73976476a6c3e09e2c8ad6dfaa4571

data/CHANGELOG.md

@@ -4,7 +4,14 @@ Attributor Changelog
 next
 ------
 
-* next thing here
+
+2.2.1
+------
+
+* Dumping attributes will now load the values if they're not in the native type.
+* `Model.valid_type?` now accepts hashes.
+* `Hash`:
+  * Added `:has_key?` to delegation
 
 2.2.0
 ------

data/lib/attributor/types/hash.rb

@@ -159,7 +159,6 @@ module Attributor
 
     def self.dump(value, **opts)
       return nil if value.nil?
-      return super if (@key_type == Object && @value_type == Object )
 
       value.each_with_object({}) do |(k,v),hash|
         k = key_type.dump(k,opts) if @key_type
@@ -309,7 +308,7 @@ module Attributor
     # TODO: add a validate, which simply validates that the incoming keys and values are of the right type.
     #       Think about the format of the subcontexts to use: let's use .at(key.to_s)
     attr_reader :contents
-    def_delegators :@contents, :[], :[]=, :each, :size, :keys, :key?, :values, :empty?
+    def_delegators :@contents, :[], :[]=, :each, :size, :keys, :key?, :values, :empty?, :has_key?
 
     def initialize(contents={})
       @contents = contents

data/lib/attributor/types/model.rb

@@ -117,7 +117,7 @@ module Attributor
     end
 
     def self.dump(value, **opts)
-      value.dump(opts)
+      self.load(value).dump(**opts)
     end
 
     def self.native_type
@@ -209,6 +209,9 @@ module Attributor
       object.validate(context)
     end
 
+    def self.valid_type?(type)
+      type.kind_of?(self) || type.kind_of?(::Hash)
+    end
 
     def self.dsl_class
       @options[:dsl_compiler] || DSLCompiler
@@ -255,7 +258,7 @@ module Attributor
       self.class.attributes.each_with_object(Array.new) do |(sub_attribute_name, sub_attribute), errors|
         sub_context = self.class.generate_subcontext(context,sub_attribute_name)
 
-        value = self.send(sub_attribute_name)
+        value = self.__send__(sub_attribute_name)
         if value.respond_to?(:validating) # really, it's a thing with sub-attributes
           next if value.validating
         end
@@ -269,7 +272,7 @@ module Attributor
 
     def attributes
       @lazy_attributes.keys.each do |name|
-        self.send(name)
+        self.__send__(name)
       end
       @attributes
     end
@@ -291,7 +294,7 @@ module Attributor
 
       if self.class.attributes.has_key?(attribute_name.to_sym)
         self.class.define_accessors(attribute_name)
-        return self.send(name, *args)
+        return self.__send__(name, *args)
       end
 
       super

data/lib/attributor/version.rb

@@ -1,3 +1,3 @@
 module Attributor
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/types/hash_spec.rb

@@ -395,6 +395,16 @@ describe Attributor::Hash do
       end
 
     end
+    context 'will always return a top level hash' do
+      subject(:type_dump){ type.dump(value) }
+      let(:key_type){ Attributor::Object }
+      let(:value_type){ Attributor::Object }
+           
+      it 'even when key/types are object' do
+        subject.should be_kind_of(::Hash)
+        subject.should eq( hash )
+      end
+    end
   end
 
   context 'with case_insensitive_load option for string keys' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Josep M. Blanquer