doodle 0.0.6 → 0.0.7

data/ChangeLog

@@ -1,5 +1,17 @@
 = ChangeLog for doodle
 
+== 0.0.7 / 2008-03-22
+
+- return self from validate! (so you can use idiom foo = YAML::load(yaml).validate!)
+
+- fix normalization of keys to symbols in initialize_from_hash
+
+- fix error not allowing nils in :init clause (because can't clone nil)
+
+- allow more than one class in from clause (e.g. from String, Symbol do ... end)
+
+- removed :meta as alias for :singleton_class (conflicts with openuri, facets, etc.)
+
 == 0.0.6 / 2008-03-16
 
 - fixed Rakefile error (wasn't including examples in rdoc)

data/examples/src/sequel_core-1.3/lib/sequel_core/exceptions.rb

@@ -0,0 +1,48 @@
+module Sequel
+  # Represents an error raised in Sequel code.
+  class Error < StandardError
+    
+    # Error raised when an invalid statement is executed.
+    class InvalidStatement < Error; end
+
+    # Rollback is a special error used to rollback a transactions.
+    # A transaction block will catch this error and wont pass further up the stack.
+    class Rollback < Error ; end
+    
+    # Represents an invalid value stored in the database.
+    class InvalidValue < Error ; end
+                                       
+    # Represents an Invalid transform.
+    class InvalidTransform < Error ; end
+                                       
+    # Represents an Invalid filter.    
+    class InvalidFilter < Error ; end
+    
+    class InvalidExpression < Error; end
+                                       
+    # Represents an attempt to performing filter operations when no filter has been specified yet.
+    class NoExistingFilter < Error ; end
+                                       
+    # Represents an invalid join type.
+    class InvalidJoinType < Error ; end
+                                       
+    class WorkerStop < RuntimeError ; end
+    
+    # Raised when Sequel is unable to load a specified adapter.
+    class AdapterNotFound < Error ; end
+  end  
+end
+
+# Object extensions
+class Object
+  # Cancels the current transaction without an error:
+  #
+  #   DB.tranaction do
+  #     ...
+  #     rollback! if failed_to_contact_client
+  #     ...
+  #   end
+  def rollback!
+    raise Sequel::Error::Rollback
+  end
+end

data/lib/doodle.rb

@@ -50,10 +50,7 @@ module Doodle
   # provides more direct access to the singleton class and a way to
   # treat Modules and Classes equally in a meta context
   module SelfClass
-    # return self if a Module, else the singleton class
-    def self_class
-      self.kind_of?(Module) ? self : singleton_class
-    end
+
     # return the 'singleton class' of an object, optionally executing
     # a block argument in the (module/class) context of that object
     def singleton_class(&block)
@@ -61,10 +58,15 @@ module Doodle
       sc.module_eval(&block) if block_given?
       sc
     end
-    # an alias for singleton_class
-    alias :meta :singleton_class
+
+    # return self if a Module, else the singleton class
+    def self_class
+      self.kind_of?(Module) ? self : singleton_class
+    end
+    
+    # frankly a hack to allow init options to work for singleton classes
     def class_init(params = {}, &block)
-      sc = singleton_class &block
+      sc = singleton_class(&block)
       sc.attributes.select{|n, a| a.init_defined? }.each do |n, a|
         send(n, a.init)
       end
@@ -116,8 +118,8 @@ module Doodle
             if cap = self.to_s.match(regex)
               if cap.captures.size > 0
                 k = const_get(cap[1])
-                if k.respond_to?(:superclass) && k.superclass.respond_to?(:meta)
-                  klasses.unshift k.superclass.meta
+                if k.respond_to?(:superclass) && k.superclass.respond_to?(:singleton_class)
+                  klasses.unshift k.superclass.singleton_class
                 end
               end
               #p [:klass_self_klass, klass]
@@ -300,7 +302,7 @@ module Doodle
     def handle_error(name, *args)
       __doodle__.errors << [name, *args]
       if DoodleInfo.raise_exception_on_error
-        raise *args
+        raise(*args)
       end
     end
 
@@ -386,7 +388,7 @@ module Doodle
     def lookup_attribute(name)
       # (look at singleton attributes first)
       # fixme[this smells like a hack to me - why not handled in attributes?]
-      meta.attributes[name] || attributes[name]
+      singleton_class.attributes[name] || attributes[name]
     end
     private :lookup_attribute
 
@@ -463,8 +465,10 @@ module Doodle
     def from(*args, &block)
       # d { [:from, self, self.class, self.name, args, block] }
       if block_given?
-        # setting rule
-        local_conversions[*args] = block
+        # set the rule for each arg given
+        args.each do |arg|
+          local_conversions[arg] = block
+        end
         # d { [:from, conversions] }
       else
         convert(*args)
@@ -630,26 +634,41 @@ module Doodle
     def initialize_from_hash(*args)
       defer_validation do
         # hash initializer
-        # separate into positional args and hashes (keyword => value)
+        # separate into array of hashes of form [{:k1 => v1}, {:k2 => v2}] and positional args 
         key_values, args = args.partition{ |x| x.kind_of?(Hash)}
-        # d { [:initialize, :key_values, key_values, :args, args] }
+        Doodle::Debug.d { [:initialize_from_hash, :key_values, key_values, :args, args] }
 
-        # use idiom to create hash from array of assocs
+        # match up positional args with attribute names (from arg_order) using idiom to create hash from array of assocs
         arg_keywords = Hash[*(Utils.flatten_first_level(self.class.arg_order[0...args.size].zip(args)))]
         # 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] = a.init.clone rescue a.init; hash }
-          
-        # add to start of key_values (so can be overridden by params)
+        init_values = attributes.select{|n, a| a.init_defined? }.inject({}) {|hash, (n, a)| 
+          hash[n] = begin
+            case a.init
+            when NilClass, TrueClass, FalseClass, Fixnum
+              a.init
+            else
+              a.init.clone 
+            end
+          rescue 
+            a.init
+          end
+          ; hash }
+
+        # add to start of key_values array (so can be overridden by params)
         key_values.unshift(init_values)
 
         # merge all hash args into one
-        key_values = key_values.inject(arg_keywords){ |hash, item| hash.merge(item)}
-        # d { [:initialize, :key_values, key_values] }
+        key_values = key_values.inject(arg_keywords) { |hash, item| hash.merge(item)}
+
+        # convert key names to symbols
+        key_values = key_values.inject({}) {|h, (k, v)| h[k.to_sym] = v; h}
+        Doodle::Debug.d { [:initialize_from_hash, :key_values2, key_values, :args2, args] }
+        
+        # create attributes
         key_values.keys.each do |key|
-          key = key.to_sym
-          # d { [:initialize_from_hash, :setting, key, key_values[key]] }
+          Doodle::Debug.d { [:initialize_from_hash, :setting, key, key_values[key]] }
           if respond_to?(key)
             send(key, key_values[key])
           else
@@ -692,6 +711,8 @@ module Doodle
           end
         end
       end
+      # if OK, then return self
+      self
     end
 
     # turn off validation, execute block, then set validation to same

data/lib/molic_orderedhash.rb

@@ -119,12 +119,12 @@ class OrderedHash < ::Hash
     end
     def reject &block
 #--{{{
-        self.dup.delete_if &block
+        self.dup.delete_if(&block)
 #--}}}
     end
     def reject! &block
 #--{{{
-        hsh2 = reject &block
+        hsh2 = reject(&block)
         self == hsh2 ? nil : hsh2
 #--}}}
     end

data/spec/class_spec.rb

@@ -36,11 +36,11 @@ describe Doodle, 'class attributes' do
     end
 
     it "should list all class's own attributes" do
-      Foo.meta.attributes(false).keys.should == [:metadata]
+      Foo.singleton_class.attributes(false).keys.should == [:metadata]
     end
   
     it "should list all class's own attributes" do
-      Foo.meta.attributes.keys.should == [:metadata]
+      Foo.singleton_class.attributes.keys.should == [:metadata]
     end
 
     it 'should create Bar class attribute' do
@@ -73,11 +73,11 @@ describe Doodle, 'class attributes' do
     end
   
     it "should list all class's own attributes" do
-      Bar.meta.attributes(false).keys.should == [:doc]
+      Bar.singleton_class.attributes(false).keys.should == [:doc]
     end
   
     it "should list all class's own attributes" do
-      Bar.meta.attributes.keys.should == [:metadata, :doc]
+      Bar.singleton_class.attributes.keys.should == [:metadata, :doc]
     end
   end
 end

data/spec/defaults_spec.rb

@@ -23,16 +23,16 @@ describe Doodle, 'attributes with defaults' do
       @foo.attributes[:name].default.should == 'D1'
     end
     it 'should have class attribute default via class.meta' do
-      Foo.meta.attributes(false)[:metadata].default.should == 'D2'
+      Foo.singleton_class.attributes(false)[:metadata].default.should == 'D2'
     end
     it 'should have class attribute default via class.meta' do
-      Foo.meta.attributes[:metadata].default.should == 'D2'
+      Foo.singleton_class.attributes[:metadata].default.should == 'D2'
     end
-    it 'should have singleton attribute default via instance.meta.attributes(false)' do
-      @foo.meta.attributes(false)[:special].default.should == 'D3'
+    it 'should have singleton attribute default via instance.singleton_class.attributes(false)' do
+      @foo.singleton_class.attributes(false)[:special].default.should == 'D3'
     end
-    it 'should have singleton attribute default via instance.meta.attributes' do
-      @foo.meta.attributes[:special].default.should == 'D3'
+    it 'should have singleton attribute default via instance.singleton_class.attributes' do
+      @foo.singleton_class.attributes[:special].default.should == 'D3'
     end
     it 'should have singleton attribute name by default' do
       @foo.name.should == 'D1'
@@ -53,8 +53,8 @@ describe Doodle, 'attributes with defaults' do
       Foo.instance_variables.sort.should == []
     end
     it 'should not have @special singleton instance variable' do
-      @foo.meta.instance_variables.include?("@special").should == false
-      @foo.meta.instance_variables.sort.should == []
+      @foo.singleton_class.instance_variables.include?("@special").should == false
+      @foo.singleton_class.instance_variables.sort.should == []
     end
   end
 end

data/spec/doodle_spec.rb

@@ -1,24 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Doodle, 'basics' do
-  temporary_constant :Foo do
-    before(:each) do
-      class Foo
-        include Doodle::Helper
-      end
-      @foo = Foo.new
-    end
-    after :each do
-      remove_ivars :foo
-    end
-
-    it 'should have meta as synonym for singleton_class' do
-      Foo.singleton_class.should == Foo.meta
-      @foo.singleton_class.should == @foo.meta
-    end
-  end
-end
-
 describe Doodle, 'instance attributes' do
   temporary_constant :Foo do
     before(:each) do
@@ -87,11 +68,11 @@ describe Doodle, 'class attributes(false)' do
     end
 
     it "should list all class's own attributes" do
-      Foo.meta.attributes(false).keys.should == [:metadata]
+      Foo.singleton_class.attributes(false).keys.should == [:metadata]
     end
   
     it "should list all class's own attributes" do
-      Foo.meta.attributes.keys.should == [:metadata]
+      Foo.singleton_class.attributes.keys.should == [:metadata]
     end
   end
 end
@@ -156,19 +137,19 @@ describe Doodle, 'inherited class attributes(false)' do
     end
   
     it "should list class's own attributes" do
-      Foo.meta.attributes(false).keys.should == [:metadata]
+      Foo.singleton_class.attributes(false).keys.should == [:metadata]
     end
   
     it "should list all class's own attributes" do
-      Foo.meta.attributes.keys.should == [:metadata]
+      Foo.singleton_class.attributes.keys.should == [:metadata]
     end
 
     it "should list class's own attributes(false)" do
-      Bar.meta.attributes(false).keys.should == [:doc]
+      Bar.singleton_class.attributes(false).keys.should == [:doc]
     end
 
     it "should list all inherited meta class attributes" do
-      Bar.meta.attributes.keys.should == [:metadata, :doc]
+      Bar.singleton_class.attributes.keys.should == [:metadata, :doc]
     end
 
     it "should list all inherited class's attributes" do
@@ -203,11 +184,11 @@ describe Doodle, 'singleton class attributes' do
     end
 
     it 'should list instance attributes' do
-      @foo.meta.attributes(false).keys.should == [:special]
+      @foo.singleton_class.attributes(false).keys.should == [:special]
     end
 
     it 'should list instance attributes' do
-      @foo.meta.attributes.keys.should == [:metadata, :special]
+      @foo.singleton_class.attributes.keys.should == [:metadata, :special]
     end
   end
 end
@@ -261,20 +242,20 @@ describe Doodle, 'inherited singleton class attributes' do
     end
 
     it 'should list instance meta attributes' do
-      @foo.meta.attributes(false).keys.should == [:special]
-      @bar.meta.attributes(false).keys.should == [:extra]
+      @foo.singleton_class.attributes(false).keys.should == [:special]
+      @bar.singleton_class.attributes(false).keys.should == [:extra]
     end
 
     it 'should list instance attributes' do
-      @foo.meta.attributes.keys.should == [:metadata, :special]
-      @bar.meta.attributes.keys.should == [:metadata, :doc, :extra]
+      @foo.singleton_class.attributes.keys.should == [:metadata, :special]
+      @bar.singleton_class.attributes.keys.should == [:metadata, :doc, :extra]
     end
   
     it 'should keep meta attributes separate' do
       @foo.special = 'foo special'
       @foo.special.should == 'foo special'
-      @foo.meta.metadata = 'foo meta'
-      @foo.meta.metadata.should == 'foo meta'
+      @foo.singleton_class.metadata = 'foo meta'
+      @foo.singleton_class.metadata.should == 'foo meta'
       # note: you cannot set any other values on @bar until you have set @bar.extra because it's defined as required
       @bar.extra = 'bar extra'
       @bar.extra.should == 'bar extra'
@@ -287,7 +268,7 @@ describe Doodle, 'inherited singleton class attributes' do
 
       # now make sure they haven't bumped each other off
       @foo.special.should == 'foo special'
-      @foo.meta.metadata.should == 'foo meta'
+      @foo.singleton_class.metadata.should == 'foo meta'
       @bar.extra.should == 'bar extra'
       Foo.metadata.should == 'Foo meta'
       Bar.metadata.should == 'Bar meta'
@@ -298,11 +279,11 @@ describe Doodle, 'inherited singleton class attributes' do
       @bar.extra = 'bar extra'
       @bar.extra.should == 'bar extra'
       # pending 'working out how to make this work' do
-      #   @bar.meta.metadata = 'bar meta metadata'
-      #   @bar.meta.metadata.should == 'bar meta metadata'
-      #   @bar.meta.doc = 'bar doc'
-      #   @bar.meta.doc.should == 'bar doc'
-      #   proc { @foo.meta.doc = 1 }.should raise_error(NoMethodError)
+      #   @bar.singleton_class.metadata = 'bar meta metadata'
+      #   @bar.singleton_class.metadata.should == 'bar meta metadata'
+      #   @bar.singleton_class.doc = 'bar doc'
+      #   @bar.singleton_class.doc.should == 'bar doc'
+      #   proc { @foo.singleton_class.doc = 1 }.should raise_error(NoMethodError)
       # end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-16 00:00:00 +00:00
+date: 2008-03-24 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - examples/example-01.rdoc
 - examples/example-02.rb
 - examples/example-02.rdoc
+- examples/src/sequel_core-1.3/lib/sequel_core/exceptions.rb
 - README
 - COPYING
 - ChangeLog