attributor 2.2.1 → 2.3.0

data/spec/types/float_spec.rb

@@ -25,6 +25,10 @@ describe Attributor::Float do
   context '.load' do
     let(:value) { nil }
 
+    it 'returns nil for nil' do
+      type.load(nil).should be(nil)
+    end
+
     context 'for incoming Float values' do
 
       it 'returns the incoming value' do

data/spec/types/hash_spec.rb

@@ -52,6 +52,16 @@ describe Attributor::Hash do
     let(:value) { {one: 'two', three: 4} }
     subject(:hash) { type.load(value) }
 
+    context 'for nil with recurse: true' do
+      let(:value) { nil }
+      subject(:hash) { HashWithModel.load(value, recurse:true) }
+
+      it 'works' do
+        hash[:name].should eq('Turkey McDucken')
+        hash[:chicken].age.should eq(1)
+      end
+    end
+
     context 'for a simple hash' do
       it { should eq(value) }
       it 'equals the hash' do
@@ -259,17 +269,17 @@ describe Attributor::Hash do
 
       it 'returns a hash with the dumped values and keys' do
         subtype.should_receive(:dump).exactly(2).times.and_call_original
+
         dumped_value = type.dump(value, opts)
         dumped_value.should be_kind_of(::Hash)
-        dumped_value.keys.should =~ [:id1,:id2]
+        dumped_value.keys.should =~ ['id1','id2']
         dumped_value.values.should have(2).items
-        value[:id1].should be_kind_of subtype
-        value[:id2].should be_kind_of subtype
-        dumped_value[:id1].should == value1
-        dumped_value[:id2].should == value2
+        dumped_value['id1'].should == value1
+        dumped_value['id2'].should == value2
       end
 
     end
+
   end
 
   context '#validate' do
@@ -390,21 +400,71 @@ describe Attributor::Hash do
       end
       let(:hash) { {one: value_type.example} }
 
-      it 'works too' do
-        #pp output
-      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
+
+    context 'for a hash with defined keys' do
+      let(:type) do
+        Class.new(Attributor::Hash) do
+          keys do
+            key 'id', Integer
+            key 'chicken', Chicken
+          end
+        end
+      end
+
+      let(:chicken) { {'name' => 'bob'} }
+
+      let(:value) { {'id' => '1', 'chicken' => chicken  } }
+      let(:expected) { {'id' => 1, 'chicken' => Chicken.dump(chicken) } }
+
+      it 'properly dumps the values' do
+        type.dump(value).should eq(expected)
+      end
+
+      context 'with allow_extra: true' do
+        let(:type) do
+          Class.new(Attributor::Hash) do
+            keys allow_extra: true do
+              key 'id', Integer
+              key 'chicken', Chicken
+            end
+          end
+        end
+
+        let(:value) { {'id' => '1', 'chicken' => chicken, 'rank' => 'bob rank'} }
+        let(:expected) { {'id' => 1, 'chicken' => Chicken.dump(chicken), 'rank' => 'bob rank' } }
+        it 'preserves the extra keys at the top level' do
+          type.dump(value).should eq(expected)
+        end
+
+        context 'with extra option' do
+          let(:type) do
+            Class.new(Attributor::Hash) do
+              keys allow_extra: true do
+                key 'id', Integer
+                key 'chicken', Chicken
+                extra 'other', Attributor::Hash
+              end
+            end
+          end
+
+          let(:expected) { {'id' => 1, 'chicken' => Chicken.dump(chicken), 'other' => {'rank' => 'bob rank' }} }
+          it 'dumps the extra keys inside the subhash' do
+            type.dump(value).should eq(expected)
+          end
+        end
+      end
+    end
   end
 
   context 'with case_insensitive_load option for string keys' do
@@ -453,7 +513,7 @@ describe Attributor::Hash do
         output[:two].should eq('two')
         output[:three].should eq('3')
       end
-      
+
       its( :validate ){ should be_empty }
     end
 
@@ -486,6 +546,57 @@ describe Attributor::Hash do
       end
     end
 
