doodle 0.2.2 → 0.2.3

data/spec/doodle_context_spec.rb

@@ -11,15 +11,15 @@ describe Doodle, "doodle_context" do
           # - a proc/lamba is treated as a literal argument, i.e. the
           # - value is set to a Proc
           # - a block argument, on the other hand, is instance
-          # - evaluated during initialization
+          #   evaluated during initialization
           # - consequences
           #   - can only be done in init block
           #   - somewhat subtle difference (from programmer's point of
-          #   - view) between a proc and a block
+          #     view) between a proc and a block
           # Also note re: Doodle.parent - its value is only valid
           # during initialization - this is a way to capture that
-          # value for ues later
-          
+          # value for use later
+
           init { doodle.parent }
         end
       end
@@ -29,7 +29,7 @@ describe Doodle, "doodle_context" do
       end
 
     end
-    
+
     it 'should provide a means to find out the current parent of an item in initialization block' do
       dad = Parent 'Conn' do
         child 'Sean'

data/spec/from_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe 'Doodle', 'applying Doodle type conversions' do
+describe 'Doodle', 'from' do
   temporary_constant :Foo, :Name do
     before :each do
       class Name < String
@@ -25,7 +25,7 @@ describe 'Doodle', 'applying Doodle type conversions' do
     it 'should convert a value based on conversions in doodle class' do
       proc { foo = Foo 'Arthur' }.should_not raise_error
     end
-    
+
     it 'should convert a value based on conversions in doodle class to the correct class' do
       foo = Foo 'Arthur'
       foo.name.class.should_be Name
@@ -38,6 +38,46 @@ describe 'Doodle', 'applying Doodle type conversions' do
     it 'should apply validations from doodle type' do
       proc { Foo 'Art' }.should raise_error(Doodle::ConversionError)
     end
-    
+
+  end
+end
+
+describe 'Doodle', 'from' do
+  temporary_constant :Answer do
+    before :each do
+    end
+
+    it 'should allow specifying from in has params' do
+      class Answer < Doodle
+        has :value, :from => { Integer => proc {|i| i.to_s }}
+      end
+      name = Answer.new(42)
+      name.value.should_be "42"
+    end
+
+    it 'should allow specifying from in has params with kind specified' do
+      class Answer < Doodle
+        has :value, :kind => String, :from => { Integer => proc {|i| i.to_s }}
+      end
+      name = Answer.new(42)
+      name.value.should_be "42"
+    end
+
+    it 'should override from clause in has params with one defined in block' do
+      class Answer < Doodle
+        has :value, :kind => String, :from => { Integer => proc {|i| i.to_s }} do
+          # this should override :from clause in has params
+          from Float do |i|
+            (Integer(i + 20)).to_s
+          end
+        end
+      end
+
+      name = Answer.new(22.0)
+      name.value.should_be "42"
+
+      name = Answer.new(42)
+      name.value.should_be "42"
+    end
   end
 end

data/spec/json_spec.rb

@@ -0,0 +1,232 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'doodle/json'
+
+def compare_json(data, json)
+  JSON.parse(data.to_json, :create_additions => false).should_be JSON.parse(json, :create_additions => false)
+end
+
+describe Doodle, 'JSON serialization within a module' do
+  temporary_constants :Container, :Base, :Slideshow, :Layout do
+    before(:each) do
+      @json_source = <<EOT
+{
+  "json_class":"Container::Slideshow",
+  "data":{
+    "name":"test",
+    "layout":{
+     "json_class":"Container::Layout",
+     "data":{
+       "template":"generic"
+     }
+    },
+    "id":1
+  }
+}
+EOT
+      @json_data = JSON.parse(@json_source, :create_additions => false)
+
+      module ::Container
+        class Base < Doodle
+          include Doodle::JSON
+        end
+        class Layout < Base
+          has :template
+        end
+        class Slideshow < Base
+          has :id, :kind => Integer do
+            from String do |s|
+              s.to_i
+            end
+          end
+          has :name, :kind => String
+          has Layout
+        end
+      end
+    end
+    it 'should serialize to json' do
+      slideshow = Container::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      compare_json(slideshow, @json_source)
+    end
+    it 'should serialize from json' do
+      slideshow = Container::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      ss2 = Doodle.from_json(@json_source)
+      ss2.should_be slideshow
+    end
+  end
+end
+
+describe Doodle, 'JSON serialization at top level' do
+  temporary_constants :Base, :Slideshow, :Layout do
+    before(:each) do
+      @json_source = <<EOT
+{
+  "json_class":"Slideshow",
+  "data":{
+    "name":"test",
+    "layout":{
+     "json_class":"Layout",
+     "data":{
+       "template":"generic"
+     }
+    },
+    "id":1
+  }
+}
+EOT
+      class ::Base < Doodle
+        include Doodle::JSON
+      end
+      class ::Layout < Base
+        has :template
+      end
+      class ::Slideshow < Base
+        has :id, :kind => Integer do
+          from String do |s|
+            s.to_i
+          end
+        end
+        has :name, :kind => String
+        has Layout
+      end
+    end
+    it 'should serialize to json' do
+      slideshow = ::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      compare_json(slideshow,  @json_source)
+    end
+    it 'should serialize from json' do
+      slideshow = ::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      ss2 = Doodle.from_json(@json_source)
+      ss2.should_be slideshow
+    end
+  end
+end
+
+describe Doodle, 'JSON' do
+  temporary_constant :Address do
+    before :each do
+      class ::Address < Doodle
+        include Doodle::JSON
+        has :where, :default => "home"
+        has :city
+      end
+    end
+
+    it 'should not raise an error when supplying attribute values' do
+      proc {
+        Address do
+          city "London"
+        end
+      }.should_not raise_error
+    end
+
+    it 'should accept attributes defined in block' do
+      a = Address do
+        city "London"
+      end
+      a.city.should_be "London"
+    end
+
+    it 'should output non-doodle attributes as JSON attributes' do
+      a = Address do
+        city "London"
+      end
+      compare_json(a, <<EOT)
+{
+  "json_class":"Address",
+  "data":{
+    "city":"London"
+  }
+}
+EOT
+    end
+  end
+end
+
+describe Doodle, 'JSON' do
+  temporary_constant :Base, :City, :Address do
+    before :each do
+      class ::Base < Doodle
+        include Doodle::JSON
+      end
+      class ::City < Base
+        has :_text_
+        has :country, :default => "UK"
+      end
+      class ::Address < Base
+        has :where, :default => "home"
+        has City
+      end
+    end
+
+    it 'should output required tags in JSON' do
+      a = Address do
+        city "London"
+      end
+      compare_json(a, <<EOT)
+{
+  "json_class":"Address",
+  "data":{
+    "city":{
+    "json_class":"City",
+    "data":{"_text_":"London"}
+    }
+  }
+}
+EOT
+    end
+
+    it 'should output specified optional attributes as json attributes if kind not a doodle class' do
+      a = Address :where => 'home' do
+        city "London"
+      end
+      compare_json(a, <<EOT)
+{
+  "json_class":"Address",
+  "data":{
+    "city":{
+    "json_class":"City",
+    "data":{"_text_":"London"}
+    },
+    "where":"home"
+  }
+}
+EOT
+    end
+
+    it 'should output specified optional attributes' do
+      a = Address :where => 'home' do
+        city "London", :country => "England" do
+          country "UK"
+        end
+      end
+      compare_json(a, <<EOT)
+{
+  "json_class":"Address",
+  "data":{
+    "city":{"json_class":"City", "data":{"_text_":"London", "country":"UK"}},
+    "where":"home"
+  }
+}
+EOT
+    end
+
+  end
+
+end
+

data/spec/member_init_spec.rb

@@ -13,16 +13,16 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
         has :v2, :kind => String, :default => "bar"
       end
     end
-    
+
     it 'should initialize an attribute from a hash' do
       foo = Foo do
-        bar :name => "hello", :count => 1 
+        bar :name => "hello", :count => 1
       end
       foo.bar.name.should_be "hello"
       foo.bar.count.should_be 1
     end
     it 'should fail trying to initialize with incorrect keyword values' do
-      proc { 
+      proc {
         foo = Foo do
           bar :name => 1, :count => "hello"
         end
@@ -30,7 +30,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should work with positional args' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar "hello", 1
         end
@@ -40,7 +40,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should work with block initialization' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar do
             name "hello"
@@ -53,7 +53,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should work with arg and block initialization' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar "hello" do
             count 1
@@ -65,7 +65,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should work with keyword and block initialization' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar :name => "hello" do
             count 1
@@ -77,7 +77,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should raise error with invalid keyword and block initialization' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar :name => 1 do
             count "hello"
@@ -87,7 +87,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should raise error with keyword and invalid block initialization' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar :name => "hello" do
             count "hello"
@@ -97,7 +97,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
     end
     it 'should initialize non-Doodle or Proc with simple value' do
       foo = nil
-      proc { 
+      proc {
         foo = Foo do
           bar :name => "hello", :count => 1
           v2 "Hello"
@@ -108,7 +108,7 @@ describe 'Doodle', 'initialization of scalar attributes from hash' do
       foo.v2.should_be "Hello"
     end
     it 'should fail trying to initialize an inappropriate attribute (not a Doodle or Proc) from a block' do
-      proc { 
+      proc {
         foo = Foo do
           bar :name => "hello", :count => 1
           v2 do

data/spec/modules_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Doodle, "Definitions within rspec" do
+describe Doodle, "definitions within rspec" do
   temporary_constant :Foo1 do
     before :each do
       class Foo1 < Doodle
@@ -13,7 +13,7 @@ describe Doodle, "Definitions within rspec" do
   end
 end
 
-describe Doodle, "Definitions at top level" do
+describe Doodle, "definitions at top level" do
   temporary_constant :Foo2 do
     before :each do
       class ::Object
@@ -28,7 +28,7 @@ describe Doodle, "Definitions at top level" do
   end
 end
 
-describe Doodle, "Definitions in modules" do
+describe Doodle, "definitions in modules" do
   temporary_constant :Foo3, :Bar3 do
     before :each do
       module ::Bar3
@@ -43,7 +43,7 @@ describe Doodle, "Definitions in modules" do
   end
 end
 
-describe Doodle, "Definitions in module_eval" do
+describe Doodle, "definitions in module_eval" do
   temporary_constant :Foo4, :Bar4 do
     before :each do
       module Bar4

data/spec/multi_collector_spec.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Doodle, 'multiple collector' do
+  temporary_constants :Text, :Item, :List do
+    before :each do
+      #: definition
+      class ::Item < Doodle
+        has :name, :kind => String
+      end
+      class ::Text < Doodle
+        has :body, :kind => String
+      end
+      class ::List < Doodle
+        has :items, :collect => [Item, Text]
+      end
+    end
+
+    it 'should accept convertible values in collector' do
+      list = nil
+      no_error {
+        list = List do
+          item "Hello"
+          text "World"
+        end
+      }
+      list.items.size.should_be 2
+      list.items[0].should_be Item("Hello")
+      list.items[1].should_be Text("World")
+    end
+  end
+end
+
+describe Doodle, 'multiple collector' do
+  temporary_constants :Text, :Item, :List do
+    before :each do
+      #: definition
+      class ::Item < Doodle
+        has :name, :kind => String
+      end
+      class ::Text < Doodle
+        has :body, :kind => String
+      end
+      class ::List < Doodle
+        has :items, :collect => [ { :foo => Item }, { :bar => Text } ]
+      end
+    end
+
+    it 'should accept convertible values in collector using specified collector methods' do
+      list = nil
+      no_error {
+        list = List do
+          foo "Hello"
+          bar "World"
+        end
+      }
+      list.items.size.should_be 2
+      list.items[0].should_be Item("Hello")
+      list.items[1].should_be Text("World")
+    end
+  end
+end
+
+describe Doodle, 'multiple collector' do
+  temporary_constants :Text, :Item, :List do
+    before :each do
+      #: definition
+      class ::Item < Doodle
+        has :name, :kind => String
+      end
+      class ::Text < Doodle
+        has :body, :kind => String
+      end
+      class ::List < Doodle
+        has :items, :collect => { :foo => Item, :bar => Text }
+      end
+    end
+
+    it 'should accept convertible values in collector using specified collector methods' do
+      list = nil
+      no_error {
+        list = List do
+          foo "Hello"
+          bar "World"
+        end
+      }
+      list.items.size.should_be 2
+      list.items[0].should_be Item("Hello")
+      list.items[1].should_be Text("World")
+    end
+  end
+end