doodle 0.1.9 → 0.2.0

data/spec/collector_spec.rb

@@ -14,11 +14,11 @@ describe Doodle, "Default collector" do
     after :each do
       remove_ivars :foo
     end
-    
+
     it "should define a collector method :item" do
       @foo.methods.map{ |x| x.to_sym }.include?(:item).should_be true
     end
-    
+
     it "should collect items into attribute :list" do
       @foo.list.should_be ["Hello", "World"]
     end
@@ -40,11 +40,11 @@ describe Doodle, "Simple collector" do
     after :each do
       remove_ivars :foo
     end
-    
+
     it "should define a collector method :item" do
       @foo.methods.map{ |x| x.to_sym }.include?(:item).should_be true
     end
-    
+
     it "should collect items into attribute :list" do
       @foo.list.should_be ["Hello", "World"]
     end
@@ -55,11 +55,11 @@ end
 describe Doodle, "Typed collector with default collector name" do
   temporary_constant :Event, :Location do
     before :each do
-      class Location < Doodle
+      class ::Location < Doodle
         has :name, :kind => String
       end
-      class Event < Doodle
-        has :locations, :init => [], :collect => Location
+      class ::Event < Doodle
+        has :locations, :init => [], :collect => ::Location
       end
       @event = Event do
         location "Stage 1"
@@ -73,11 +73,11 @@ describe Doodle, "Typed collector with default collector name" do
     after :each do
       remove_ivars :event
     end
-    
+
     it "should define a collector method :location" do
       @event.methods.map{ |x| x.to_sym }.include?(:location).should_be true
     end
-    
+
     it "should collect items into attribute :list" do
       @event.locations.map{|loc| loc.name}.should_be ["Stage 1", "Stage 2"]
     end
@@ -88,10 +88,10 @@ end
 describe Doodle, "Typed collector with specified collector name" do
   temporary_constant :Location, :Event do
     before :each do
-      class Location < Doodle
+      class ::Location < Doodle
         has :name, :kind => String
       end
-      class Event < Doodle
+      class ::Event < Doodle
         has :locations, :init => [], :collect => { :place => :Location }
       end
     end
@@ -104,11 +104,11 @@ end
 describe Doodle, "typed collector with specified collector name" do
   temporary_constant :Location, :Event do
     before :each do
-      class Location < Doodle
+      class ::Location < Doodle
         has :name, :kind => String
       end
       class Event < Doodle
-        has :locations, :init => [], :collect => { :place => Location }
+        has :locations, :init => [], :collect => { :place => ::Location }
       end
     end
     it "should collect items into attribute :list" do
@@ -120,7 +120,7 @@ describe Doodle, "typed collector with specified collector name" do
         end
       }.should_not raise_error
       event.locations.map{|loc| loc.name}.should_be ["Stage 1", "Stage 2"]
-      event.locations.map{|loc| loc.class}.should_be [Location, Location]
+      event.locations.map{|loc| loc.class}.should_be [::Location, ::Location]
     end
   end
 end
@@ -129,11 +129,11 @@ describe Doodle, "typed collector with specified collector name initialized from
   # note: this spec also checks for resolving collector class
   temporary_constant :Location, :Event do
     before :each do
-      class Location < Doodle
+      class ::Location < Doodle
         has :name, :kind => String
         has :events, :collect => :Event
       end
-      class Event < Doodle
+      class ::Event < Doodle
         has :name, :kind => String
         has :locations, :collect => :Location
       end
@@ -154,7 +154,7 @@ describe Doodle, "typed collector with specified collector name initialized from
         event = Event(data)
       }.should_not raise_error
       event.locations.map{|loc| loc.name}.should_be ["Stage 1", "Stage 2"]
-      event.locations.map{|loc| loc.class}.should_be [Location, Location]
+      event.locations.map{|loc| loc.class}.should_be [::Location, ::Location]
       event.locations[0].events[0].kind_of?(Event).should_be true
     end
   end
@@ -174,11 +174,11 @@ describe Doodle, "Simple keyed collector" do
     after :each do
       remove_ivars :foo
     end
-    
+
     it "should define a collector method :item" do
       @foo.methods.map{ |x| x.to_sym }.include?(:item).should_be true
     end
-    
+
     it "should collect items into attribute :list" do
       @foo.list.should_be( { 5 => "World" } )
     end
@@ -189,20 +189,20 @@ end
 describe Doodle, "Simple keyed collector #2" do
   temporary_constant :Foo, :Item do
     before :each do
-      class Item < Doodle
+      class ::Item < Doodle
         has :name
       end
-      class Foo < Doodle
+      class ::Foo < Doodle
         has :list, :collect => Item, :key => :name
       end
     end
-    
+
     it "should define a collector method :item" do
       foo = Foo.new
       foo.methods.map{ |x| x.to_sym }.include?(:item).should_be true
       foo.respond_to?(:item).should_be true
     end
-    
+
     it "should collect items into attribute :list #1" do
       foo = Foo do
         item "Hello"
@@ -220,7 +220,7 @@ describe Doodle, "Simple keyed collector #2" do
                 )
       foo.list.to_a.map{ |k, v| [k, v.class, v.name] }.should_be( [["Hello", Item, "Hello"], ["World", Item, "World"]] )
     end
-    
+
     it "should collect positional argument enumerable into attribute :list" do
       foo = Foo([
                 { :name => "Hello" },
@@ -238,6 +238,73 @@ describe Doodle, "Simple keyed collector #2" do
                 )
       foo.list.to_a.map{ |k, v| [k, v.class, v.name] }.should_be( [["Hello", Item, "Hello"], ["World", Item, "World"]] )
     end
-    
+
+  end
+end
+
+describe Doodle, 'using String as collector' do
+  temporary_constant :Text do
+    before :each do
+      #: definition
+      class Text < Doodle
+        has :body, :init => "", :collect => :line
+        def to_s
+          body
+        end
+      end
+    end
+
+    it 'should not raise an exception' do
+      proc {
+        text = Text do
+          line "line 1"
+          line "line 2"
+        end
+      }.should_not raise_error
+    end
+
+    it 'should concatenate strings' do
+      text = Text do
+        line "line 1"
+        line "line 2"
+      end
+      text.to_s.should_be "line 1line 2"
+    end
+  end
+end
+
+describe Doodle, 'collecting text values into non-String collector' do
+  # this is a regression test - when collecting String values into a
+  # non-String accumulator should instantiate from
+  # collector_class.new(value)
+  temporary_constants :Name, :TextValue, :Signature do
+    before :each do
+      class ::Name < Doodle
+        has :value
+      end
+      class ::Signature < Doodle
+        has Name
+      end
+      class ::SignedBy  < Doodle
+        has :signatures, :collect => Signature
+      end
+    end
+
+    it 'should not raise an exception' do
+      proc {
+        signed_by = SignedBy do
+          signature "Sean"
+        end
+      }.should_not raise_error
+    end
+
+    it 'should convert String values to instances of collector class' do
+      signed_by = SignedBy do
+        signature "Sean"
+      end
+      signed_by.signatures.first.class.should_be Signature
+      signed_by.signatures.first.name.class.should_be Name
+      signed_by.signatures.first.name.value.should_be "Sean"
+    end
   end
 end

data/spec/defaults_spec.rb

@@ -96,6 +96,19 @@ describe Doodle, 'defaults which have been set' do
     it 'should have default value set from block' do
       @foo.start.should_be Date.today
     end
+
+    it 'should denote that default value is a default' do
+      @foo.default?(:start).should_be true
+      @foo.default?(:baz).should_be true
+    end
+
+    it 'should denote that default value is not a default if it has been assigned' do
+      @foo.baz = "Hi"
+      @foo.default?(:baz).should_not_be true
+      @foo.start = Date.today
+      @foo.default?(:start).should_not_be true
+    end
+
   end
 end
 

data/spec/doodle_context_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe Doodle, "doodle_context" do
   temporary_constants :Foo, :Bar do
     before :each do
-      class Child < Doodle
+      class ::Child < Doodle
         has :name
         has :dad do
           # there is an important difference between a block argument

data/spec/doodle_spec.rb

@@ -290,26 +290,16 @@ describe Doodle, 'inherited singleton class attributes' do
       @foo.singleton_class.doodle.attributes[:metadata].should_be nil
       @foo.singleton_class.metadata = 'foo meta'
       @foo.singleton_class.instance_eval { @metadata }.should_be 'foo meta'
-      if RUBY_VERSION < '1.9.0'
-        @foo.singleton_class.metadata.should_be 'foo meta'
-      else
-        pending 'figuring out why this fails in 1.9' do
-          @foo.singleton_class.metadata.should_be 'foo meta'
-        end
-      end
+      @foo.singleton_class.metadata.should_be 'foo meta'
     end
 
     it 'should behave predictably when setting singleton attributes' do
       @bar.extra = 'bar extra'
       @bar.extra.should_be 'bar extra'
       @bar.singleton_class.metadata = 'bar meta metadata'
-      if RUBY_VERSION < '1.9.0'
-        @bar.singleton_class.metadata.should_be 'bar meta metadata'
-        @bar.singleton_class.notes = 'bar notes'
-        @bar.singleton_class.notes.should_be 'bar notes'
-      else
-        pending 'figuring out why this fails in 1.9'
-      end
+      @bar.singleton_class.metadata.should_be 'bar meta metadata'
+      @bar.singleton_class.notes = 'bar notes'
+      @bar.singleton_class.notes.should_be 'bar notes'
       proc { @foo.singleton_class.notes = 1 }.should raise_error(NoMethodError)
     end
   end

data/spec/equality_spec.rb

@@ -0,0 +1,118 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Doodle, 'simple equality' do
+  temporary_constants :Foo, :Bar, :Baz do
+    before(:each) do
+      class Bar < Doodle
+        has :name
+      end
+      class Foo < Doodle
+        has :id
+        has Bar
+      end
+      class Baz < Doodle
+        has :id
+        has Bar
+      end
+      @foo1 = Foo.new do
+        id 1
+        bar "Hello"
+      end
+      @foo2 = Foo.new do
+        id 1
+        bar "Hello"
+      end
+      @baz = Baz.new do
+        id 1
+        bar "Hello"
+      end
+    end
+
+    it 'should be equal to another Doodle with the same class and values' do
+      @foo1.should_be @foo2
+    end
+
+    it 'should not equal another Doodle with the same values but different class' do
+      @foo1.should_not_be @baz
+    end
+  end
+end
+
+describe Doodle, 'nested equality via inheritance' do
+  temporary_constants :Location, :Event do
+    before :each do 
+      class ::Location < Doodle
+        has :name, :kind => String
+        has :events, :collect => :Event, :key => :name
+      end
+
+      class ::Event < Doodle
+        has :name, :kind => String
+        has :date, :kind => Date do
+          default { Date.today }
+          from String do |s|
+            Date.parse(s)
+          end
+        end
+        has :locations, :collect => {:place => :Location}, :key => :name
+      end  
+
+      @event = Event "Festival" do
+        date '2018-04-01'
+        place "The muddy field"
+        place "Beer tent" do
+          event "Drinking"
+          event "Dancing"
+        end
+      end
+    end
+
+    it 'should equate object A and object B where object B has been deserialized from yaml generated by serializing object A' do
+      yaml = @event.to_yaml
+      event2 = YAML::load(yaml).validate!
+      @event.to_hash.should_be event2.to_hash
+      @event.should_be event2
+    end
+  end
+end
+
+describe Doodle, 'nested equality via including Doodle::Core' do
+  temporary_constants :Location, :Event do
+    before :each do 
+      class ::Location < Doodle
+        has :name, :kind => String
+        has :events, :collect => :Event, :key => :name
+      end
+
+      class ::Event
+        # or if you want to inherit from another class
+        include Doodle::Core
+
+        has :name, :kind => String
+        has :date, :kind => Date do
+          default { Date.today }
+          from String do |s|
+            Date.parse(s)
+          end
+        end
+        has :locations, :collect => {:place => :Location}, :key => :name
+      end  
+
+      @event = Event "Festival" do
+        date '2018-04-01'
+        place "The muddy field"
+        place "Beer tent" do
+          event "Drinking"
+          event "Dancing"
+        end
+      end
+    end
+
+    it 'should equate object A and object B where object B has been deserialized from yaml generated by serializing object A' do
+      yaml = @event.to_yaml
+      event2 = YAML::load(yaml).validate!
+      @event.to_hash.should_be event2.to_hash
+      @event.should_be event2
+    end
+  end
+end

data/spec/modules_spec.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Doodle, "Definitions within rspec" do
+  temporary_constant :Foo1 do
+    before :each do
+      class Foo1 < Doodle
+        has :name
+      end
+    end
+    it 'should define a constructor function' do
+      no_error { foo = Foo1("Bar") }
+    end
+  end
+end
+
+describe Doodle, "Definitions at top level" do
+  temporary_constant :Foo2 do
+    before :each do
+      class ::Object
+        class Foo2 < Doodle
+          has :name
+        end
+      end
+    end
+    it 'should define a constructor function' do
+      no_error { foo = Foo2("Bar") }
+    end
+  end
+end
+
+describe Doodle, "Definitions in modules" do
+  temporary_constant :Foo3, :Bar3 do
+    before :each do
+      module ::Bar3
+        class Foo3 < Doodle
+          has :name
+        end
+      end
+    end
+    it 'should define a constructor function' do
+      no_error { foo = ::Bar3.Foo3("Bar") }
+    end
+  end
+end
+
+describe Doodle, "Definitions in module_eval" do
+  temporary_constant :Foo4, :Bar4 do
+    before :each do
+      module Bar4
+      end
+      Bar4.module_eval do
+        class Foo4 < Doodle
+          has :name
+        end
+      end
+    end
+    it 'should define a constructor function' do
+      pending "Figuring out how to make this work portably"
+      no_error { foo = Bar4.send(:Foo4, "Bar") }
+    end
+    it 'should define a public constructor function' do
+      pending "Figuring out how to make this work at all"
+      no_error { foo = Bar4.Foo4("Bar") }
+    end
+  end
+end
+