doodle 0.1.7 → 0.1.8

data/spec/init_spec.rb

@@ -17,22 +17,22 @@ describe Doodle, 'init' do
       end
     end
     it 'should have instance attribute init via class' do
-      Foo.doodle_attributes[:moniker].init.should == 'D1'
+      Foo.doodle.attributes[:moniker].init.should == 'D1'
     end
     it 'should have instance attribute init via instance' do
-      @foo.doodle_attributes[:moniker].init.should == 'D1'
+      @foo.doodle.attributes[:moniker].init.should == 'D1'
     end
     it 'should have class attribute init via class.singleton_class' do
-      Foo.singleton_class.doodle_attributes(false)[:metadata].init.should == 'D2'
+      Foo.singleton_class.doodle.attributes(false)[:metadata].init.should == 'D2'
     end
     it 'should have class attribute init via class.singleton_class' do
-      Foo.singleton_class.doodle_attributes[:metadata].init.should == 'D2'
+      Foo.singleton_class.doodle.attributes[:metadata].init.should == 'D2'
     end
     it 'should have singleton attribute init via instance.singleton_class' do
-      @foo.singleton_class.doodle_attributes(false)[:special].init.should == 'D3'
+      @foo.singleton_class.doodle.attributes(false)[:special].init.should == 'D3'
     end
     it 'should have singleton attribute init via instance.singleton_class' do
-      @foo.singleton_class.doodle_attributes[:special].init.should == 'D3'
+      @foo.singleton_class.doodle.attributes[:special].init.should == 'D3'
     end
     it 'should have an attribute :moniker from init' do
       @foo.moniker.should == 'D1'

data/spec/kind_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'Doodle', 'kind' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle
+        has :var1, :kind => [String, Symbol]
+      end
+    end
+    
+    it 'should allow multiple kinds' do
+      proc { Foo 'hi' }.should_not raise_error
+      proc { Foo :hi }.should_not raise_error
+      proc { Foo 1 }.should raise_error(Doodle::ValidationError)
+    end
+  end
+end

data/spec/singleton_spec.rb

@@ -8,9 +8,9 @@ describe Doodle, "singletons" do
           has :c1
         end
       end
-      Foo.doodle_attributes.should_be OrderedHash.new
-      Foo.singleton_class.doodle_attributes.should_not_be OrderedHash.new
-      Foo.singleton_class.doodle_attributes.map{ |name, attr| name }.should_be [:c1]
+      Foo.doodle.attributes.should_be OrderedHash.new
+      Foo.singleton_class.doodle.attributes.should_not_be OrderedHash.new
+      Foo.singleton_class.doodle.attributes.map{ |name, attr| name }.should_be [:c1]
       Foo.c1 = 1
       Foo.c1.should_be 1
     end
@@ -22,9 +22,9 @@ describe Doodle, "singletons" do
           has :c2
         end
       end
-      Foo.doodle_attributes.should_be OrderedHash.new
-      Foo.singleton_class.doodle_attributes.should_not_be OrderedHash.new
-      Foo.singleton_class.doodle_attributes.map{ |name, attr| name }.should_be [:c2]
+      Foo.doodle.attributes.should_be OrderedHash.new
+      Foo.singleton_class.doodle.attributes.should_not_be OrderedHash.new
+      Foo.singleton_class.doodle.attributes.map{ |name, attr| name }.should_be [:c2]
       Foo.c2 = 1
       Foo.c2.should_be 1
     end
@@ -36,9 +36,9 @@ describe Doodle, "singletons" do
       class << foo
         has :i1
       end
-      foo.doodle_attributes.keys.should_be [:i1]
-      foo.singleton_class.doodle_attributes.should_not_be OrderedHash.new
-      foo.singleton_class.doodle_attributes.map{ |name, attr| name }.should_be [:i1]
+      foo.doodle.attributes.keys.should_be [:i1]
+      foo.singleton_class.doodle.attributes.should_not_be OrderedHash.new
+      foo.singleton_class.doodle.attributes.map{ |name, attr| name }.should_be [:i1]
       foo.i1 = 1
       foo.i1.should_be 1
     end
@@ -53,9 +53,9 @@ describe Doodle, "singletons" do
           has :i2
         end
       end
-      foo.doodle_attributes.should_be OrderedHash.new
-      foo.singleton_class.singleton_class.doodle_attributes.should_not_be OrderedHash.new
-      foo.singleton_class.singleton_class.doodle_attributes.map{ |name, attr| name }.should_be [:i2]
+      foo.doodle.attributes.should_be OrderedHash.new
+      foo.singleton_class.singleton_class.doodle.attributes.should_not_be OrderedHash.new
+      foo.singleton_class.singleton_class.doodle.attributes.map{ |name, attr| name }.should_be [:i2]
       foo.singleton_class.i2 = 1
       foo.singleton_class.i2.should_be 1
     end

data/spec/specialized_attribute_class_spec.rb

@@ -55,9 +55,9 @@ describe 'Doodle', 'specialized attributes' do
         rv.class.should_be SpecializedAttribute
         rv.flag.should_be 'sflag'
       end
-      Foo.doodle_attributes[:ivar1].flag.should_be "sflag"
+      Foo.doodle.attributes[:ivar1].flag.should_be "sflag"
       foo = Foo.new('hi')
-      foo.doodle_attributes[:ivar1].flag.should_be "sflag"
+      foo.doodle.attributes[:ivar1].flag.should_be "sflag"
     end
 
     it 'should allow using datatypes in additional directives invoking specialized attribute of correct class' do
@@ -79,9 +79,9 @@ describe 'Doodle', 'specialized attributes' do
         rv.class.should_be SpecializedAttribute
         rv.flag.should_be 'x'
       end
-      Foo.doodle_attributes[:ivar1].flag.should_be "x"
+      Foo.doodle.attributes[:ivar1].flag.should_be "x"
       foo = Foo.new('hi')
-      foo.doodle_attributes[:ivar1].flag.should_be "x"
+      foo.doodle.attributes[:ivar1].flag.should_be "x"
     end
 
     it 'should allow using datatypes in additional directives invoking specialized attribute of correct class and raise error if incorrect value supplied' do

data/spec/superclass_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe 'Doodle', 'doodle_parents' do
+describe 'Doodle', 'doodle.parents' do
   temporary_constant :Foo do
     before :each do
       class Foo < Doodle
@@ -12,13 +12,13 @@ describe 'Doodle', 'doodle_parents' do
       @sclass_foo = class << @foo; class << self; self; end; end
     end
   
-    it 'should have no singleton doodle_parents ' do
-      @sc.doodle_parents.should == []
+    it 'should have no singleton doodle.parents ' do
+      @sc.doodle.parents.should == []
     end
 
-#     it "should have singleton class's singleton class doodle_parents == []" do
-#       expected_doodle_parents = RUBY_VERSION <= "1.8.6" ? [] : [Module, Object, BasicObject]
-#       @scc.doodle_parents.should == expected_doodle_parents
+#     it "should have singleton class's singleton class doodle.parents == []" do
+#       expected_doodle.parents = RUBY_VERSION <= "1.8.6" ? [] : [Module, Object, BasicObject]
+#       @scc.doodle.parents.should == expected_doodle.parents
 #     end
   end
 end

data/spec/validation2_spec.rb

@@ -202,17 +202,17 @@ end
         @dr.end_date.should == @dr.start_date
       end
 
-      it "should not raise an error when changing start_date and changing end_date using defer_validation" do
+      it "should not raise an error when changing start_date and changing end_date using doodle.defer_validation" do
         proc {
-          @dr.defer_validation do
+          @dr.doodle.defer_validation do
             self.start_date = self.start_date + 1
             self.end_date = self.start_date
           end
         }.should_not raise_error
       end
 
-      it "should allow changing start_date and changing end_date using defer_validation" do
-        @dr.defer_validation do
+      it "should allow changing start_date and changing end_date using doodle.defer_validation" do
+        @dr.doodle.defer_validation do
           start_date start_date + 1
           end_date start_date
         end

data/spec/validation_spec.rb

@@ -58,19 +58,19 @@ describe :DateRange, 'validation & conversions' do
 
     it 'should have start_date kind == Date' do
       d = DateRange.new
-      d.doodle_attributes[:start_date].kind == Date
+      d.doodle.attributes[:start_date].kind == Date
     end
 
     it 'should have two validations' do
       d = DateRange.new
-      d.doodle_attributes[:start_date].doodle_validations.size.should_be 2    
-      d.doodle_attributes[:start_date].doodle_validations(false).size.should_be 2
+      d.doodle.attributes[:start_date].doodle.validations.size.should_be 2    
+      d.doodle.attributes[:start_date].doodle.validations(false).size.should_be 2
     end
 
     it 'should have two conversions' do
       d = DateRange.new
-      d.doodle_attributes[:start_date].doodle_conversions.size.should_be 3    
-      d.doodle_attributes[:start_date].doodle_conversions(false).size.should_be 3
+      d.doodle.attributes[:start_date].doodle.conversions.size.should_be 3    
+      d.doodle.attributes[:start_date].doodle.conversions(false).size.should_be 3
     end
 
     it 'should convert from Array' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-12 00:00:00 +01:00
+date: 2008-05-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -130,6 +130,8 @@ test_files:
 - spec/flatten_first_level_spec.rb
 - spec/new_doodle_spec.rb
 - spec/attributes_spec.rb
+- spec/kind_spec.rb
+- spec/from_spec.rb
 - spec/arg_order_spec.rb
 - spec/serialization_spec.rb
 - spec/singleton_spec.rb