doodle 0.0.2 → 0.0.3

data/ChangeLog

@@ -0,0 +1,12 @@
+2008-03-12  seano  <sean.ohalpin@gmail.com>
+
+	* added init_spec
+
+	* tweaked Rakefile (don't run profile by default, fix dcov task)
+
+	* allow :collect => :name form for collecting raw
+	  objects (i.e. don't do a klass.new(*args) on values)
+
+	* use snake_case (from facets) when generating name from class for
+	  collect
+

data/lib/doodle.rb

@@ -29,6 +29,10 @@ module Doodle
     def self.flatten_first_level(enum)
       enum.inject([]) {|arr, i| if i.kind_of? Array then arr.push(*i) else arr.push(i) end }
     end
+    # from facets/string/case.rb, line 80
+    def self.snake_case(camel_cased_word)
+      camel_cased_word.gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
+    end
   end
 
   # internal error raised when a default was expected but not found
@@ -506,9 +510,13 @@ module Doodle
 
     # define a collector
     # - collection should provide a :<< method
-    def define_collector(collection, klass, name, &block)
+    def define_collector(collection, name, klass = nil, &block)
       # need to use string eval because passing block
-      module_eval "def #{name}(*args, &block); #{collection} << #{klass}.new(*args, &block); end"
+      if klass.nil?
+        module_eval "def #{name}(*args, &block); args.unshift(block) if block_given?; #{collection}.<<(*args); end"
+      else
+        module_eval "def #{name}(*args, &block); #{collection} << #{klass}.new(*args, &block); end"
+      end
     end
     private :define_collector
 
@@ -549,19 +557,20 @@ module Doodle
         if collector.kind_of?(Hash)
           collector_name, klass = collector.to_a[0]
         else
+          # if Capitalized word given, treat as classname
+          # and create collector for specific class
           klass = collector.to_s
-          collector_name = klass.downcase
+          collector_name = Utils.snake_case(klass)
+          if klass !~ /^[A-Z]/
+            klass = nil
+          end
         end
-        define_collector name, klass, collector_name
+        define_collector name, collector_name, klass
       end
       
       # d { [:has_args, :params, params] }
-      # fixme[this is a little fragile - depends on order of local_attributes in Attribute - should convert to hash args]
-      #      self_class.local_attributes[name] = attribute = Attribute.new(params, &block)        
       local_attributes[name] = attribute = Attribute.new(params, &block)        
       define_getter_setter name, *args, &block
-      
-      #super(*args, &block) if defined?(super)
       attribute
     end
 

data/spec/attributes_spec.rb

@@ -22,63 +22,62 @@ describe Doodle::Attribute, 'basics' do
       end
     end
     
-    @goo = Foo.new
-    @baz = Bar.new :info => 'Hi'
+    @foo = Foo.new
+    @bar = Bar.new :info => 'Hi'
   end
 
-  it 'should have default name' do
-    #pending 'making it work'
-    #p [:name, :default, @goo.attributes[:name].default]
-    @goo.attributes[:name].default.should == 'Hello'
+  it 'should have attribute :name with default defined' do
+    @foo.attributes[:name].default.should == 'Hello'
   end
 
   it 'should have default name' do
-    #pending 'making it work'
-    @goo.name.should == 'Hello'
+    @foo.name.should == 'Hello'
+  end
+
+  it 'should not have an instance variable for a default' do
+    @foo.instance_variables.include?('@name').should == false
   end
 
   it 'should have name required == false (because has default)' do
-    #pending 'to do required/optional'
-    @goo.attributes[:name].required?.should == false
+    @foo.attributes[:name].required?.should == false
   end
 
   it 'should have info required == true' do
-    #pending 'to do required/optional'
-    @baz.attributes[:info].required?.should == true
+    @bar.attributes[:info].required?.should == true
   end
 
   it 'should have name.optional? == true (because has default)' do
-    #pending 'to do required/optional'
-    @goo.attributes[:name].optional?.should == true
+    @foo.attributes[:name].optional?.should == true
+  end
+
+  it 'should inherit attribute from parent' do
+    @bar.attributes[:name].should == @foo.attributes[:name]
   end
 
   it 'should have info.optional? == false' do
-    #pending 'to do required/optional'
-    @baz.attributes[:info].optional?.should == false
+    @bar.attributes[:info].optional?.should == false
   end
 
-  it "should have parents in order" do
+  it "should have parents in correct order" do
     Bar.parents.should == [Foo, Object]
   end
     
-  it "should have Bar's meta parents in reverse order of definition" do
-    @baz.meta.parents.should == [Bar.singleton_class.singleton_class, Bar.singleton_class, Foo.singleton_class]
+  it "should have Bar's singleton parents in reverse order of definition" do
+    @bar.singleton_class.parents.should == [Bar.singleton_class.singleton_class, Bar.singleton_class, Foo.singleton_class]
   end
 
-  it 'should have inherited meta local_attributes in order of definition' do
-    @baz.meta.class_eval { collect_inherited(:local_attributes).map { |x| x[0]} }.should == [:metadata, :doc]
+  it 'should have inherited singleton local_attributes in order of definition' do
+    @bar.singleton_class.class_eval { collect_inherited(:local_attributes).map { |x| x[0]} }.should == [:metadata, :doc]
   end
 
-  it 'should have inherited meta attributes in order of definition' do
-    @baz.meta.attributes.keys.should == [:metadata, :doc]
+  it 'should have inherited singleton attributes in order of definition' do
+    @bar.singleton_class.attributes.keys.should == [:metadata, :doc]
   end
 end
 
 describe Doodle::Attribute, 'attribute order' do
   before :each do
-    undefine_const(:A)
-    undefine_const(:B)
-    undefine_const(:C)
+    raise_if_defined :A, :B, :C
 
     class A < Doodle::Base
       has :a
@@ -91,9 +90,14 @@ describe Doodle::Attribute, 'attribute order' do
     class C < B
       has :c
     end
-
   end
 
+  after :each do
+    undefine_const(:A)
+    undefine_const(:B)
+    undefine_const(:C)
+  end
+  
   it 'should keep order of inherited attributes' do
     C.parents.should == [B, A, Doodle::Base, Object]
   end

data/spec/init_spec.rb

@@ -0,0 +1,57 @@
+$:.unshift(File.join(File.dirname(__FILE__), '../.'))
+require 'lib/spec_helper'
+
+describe Doodle, 'init' do
+  
+  before(:each) do
+    raise_if_defined :Foo
+    class Foo
+      include Doodle::Helper
+      has :name, :init => 'D1'
+      class << self
+        has :metadata, :init => 'D2'
+      end
+    end
+    @foo = Foo.new
+    class << @foo
+      has :special, :init => 'D3'
+    end
+  end
+  after :each do
+    undefine_const :Foo
+  end    
+  
+  it 'should have instance attribute init via class' do
+    Foo.attributes[:name].init.should == 'D1'
+  end
+  it 'should have instance attribute init via instance' do
+    @foo.attributes[:name].init.should == 'D1'
+  end
+  it 'should have class attribute init via class.singleton_class' do
+    Foo.singleton_class.attributes(false)[:metadata].init.should == 'D2'
+  end
+  it 'should have class attribute init via class.singleton_class' do
+    Foo.singleton_class.attributes[:metadata].init.should == 'D2'
+  end
+  it 'should have singleton attribute init via instance.singleton_class' do
+    @foo.singleton_class.attributes(false)[:special].init.should == 'D3'
+  end
+  it 'should have singleton attribute init via instance.singleton_class' do
+    @foo.singleton_class.attributes[:special].init.should == 'D3'
+  end
+  it 'should have an attribute :name from init' do
+    @foo.name.should == 'D1'
+  end
+  it 'should have an instance_variable for attribute :name' do
+    @foo.instance_variables.include?('@name').should == true
+  end
+  it 'should have an initialized class attribute :metadata' do
+    pending 'deciding how this should work'
+    Foo.metadata.should == 'D2'
+  end
+  it 'should have an initialized singleton attribute :special' do
+    pending 'deciding how this should work'
+    @foo.special.should == 'D3'
+  end
+end
+raise_if_defined :Foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-08 00:00:00 +00:00
+date: 2008-03-12 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 - COPYING
+- ChangeLog
 files: 
 - lib/doodle.rb
 - lib/molic_orderedhash.rb
@@ -37,6 +38,7 @@ files:
 - examples/foo.rb
 - README
 - COPYING
+- ChangeLog
 has_rdoc: true
 homepage: http://doodle.rubyforge.org/
 post_install_message: 
@@ -62,7 +64,7 @@ rubyforge_project: doodle
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Declarative attribute definitions and validations
+summary: Declarative attribute definitions, validations and conversions
 test_files: 
 - spec/arg_order_spec.rb
 - spec/attributes_spec.rb
@@ -71,6 +73,7 @@ test_files:
 - spec/defaults_spec.rb
 - spec/doodle_spec.rb
 - spec/flatten_first_level_spec.rb
+- spec/init_spec.rb
 - spec/required_spec.rb
 - spec/superclass_spec.rb
 - spec/validation_spec.rb