doodle 0.1.1 → 0.1.2

data/History.txt

@@ -1,7 +1,12 @@
+== 0.1.2 / 2008-05-01
+- avoid wierd interaction with ActiveRecord (where calling inspect on a
+  class hits the database). Thanks again to Ryan Garver.
+
 == 0.1.1 / 2008-04-28
 - changed name of #parent to #doodle_parent to avoid clash with
   ActiveSupport (thanks to Ryan Garver for reporting this)
 
+
 == 0.1.0 / 2008-04-26
 - doodle's first beta version - the API should remain stable from now on
 - created a Google group: http://groups.google.com/group/ruby-doodle
@@ -20,6 +25,7 @@
 - removed redundant methods & excised some cruft
 - refactored project to use newgem
 
+
 == 0.0.11 / 2008-04-13
 - refactored attributes and conversions
 

data/lib/doodle.rb

@@ -62,7 +62,7 @@ class Doodle
         # note[this uses regex match on object's inspect string - kludgy
         # - is there a better way?]
         return :nil if obj.class == NilClass
-        case obj.real_inspect
+        case obj.inspect
         when /#<Class:#<.*0x[a-z0-9]+>+$/
           :instance_singleton_class
         when /#<Class:[A-Z]/
@@ -246,10 +246,10 @@ class Doodle
       @errors = []
       @doodle_parent = nil
     end
-    real_inspect = Object.instance_method(:inspect)
-    define_method :real_inspect do
-      real_inspect.bind(self).call
-    end
+    #real_inspect = Object.instance_method(:inspect)
+    #define_method :real_inspect do
+    #  real_inspect.bind(self).call
+    #end
     def inspect
       ''
     end
@@ -261,45 +261,13 @@ class Doodle
     # (hack to fool yaml and anything else that queries instance_variables)
     meth = Object.instance_method(:instance_variables)
     define_method :instance_variables do
-      meth.bind(self).call.reject{ |x| x =~ /@__doodle__/}
+      meth.bind(self).call.reject{ |x| x.to_s =~ /@__doodle__/}
     end
 
     # hide @__doodle__ from inspect
-    # variants:
-    # #<Foo:0xb7de0064>
-    # #<Foo:0xb7c52d28 @name="Arthur Dent", @age=42>
-    # #<Class:#<Foo:0xb7de0064>>
-    # #<Class:Class>
-    # #<Class:#<Class:#<Foo:0xb7de0064>>>
-
-    # strip off all trailing > (count them = nesting)
-    # take leading chars up to first space (or EOS)
-    # rebuild rest
-
-    real_inspect = Object.instance_method(:inspect)
-    define_method :real_inspect do
-      real_inspect.bind(self).call
-    end
-    define_method :inspect do
-      # have to handle some built-ins as special case
-      built_in = Doodle::BuiltIns::BUILTINS.select{ |x| self.kind_of?(x) }.first
-      if built_in
-        built_in.instance_method(:inspect).bind(self).call
-      else
-        istr = real_inspect.bind(self).call
-        str = istr.gsub(/(>+$)/, '')
-        trailing = $1
-        klass = str.split(/\s/, 2).first
-        ivars = self.kind_of?(Module) ? [] : instance_variables
-        separator = ivars.size > 0 ? ' ' : ''
-        
-        #pp [:istr, istr, :str, str, :trailing, trailing, :klass, klass]
-        # note to self: changing klass to <self.class will highlight cases that need the hack in parents
-        #%[<#{self.class}#{separator}#{instance_variables.map{|x| "#{x}=#{instance_variable_get(x).inspect}"}.join(' ')}#{trailing}]
-        %[#{klass}#{separator}#{ivars.map{|x| "#{x}=#{instance_variable_get(x).inspect}"}.join(' ')}#{trailing}]
-      end
+    def inspect
+      super.gsub(/\s*@__doodle__=,/,'').gsub(/,?\s*@__doodle__=/,'')
     end
-    
   end
 
   # the core module of Doodle - to get most facilities provided by Doodle

data/lib/doodle/datatypes.rb

@@ -40,7 +40,7 @@ end
 ### user code
 require 'date'
 require 'uri'
-#require 'rfc822'
+require 'rfc822'
 
 # note: this doesn't have to be in Doodle namespace
 class Doodle
@@ -51,7 +51,7 @@ class Doodle
           n.to_i
         end
         from String do |n|
-          n =~ /[0-9]+(.[0-9]+)?/ or raise "#{name} must be numeric"
+          n =~ /[0-9]+(.[0-9]+)?/ or raise ArgumentError, "#{name} must be numeric"
           n.to_i
         end
       end
@@ -74,7 +74,7 @@ class Doodle
       if params.key?(:size)
         size = params.delete(:size)
         # size should be a Range
-        size.kind_of?(Range) or raise ArgumentError, ":size should be a Range", caller[-1]
+        size.kind_of?(Range) or raise ArgumentError, "#{name}: size should be a Range", [caller[-1]]
       end
       define name, params, block, { :kind => String } do
         from String do |s|
@@ -108,10 +108,16 @@ class Doodle
     end
 
     def email(name, params = { }, &block)
-      string(name, { :max => 255 }.merge(params), &block).instance_eval do
+      # for max length, see http://www.imc.org/ietf-fax/archive2/msg01578.html
+      # 384 = 128+1+255
+      string(name, { :max => 384 }.merge(params), &block).instance_eval do
         must "be valid email address" do |s|
-          #s =~ RFC822::EmailAddress
-          s =~ /\A.*@.*\z/
+          if RUBY_VERSION >= '1.9.0'
+            # the regex fails in 1.9 with illegal utf byte sequence error
+            s =~ /\A.*@.*\z/
+          else
+            s =~ RFC822::EmailAddress
+          end
         end
       end
     end
@@ -136,6 +142,7 @@ class Doodle
           str =~ /\d+\.\d+.\d+/
         end
         from Array do |a|
+          a.size == 3 or raise ArgumentError, "#{name}: version array argument must contain exactly 3 elements", [caller[-1]]
           a.join('.')
         end
       end

data/lib/doodle/version.rb

@@ -2,7 +2,7 @@ class Doodle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

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