attributor 2.6.1 → 3.0

data/spec/types/ids_spec.rb

@@ -13,7 +13,7 @@ describe Attributor::Ids do
     its(:member_attribute) { should be(Chicken.attributes[:email]) }
 
     it 'loads' do
-      ids.load(value).should eq(emails)
+      ids.load(value).should =~ emails
     end
 
     it 'generates valid, loadable examples' do

data/spec/types/model_spec.rb

@@ -1,9 +1,48 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 describe Attributor::Model do
+  subject(:chicken) { Chicken }
+
+  # TODO: should move most of these specs to hash spec
+
+  context 'attributes' do
+    context 'with an exception from the definition block' do
+      subject(:broken_model) do
+        Class.new(Attributor::Model) do
+          attributes do
+            raise 'sorry :('
+            attribute :name, String
+          end
+        end
+      end
+
+      it 'throws original exception upon first run' do
+        lambda {
+          broken_model.attributes
+        }.should raise_error(RuntimeError, 'sorry :(')
+      end
+
+      it 'throws InvalidDefinition for subsequent access' do
+        broken_model.attributes rescue nil
+
+        lambda {
+          broken_model.attributes
+        }.should raise_error(Attributor::InvalidDefinition)
+      end
+
+      it 'throws for any attempts at using of an instance of it' do
+        broken_model.attributes rescue nil
+
+        instance = broken_model.new
+        lambda {
+          instance.name
+        }.should raise_error(Attributor::InvalidDefinition)
+      end
+
+    end
+  end
 
   context 'class methods' do
-    subject(:chicken) { Chicken }
     let(:context){ ["root","subattr"] }
 
     its(:native_type) { should eq(Chicken) }
@@ -315,13 +354,12 @@ describe Attributor::Model do
         its(:validate) { should be_empty}
       end
 
-      context 'that are invalid' do
-        subject(:person) do
-          # TODO: support this? Person.example(title: 'dude', address: {name: 'ME'} )
-
-          obj = Person.example(title: 'dude')
-          obj.address.state = 'ME'
-          obj
+      context 'that are both invalid' do
+        subject(:person){ Person.load( name: 'Joe', title: 'dude', okay: true )}
+        let(:address){ Address.load( name: '1 Main St', state: 'ME' )}
+        before do
+          person.address = address
+          address.person = person
         end
 
         its(:validate) { should have(2).items }
@@ -331,10 +369,8 @@ describe Attributor::Model do
           title_error.should =~ /^Attribute person\.title:/
           state_error.should =~ /^Attribute person\.address\.state:/
         end
-
       end
 
-
     end
   end
 
@@ -400,18 +436,42 @@ describe Attributor::Model do
       end
     end
 
+    context 'for collections of models' do
+      let(:attributes_block) do
+        proc do
+          attribute :neighbors, required: true do
+            attribute :name, required: true
+            attribute :age, Integer
+          end
+        end
+      end
+      subject(:struct) { Attributor::Struct.construct(attributes_block, reference: Cormorant) }
+
+      it 'supports defining sub-attributes using the proper reference' do
+        struct.attributes[:neighbors].options[:required].should be true
+        struct.attributes[:neighbors].type.member_attribute.type.attributes.keys.should =~ [:name, :age]
+
+        name_options = struct.attributes[:neighbors].type.member_attribute.type.attributes[:name].options
+        name_options[:required].should be true
+        name_options[:description].should eq 'Name of the Cormorant'
+      end
+    end
 
     context 'redefining an attribute' do
-      before do
-        model.attributes do
-          attribute :id, String
+      context 'for simple types' do
+        before do
+          model.attributes do
+            attribute :id, String
+          end
+        end
+
+        it 'updates the type properly' do
+          model.attributes[:id].type.should be(Attributor::String)
         end
-      end
 
-      it 'works' do
-        model.attributes[:id].type.should be(Attributor::String)
       end
 
+
     end
 
   end
@@ -427,8 +487,8 @@ describe Attributor::Model do
     subject(:example) { model_class.example }
 
     its(:attributes) { should be_empty }
-    
-    it 'dumps as an empty hash' do 
+
+    it 'dumps as an empty hash' do
       example.dump.should eq({})
     end
 

data/spec/types/string_spec.rb

@@ -19,14 +19,12 @@ describe Attributor::String do
       type.example.should be_a(::String)
     end
 
-    it 'handles regexps that Randexp can not' do
-      pending 'resolution of #72' do
-        regex = /\w+(,\w+)*/
-        expect {
-          val = Attributor::String.example(options:{regexp: regex})
-          val.should be_a(::String)
-        }.to_not raise_error
-      end
+    it 'handles regexps that Randexp can not (#72)' do
+      regex = /\w+(,\w+)*/
+      expect {
+        val = Attributor::String.example(options:{regexp: regex})
+        val.should be_a(::String)
+      }.to_not raise_error
     end
 
   end

data/spec/types/uri_spec.rb

@@ -0,0 +1,12 @@
+describe Attributor::URI do
+
+  subject(:type) { Attributor::URI }
+
+  its(:native_type) { should be ::URI::Generic }
+
+  it 'check_option!' do
+    # No options supported thus far
+    expect(type.check_option!(:foo, nil )).to be(:unknown)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: '3.0'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -282,6 +282,7 @@ files:
 - lib/attributor/types/symbol.rb
 - lib/attributor/types/tempfile.rb
 - lib/attributor/types/time.rb
+- lib/attributor/types/uri.rb
 - lib/attributor/version.rb
 - spec/attribute_resolver_spec.rb
 - spec/attribute_spec.rb
@@ -309,6 +310,7 @@ files:
 - spec/types/struct_spec.rb
 - spec/types/tempfile_spec.rb
 - spec/types/time_spec.rb
+- spec/types/uri_spec.rb
 homepage: https://github.com/rightscale/attributor
 licenses:
 - MIT
@@ -329,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A powerful attribute and type management library for Ruby
@@ -360,4 +362,5 @@ test_files:
 - spec/types/struct_spec.rb
 - spec/types/tempfile_spec.rb
 - spec/types/time_spec.rb
+- spec/types/uri_spec.rb
 has_rdoc: