doodle 0.2.2 → 0.2.3

data/spec/must_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'Doodle', '#must' do
+  temporary_constant :Answer do
+    before :each do
+    end
+
+    it 'can be specified has params' do
+      class Answer < Doodle
+        has :value, :must => { "equal 42" => proc {|i| i == 42 }}
+      end
+      name = Answer.new(42)
+      name.value.should_be 42
+    end
+
+    it 'can combine with #must clause defined in block' do
+      class Answer < Doodle
+        has :value, :must => { "be greater than 41" => proc {|i| i > 41 }} do
+          must "be less than 43" do |i|
+            i < 43
+          end
+        end
+      end
+
+      name = Answer.new(42)
+      name.value.should_be 42
+
+      expect_error(/be greater than 41/) { Answer.new(41) }
+      expect_error(/be less than 43/) { Answer.new(43) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -30,20 +30,26 @@ def undefine_const(*consts)
 end
 
 def raise_if_defined(*args)
+  where = args.shift
   defined = args.select{ |x| Object.const_defined?(x)}
-  raise "Namespace pollution: #{defined.join(', ')}" if defined.size > 0
+  raise "Namespace pollution #{where}: #{defined.join(', ')}" if defined.size > 0
 end
 
 def temporary_constants(*args, &block)
+  constants = Object.constants.dup
   before :each do
-    raise_if_defined(*args)
+    raise_if_defined(:before, *args)
   end
   after :each do
     undefine_const(*args)
   end
-  raise_if_defined(*args)
+  crud = Object.constants - constants
+  if crud.size > 0
+    raise Exception, "Namespace crud: #{crud.map{ |x| x.to_s}.join(', ')}"
+  end
+  raise_if_defined(:begin, *args)
   yield
-  raise_if_defined(*args)
+  raise_if_defined(:end, *args)
 end
 alias :temporary_constant :temporary_constants
 
@@ -56,3 +62,7 @@ end
 def no_error(&block)
   proc(&block).should_not raise_error
 end
+
+def expect_error(*args, &block)
+  proc(&block).should raise_error(*args)
+end

data/spec/specialized_attribute_class_spec.rb

@@ -7,11 +7,11 @@ describe 'Doodle', 'specialized attributes' do
     before :each do
       class SpecializedAttribute < Doodle::DoodleAttribute
       end
-      
+
       class Foo < Doodle
       end
     end
-    
+
     it 'should allow :using keyword' do
       proc {
         Foo.class_eval do

data/spec/typed_collector_spec.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Doodle, 'typed collector' do
+  temporary_constants :Item, :List do
+    before :each do
+      #: definition
+      class ::Item < Doodle
+        has :name, :kind => String
+      end
+      class ::List < Doodle
+        has :items, :init => Doodle::TypedArray(Item), :collect => Item
+        #has :items, :collect => Item
+      end
+    end
+
+    it 'should accept convertible values in collector' do
+      list = nil
+      no_error {
+        list = List do
+          item "Hello"
+          item "World"
+        end
+      }
+      list.items.size.should_be 2
+      list.items[1].should_be Item("World")
+    end
+
+    it 'should accept correctly typed values in collector' do
+      list = nil
+      no_error {
+        list = List do
+          item Item("Hello")
+          item Item("World")
+        end
+      }
+      list.items.size.should_be 2
+      list.items[1].should_be Item("World")
+    end
+
+    it 'should prevent adding invalid values' do
+      list = List.new
+      expect_error(TypeError) {
+        list.items << "Hello"
+      }
+    end
+
+    it 'should accept valid values' do
+      list = List.new
+      no_error {
+        list.items << Item("Hello")
+      }
+      list.items.size.should_be 1
+      list.items[0].should_be Item("Hello")
+    end
+
+  end
+end

data/spec/xml_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'doodle/xml'
 
-describe Doodle, 'xml serialization within a module' do
+describe Doodle, 'XML serialization within a module' do
   temporary_constants :Container, :Base, :Slideshow, :Layout do
     before(:each) do
       @xml_source = '<Slideshow id="1" name="test"><Layout template="generic" /></Slideshow>'
@@ -43,7 +43,7 @@ describe Doodle, 'xml serialization within a module' do
   end
 end
 
-describe Doodle, 'xml serialization at top level' do
+describe Doodle, 'XML serialization at top level' do
   temporary_constants :Base, :Slideshow, :Layout do
     before(:each) do
       @xml_source = '<Slideshow id="1" name="test"><Layout template="generic" /></Slideshow>'
@@ -83,7 +83,7 @@ describe Doodle, 'xml serialization at top level' do
   end
 end
 
-describe Doodle, 'if default specified before required attributes, they are ignored if defined in block' do
+describe Doodle, 'XML' do
   temporary_constant :Address do
     before :each do
       class Address < Doodle
@@ -93,7 +93,7 @@ describe Doodle, 'if default specified before required attributes, they are igno
       end
     end
 
-    it 'should raise an error that required attributes have not been set' do
+    it 'should not raise an error when supplying attribute values' do
       proc {
         Address do
           city "London"
@@ -101,14 +101,14 @@ describe Doodle, 'if default specified before required attributes, they are igno
       }.should_not raise_error
     end
 
-    it 'should define required attributes' do
+    it 'should accept attributes defined in block' do
       a = Address do
         city "London"
       end
       a.city.should_be "London"
     end
 
-    it 'should output required attributes in XML' do
+    it 'should output non-doodle attributes as XML attributes' do
       a = Address do
         city "London"
       end
@@ -117,7 +117,7 @@ describe Doodle, 'if default specified before required attributes, they are igno
   end
 end
 
-describe Doodle, 'if default specified before required attributes, they are ignored if defined in block #2' do
+describe Doodle, 'XML' do
   temporary_constant :Base, :City, :Address do
     before :each do
       class Base < Doodle
@@ -160,7 +160,7 @@ describe Doodle, 'if default specified before required attributes, they are igno
 
 end
 
-describe Doodle, 'if default specified before required attributes, they are ignored if defined in block #2' do
+describe Doodle, 'XML' do
   temporary_constant :Base, :City, :Address, :Country do
     before :each do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 +00:00
+date: 2009-03-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,13 +62,38 @@ files:
 - examples/test-datatypes.rb
 - examples/yaml-example.rb
 - examples/yaml-example2.rb
-- lib/doodle.rb
 - lib/doodle/app.rb
+- lib/doodle/attribute.rb
+- lib/doodle/base.rb
+- lib/doodle/collector-1.9.rb
+- lib/doodle/collector.rb
+- lib/doodle/comparable.rb
+- lib/doodle/conversion.rb
+- lib/doodle/core.rb
+- lib/doodle/datatype-holder.rb
 - lib/doodle/datatypes.rb
+- lib/doodle/debug.rb
+- lib/doodle/deferred.rb
+- lib/doodle/equality.rb
+- lib/doodle/exceptions.rb
+- lib/doodle/factory.rb
+- lib/doodle/getter-setter.rb
+- lib/doodle/info.rb
+- lib/doodle/inherit.rb
+- lib/doodle/json.rb
+- lib/doodle/marshal.rb
+- lib/doodle/normalized_array.rb
+- lib/doodle/normalized_hash.rb
+- lib/doodle/ordered-hash.rb
 - lib/doodle/rfc822.rb
+- lib/doodle/singleton.rb
+- lib/doodle/smoke-and-mirrors.rb
+- lib/doodle/to_hash.rb
 - lib/doodle/utils.rb
+- lib/doodle/validation.rb
 - lib/doodle/version.rb
 - lib/doodle/xml.rb
+- lib/doodle.rb
 - lib/molic_orderedhash.rb
 - log/debug.log
 - script/console
@@ -147,6 +172,7 @@ specification_version: 2
 summary: "Doodle is a gem for simplifying the definition of Ruby classes by making attributes and their properties more declarative. Doodle is eco-friendly: it does not globally modify Object, Class or Module."
 test_files: 
 - spec/arg_order_spec.rb
+- spec/assigned_spec.rb
 - spec/attributes_spec.rb
 - spec/block_init_spec.rb
 - spec/bugs_spec.rb
@@ -166,9 +192,12 @@ test_files:
 - spec/has_spec.rb
 - spec/inheritance_spec.rb
 - spec/init_spec.rb
+- spec/json_spec.rb
 - spec/kind_spec.rb
 - spec/member_init_spec.rb
 - spec/modules_spec.rb
+- spec/multi_collector_spec.rb
+- spec/must_spec.rb
 - spec/new_doodle_spec.rb
 - spec/readonly_spec.rb
 - spec/required_spec.rb
@@ -178,6 +207,7 @@ test_files:
 - spec/superclass_spec.rb
 - spec/symbolize_keys_spec.rb
 - spec/to_hash_spec.rb
+- spec/typed_collector_spec.rb
 - spec/validation2_spec.rb
 - spec/validation_spec.rb
 - spec/xml_spec.rb