+    context '#get and #set' do
+      let(:type) do
+        Class.new(Attributor::Hash) do
+          keys do
+            key 'id', Integer
+            key 'chicken', Chicken
+            extra 'others', Attributor::Hash, default: {}
+          end
+        end
+      end
+
+      let(:chicken) { {name: 'bob'} }
+      subject(:hash) { type.new }
+
+      context '#set' do
+        it 'sets values into "extra" keys if appplicable' do
+          hash.should_not have_key('others')
+          hash.set 'foo', 'bar'
+          hash['others'].should have_key('foo')
+          hash.should have_key('others')
+          hash['others']['foo'].should eq('bar')
+        end
+
+        it 'loads values before saving into the contents' do
+          hash.set 'chicken', chicken
+          hash['chicken'].should be_a(Chicken)
+        end
+      end
+
+      context '#get' do
+        before do
+          hash['chicken'] = chicken
+          hash['chicken'].should eq(chicken)
+        end
+
+        it 'loads and updates the saved value' do
+          hash.get('chicken').should be_a(Chicken)
+          hash['chicken'].should be_a(Chicken)
+        end
+
+        it 'retrieves values from an "extra" key' do
+          bar = double('bar')
+          hash.set 'foo', bar
+          hash.get('others').get('foo').should be(bar)
+
+          hash.get('foo').should be(bar)
+        end
+      end
+
+    end
+
   end
 
 end

data/spec/types/ids_spec.rb

@@ -16,8 +16,8 @@ describe Attributor::Ids do
       ids.load(value).should eq(emails)
     end
 
-    it 'generates valid examples' do
-      ids.validate(ids.example).should be_empty
+    it 'generates valid, loadable examples' do
+      ids.validate(ids.load(ids.example)).should be_empty
     end
 
   end

data/spec/types/integer_spec.rb

@@ -107,6 +107,9 @@ describe Attributor::Integer do
   context '.load' do
     let(:value) { nil }
 
+    it 'returns nil for nil' do
+      type.load(nil).should be(nil)
+    end
 
     context 'for incoming integer values' do
       let(:value) { 1 }

data/spec/types/model_spec.rb

@@ -66,7 +66,7 @@ describe Attributor::Model do
       context 'with infinitely-expanding sub-attributes' do
         let(:model_class) do
           Class.new(Attributor::Model) do
-            this = self
+            this = self 
             attributes do
               attribute :name, String
               attribute :child, this
@@ -120,6 +120,16 @@ describe Attributor::Model do
         it 'returns nil' do
           Chicken.load(nil).should be_nil
         end
+
+        context 'with recurse: true' do
+          subject(:turducken) { Turducken.load(nil, [], recurse: true) }
+
+          it 'loads with default values' do
+            turducken.name.should eq("Turkey McDucken")
+            turducken.chicken.age.should be(1)
+          end
+
+        end
       end
 
       context 'with a JSON-serialized hash' do
@@ -128,7 +138,7 @@ describe Attributor::Model do
         let(:json) { hash.to_json }
         before do
           Chicken.should_receive(:from_hash).
-            with(expected_hash,context)
+            with(expected_hash,context, recurse: false)
           JSON.should_receive(:parse).with(json).and_call_original
         end
 
@@ -186,6 +196,7 @@ describe Attributor::Model do
       end
 
 
+
     end
 
   end
@@ -208,7 +219,7 @@ describe Attributor::Model do
         it 'and sets them in loaded format onto the instance attributes' do
           Chicken.should_receive(:load).with(attributes_data).and_call_original
           attributes_data.keys.each do |attr_name|
-            Chicken.attributes[attr_name].should_receive(:load).with(attributes_data[attr_name],instance_of(Array)).and_call_original
+            Chicken.attributes[attr_name].should_receive(:load).with(attributes_data[attr_name],instance_of(Array), recurse: false).and_call_original
           end
           subject.age.should be(1)
           subject.email.should be(attributes_data[:email])
@@ -220,7 +231,7 @@ describe Attributor::Model do
           it 'and sets them in loaded format onto the instance attributes' do
             Chicken.should_receive(:load).with(attributes_data).and_call_original
             attributes_hash.keys.each do |attr_name|
-              Chicken.attributes[attr_name].should_receive(:load).with(attributes_hash[attr_name],instance_of(Array)).and_call_original
+              Chicken.attributes[attr_name].should_receive(:load).with(attributes_hash[attr_name],instance_of(Array), recurse: false).and_call_original
             end
             subject.age.should be(1)
             subject.email.should == attributes_hash[:email]
@@ -398,4 +409,5 @@ describe Attributor::Model do
   end
 
 
+
 end

data/spec/types/string_spec.rb

@@ -34,6 +34,10 @@ describe Attributor::String do
   context '.load' do
     let(:value) { nil }
 
+    it 'returns nil for nil' do
+      type.load(nil).should be(nil)
+    end
+
     context 'for incoming String values' do
 
       it 'returns the incoming value' do

