doodle 0.0.9 → 0.0.10

data/ChangeLog

@@ -1,5 +1,8 @@
 = ChangeLog for doodle
 
+== 0.0.10 / 2008-04-13
+- fixed bug in class attribute initialization
+	
 == 0.0.9 / 2008-04-12
 
 - new features:
@@ -8,8 +11,6 @@
   - use SaveBlock to distinguish between Proc and block args to :init
   - :collect now creates array by default if no :init specified (thanks to
     James Adam :)
-  - attributes defined with collect now have :init => [] if no :init
-    specified
   - :collect can now initialize from Enumerables by default
   - raise UnknownAttributeError if initialize called with unspecified attribute key
 - new examples:

data/lib/doodle.rb

@@ -30,7 +30,7 @@ if RUBY_VERSION < '1.8.6'
 end
 
 module Doodle
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
   # where are we?
   class << self
     def context
@@ -99,6 +99,15 @@ module Doodle
       sc
     end
 
+    def is_class_self_defn?
+      defined?(ancestors) && ancestors.include?(Class)
+    end
+    def is_singleton_defn?
+      defined?(superclass) && superclass.ancestors.include?(Class) && !is_class_self_defn?
+    end
+    def is_instance_defn?
+      !is_class_self_defn? && !is_singleton_defn?
+    end
   end
 
   # provide an alternative inheritance chain that works for singleton
@@ -419,7 +428,7 @@ module Doodle
 
     # set an attribute by name - apply validation if defined
     def _setter(name, *args, &block)
-      #pp [:_setter, self, self.class,  name, args, block]
+      #pp [:_setter, self, self.class, name, args, block, caller]
       ivar = "@#{name}"
       if block_given?
         args.unshift(SaveBlock.new(block))
@@ -568,6 +577,7 @@ module Doodle
     #  end
     #    
     def has(*args, &block)
+      #what_am_i?([:has, args])
       Doodle::Debug.d { [:has, self, self.class, args] }
       name = args.shift.to_sym
       # d { [:has2, name, args] }
@@ -614,6 +624,19 @@ module Doodle
           end
         }
       end
+      if is_class_self_defn? or is_singleton_defn?
+        #pp [:args, args]
+         init_values = get_init_values(false)
+#         if init_values.size > 0
+           #p [:init_values, name, self, is_class_self_defn? ? :CLASS : is_singleton_defn? ? :SINGLETON : '?', init_values, methods(false)]
+#           #define_getter_setter(name)
+#           #instance_variable_set("@#{name}", init_values[name])
+#         end
+#         #         singleton_class do
+#            #_setter(name, init_values[name])
+#         #         end
+      end
+      
       attribute
     end
 
@@ -638,6 +661,28 @@ module Doodle
       end
     end
 
+    def get_init_values(tf = true)
+      attributes(tf).select{|n, a| a.init_defined? }.inject({}) {|hash, (n, a)| 
+        hash[n] = begin
+                    case a.init
+                    when NilClass, TrueClass, FalseClass, Fixnum
+                      #p [:init, :no_clone]
+                      a.init
+                    when SaveBlock
+                      #p [:init, :save_block]
+                      instance_eval(&a.init.block)
+                    else
+                      #p [:init, :clone]
+                      a.init.clone 
+                    end
+                  rescue Exception => e
+                    #p [:init, :rescue, e]
+                    a.init
+                  end
+        ; hash }
+    end
+    private :get_init_values
+    
     # helper function to initialize from hash - this is safe to use
     # after initialization (validate! is called if this method is
     # called after initialization)
@@ -653,24 +698,7 @@ module Doodle
         # d { [:initialize, :arg_keywords, arg_keywords] }
 
         # set up initial values with ~clones~ of specified values (so not shared between instances)
-        init_values = attributes.select{|n, a| a.init_defined? }.inject({}) {|hash, (n, a)| 
-          hash[n] = begin
-            case a.init
-            when NilClass, TrueClass, FalseClass, Fixnum
-              #p [:init, :no_clone]
-              a.init
-            when SaveBlock
-              #p [:init, :save_block]
-              instance_eval(&a.init.block)
-            else
-              #p [:init, :clone]
-              a.init.clone 
-            end
-          rescue Exception => e
-            #p [:init, :rescue, e]
-            a.init
-          end
-          ; hash }
+        init_values = get_init_values
 
         # add to start of key_values array (so can be overridden by params)
         key_values.unshift(init_values)
@@ -712,11 +740,17 @@ module Doodle
       #Doodle::Debug.d { [:validate!, self] }
       #Doodle::Debug.d { [:validate!, self, __doodle__.validation_on] }
       if __doodle__.validation_on
-        attributes.each do |name, att|
+        if self.class == Class
+          attribs = singleton_class.attributes
+        else
+          attribs = attributes
+        end
+        #pp [:validate!, self, self.class, attributes]
+        attribs.each do |name, att|
           # treat default as special case
-          if att.name == :default || att.default_defined?
+          if [:default, :init].include?(att.name) || att.default_defined? || is_class_self_defn? || is_singleton_defn?
             # nop
-          elsif !ivar_defined?(att.name)
+          elsif !ivar_defined?(att.name) && self.class != Class
             handle_error name, Doodle::ValidationError, "#{self} missing required attribute '#{name}'", [caller[-1]]
           end
           # if all == true, reset values so conversions and validations are applied to raw instance variables

data/spec/bugs_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'yaml'
 
 describe 'Doodle', 'parents' do
   temporary_constant :Foo do
@@ -78,3 +79,20 @@ describe 'Doodle', ' loading bad data from yaml' do
     end
   end
 end
+
+describe Doodle, 'class attributes:' do
+    temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+        has :ivar
+        class << self
+          has :cvar
+        end
+      end
+    end
+
+    it 'should be possible to set a class var without setting an instance var' do
+      proc { Foo.cvar = 42 }.should_not raise_error
+    end
+  end
+end

data/spec/init_spec.rb

@@ -6,7 +6,7 @@ describe Doodle, 'init' do
     before(:each) do
       class Foo
         include Doodle::Helper
-        has :name, :init => 'D1'
+        has :moniker, :init => 'D1'
         class << self
           has :metadata, :init => 'D2'
         end
@@ -16,12 +16,11 @@ describe Doodle, 'init' do
         has :special, :init => 'D3'
       end
     end
-    
     it 'should have instance attribute init via class' do
-      Foo.attributes[:name].init.should == 'D1'
+      Foo.attributes[:moniker].init.should == 'D1'
     end
     it 'should have instance attribute init via instance' do
-      @foo.attributes[:name].init.should == 'D1'
+      @foo.attributes[:moniker].init.should == 'D1'
     end
     it 'should have class attribute init via class.singleton_class' do
       Foo.singleton_class.attributes(false)[:metadata].init.should == 'D2'
@@ -35,11 +34,11 @@ describe Doodle, 'init' do
     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'
+    it 'should have an attribute :moniker from init' do
+      @foo.moniker.should == 'D1'
     end
-    it 'should have an instance_variable for attribute :name' do
-      @foo.instance_variables.include?('@name').should == true
+    it 'should have an instance_variable for attribute :moniker' do
+      @foo.instance_variables.include?('@moniker').should == true
     end
     it 'should have an initialized class attribute :metadata' do
       pending 'deciding how this should work' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-12 00:00:00 +01:00
+date: 2008-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: []