data/spec/types/time_spec.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe Attributor::Time do
+
+  subject(:type) { Attributor::Time }
+
+  context '.native_type' do
+    its(:native_type) { should be(::Time) }
+  end
+
+  context '.example' do
+    its(:example) { should be_a(::Time) }
+  end
+
+  context '.load' do
+
+    it 'returns nil for nil' do
+      type.load(nil).should be(nil)
+    end
+
+    context 'for incoming objects' do
+      
+      it "returns correct Time for DateTime objects" do
+        object = Time.now
+        loaded = type.load(object)
+        loaded.should be_a(::Time)
+        loaded.to_time.should == object
+      end
+     
+      it "returns correct Time for DateTime objects" do
+        object = DateTime.now
+        loaded = type.load(object)
+        loaded.should be_a(::Time)
+        loaded.should eq(object.to_time)
+      end
+
+    end    
+    
+    context 'for incoming strings' do
+
+      [
+        '2001-02-03T04:05:06+07:00',
+        'Sat, 03 Feb 2001 04:05:06 GMT',
+        '20010203T040506+0700',
+        '2001-W05-6T04:05:06+07:00',
+        'H13.02.03T04:05:06+07:00',
+        'Sat, 3 Feb 2001 04:05:06 +0700',
+        '2013/08/23 00:39:55 +0000',
+        '2007-10-19T04:11:33Z',
+        '2001-02-03T04:05:06+07:00.123456', # custom format with microseconds
+      ].each do |value|
+
+        it "returns correct Time for #{value.inspect}" do
+          type.load(value).should == Time.parse(value)
+        end
+
+      end
+
+      [
+        '2013/08/33 00:39:55 +0000',
+        '2007-10-33T04:11:33Z',
+        '2001-02-33T04:05:06+07:00.123456', # custom format with microseconds
+      ].each do |value|
+
+        it "raises Attributor::AttributorException for #{value.inspect}" do
+          expect {
+            type.load(value)
+          }.to raise_error(Attributor::DeserializationError, /Error deserializing a String using Time/)
+        end
+
+      end
+
+      [
+        '',
+        'foobar'
+      ].each do |value|
+
+        it "raises Attributor::AttributorException for #{value.inspect}" do
+          expect {
+            type.load(value)
+          }.to raise_error(Attributor::DeserializationError, /Error deserializing a String using Time/)
+        end
+
+      end
+
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -260,10 +260,12 @@ files:
 - lib/attributor/exceptions.rb
 - lib/attributor/extensions/randexp.rb
 - lib/attributor/type.rb
+- lib/attributor/types/bigdecimal.rb
 - lib/attributor/types/boolean.rb
 - lib/attributor/types/collection.rb
 - lib/attributor/types/container.rb
 - lib/attributor/types/csv.rb
+- lib/attributor/types/date.rb
 - lib/attributor/types/date_time.rb
 - lib/attributor/types/file_upload.rb
 - lib/attributor/types/float.rb
@@ -275,19 +277,23 @@ files:
 - lib/attributor/types/string.rb
 - lib/attributor/types/struct.rb
 - lib/attributor/types/tempfile.rb
+- lib/attributor/types/time.rb
 - lib/attributor/version.rb
 - spec/attribute_resolver_spec.rb
 - spec/attribute_spec.rb
 - spec/attributor_spec.rb
 - spec/dsl_compiler_spec.rb
 - spec/spec_helper.rb
+- spec/support/hashes.rb
 - spec/support/models.rb
 - spec/support/types.rb
 - spec/type_spec.rb
+- spec/types/bigdecimal_spec.rb
 - spec/types/boolean_spec.rb
 - spec/types/collection_spec.rb
 - spec/types/container_spec.rb
 - spec/types/csv_spec.rb
+- spec/types/date_spec.rb
 - spec/types/date_time_spec.rb
 - spec/types/file_upload_spec.rb
 - spec/types/float_spec.rb
@@ -298,6 +304,7 @@ files:
 - spec/types/string_spec.rb
 - spec/types/struct_spec.rb
 - spec/types/tempfile_spec.rb
+- spec/types/time_spec.rb
 homepage: https://github.com/rightscale/attributor
 licenses:
 - MIT
@@ -328,13 +335,16 @@ test_files:
 - spec/attributor_spec.rb
 - spec/dsl_compiler_spec.rb
 - spec/spec_helper.rb
+- spec/support/hashes.rb
 - spec/support/models.rb
 - spec/support/types.rb
 - spec/type_spec.rb
+- spec/types/bigdecimal_spec.rb
 - spec/types/boolean_spec.rb
 - spec/types/collection_spec.rb
 - spec/types/container_spec.rb
 - spec/types/csv_spec.rb
+- spec/types/date_spec.rb
 - spec/types/date_time_spec.rb
 - spec/types/file_upload_spec.rb
 - spec/types/float_spec.rb
@@ -345,4 +355,5 @@ test_files:
 - spec/types/string_spec.rb
 - spec/types/struct_spec.rb
 - spec/types/tempfile_spec.rb
+- spec/types/time_spec.rb
 has_rdoc: