traits 0.8.1 → 0.9.0

data/lib/{traits-0.8.1.rb → traits-0.9.0.rb}

@@ -1,12 +1,14 @@
 $__TRAIT_DEBUG__ = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
-$__TRAIT_VERSION__ = "0.8.1" 
+$__TRAIT_VERSION__ = "0.9.0" 
 
 class Object
 #--{{{
   def singleton_method_added(*a, &b)
 #--{{{
+    ret = super rescue nil
     obj = self
     obj.__trait_singleton_class.__trait_module_eval{ @__trait_singleton_super = obj }
+    ret
 #--}}}
   end
   def __trait_singleton_class
@@ -32,19 +34,16 @@ class Object
 
     key = "#{ key }"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
     key = "#{ key }s"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
     key = "#{ key }es"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
@@ -67,8 +66,8 @@ class Object
       block.__trait_singleton_class.class_eval{ attr '__trait_default' }
     end
 
-    list, hashes = [ args ].flatten.partition{|arg| not Hash === arg}
-    opts = hashes.inject({}){|accum,h| accum.update h}
+    list = [ args ].flatten.dup
+    opts = Hash::new.update(((list.size > 1 and Hash === list.last) ? list.pop : {}))
 
     pre = __trait_getopt opts, 'pre'
     post = __trait_getopt opts, 'post'
@@ -79,7 +78,10 @@ class Object
     ducktype = __trait_getopt opts, 'ducktype'
     default = __trait_getopt opts, 'default'
 
-    names_and_defaults = opts
+    list, hashes = list.partition{|arg| not Hash === arg}
+    hashes << opts unless opts.empty? # in which case it was not, in fact, opts
+
+    names_and_defaults = hashes.inject({}){|h,h2| h.update h2} 
 
     raise ArgumentError, 
       "cannot specify both 'default' keyword and 'default' block" if
@@ -87,6 +89,10 @@ class Object
 
     default ||= block
 
+    # force list and names_and_defaults.keys to strings
+    list = list.map{|t| "#{ t }"}
+    names_and_defaults = Hash[ *names_and_defaults.to_a.map{|k,v| ["#{ k }", v]}.flatten ]
+
     list.each{|name| names_and_defaults[name] = default}
 
     names = list + (names_and_defaults.keys - list)
@@ -103,14 +109,10 @@ class Object
 
     names_and_hooks = names.inject({}){|h, name| h.update name => hooks}
 
-    {
-      'names' => names,
+    ret = {
       'names_and_defaults' => names_and_defaults,
       'names_and_hooks' => names_and_hooks,
-      'hooks' => hooks, 
-      #'pre' => pre, 'post' => post, 'validate' => validate, 'munge' => munge, 'cast' => cast,
-      'default' => default,
-    }.update hooks
+    }
 #--}}}
   end
   def __trait_instance_method_list
@@ -477,7 +479,7 @@ class Module
                 return nil
               end
             else
-              @#{ name }
+              defined? @#{ name } and @#{ name }
           end
         end
       end
@@ -502,8 +504,11 @@ class Module
         hook_types = %w( pre munge cast type ducktype validate post )
 
         #{ klass }::__trait_search_path.each do |obj|
+
           break if hooks.values_at(*hook_types).compact.size == hook_types.size
+
           hook_types.each{|ht| hooks[ht] ||= obj.#{ hooks }['#{ name }'][ht]}
+
         end
 
         pre_hook, munge_hook, cast_hook, type_hook, ducktype_hook, validate_hook, post_hook = 
@@ -662,3 +667,21 @@ class Module
   end
 #--}}}
 end
+
+module TraitInit
+#--{{{
+  def trait_init opts = {}
+#--{{{
+    opts.each do |k,v| 
+      k = "#{ k }"
+      if respond_to? k
+        send k, v
+      else
+        raise ArgumentError, "invalid trait -- #{ self.class }##{ k }"
+      end
+    end
+#--}}}
+  end
+  alias_method "traitinit", "trait_init"
+#--}}}
+end

data/lib/traits.rb

@@ -1,12 +1,14 @@
 $__TRAIT_DEBUG__ = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
-$__TRAIT_VERSION__ = "0.8.1" 
+$__TRAIT_VERSION__ = "0.9.0" 
 
 class Object
 #--{{{
   def singleton_method_added(*a, &b)
 #--{{{
+    ret = super rescue nil
     obj = self
     obj.__trait_singleton_class.__trait_module_eval{ @__trait_singleton_super = obj }
+    ret
 #--}}}
   end
   def __trait_singleton_class
@@ -32,19 +34,16 @@ class Object
 
     key = "#{ key }"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
     key = "#{ key }s"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
     key = "#{ key }es"
     return opts.delete(key) if opts.has_key? key
-
     key = key.intern
     return opts.delete(key) if opts.has_key? key
 
@@ -67,8 +66,8 @@ class Object
       block.__trait_singleton_class.class_eval{ attr '__trait_default' }
     end
 
-    list, hashes = [ args ].flatten.partition{|arg| not Hash === arg}
-    opts = hashes.inject({}){|accum,h| accum.update h}
+    list = [ args ].flatten.dup
+    opts = Hash::new.update(((list.size > 1 and Hash === list.last) ? list.pop : {}))
 
     pre = __trait_getopt opts, 'pre'
     post = __trait_getopt opts, 'post'
@@ -79,7 +78,10 @@ class Object
     ducktype = __trait_getopt opts, 'ducktype'
     default = __trait_getopt opts, 'default'
 
-    names_and_defaults = opts
+    list, hashes = list.partition{|arg| not Hash === arg}
+    hashes << opts unless opts.empty? # in which case it was not, in fact, opts
+
+    names_and_defaults = hashes.inject({}){|h,h2| h.update h2} 
 
     raise ArgumentError, 
       "cannot specify both 'default' keyword and 'default' block" if
@@ -87,6 +89,10 @@ class Object
 
     default ||= block
 
+    # force list and names_and_defaults.keys to strings
+    list = list.map{|t| "#{ t }"}
+    names_and_defaults = Hash[ *names_and_defaults.to_a.map{|k,v| ["#{ k }", v]}.flatten ]
+
     list.each{|name| names_and_defaults[name] = default}
 
     names = list + (names_and_defaults.keys - list)
@@ -103,14 +109,10 @@ class Object
 
     names_and_hooks = names.inject({}){|h, name| h.update name => hooks}
 
-    {
-      'names' => names,
+    ret = {
       'names_and_defaults' => names_and_defaults,
       'names_and_hooks' => names_and_hooks,
-      'hooks' => hooks, 
-      #'pre' => pre, 'post' => post, 'validate' => validate, 'munge' => munge, 'cast' => cast,
-      'default' => default,
-    }.update hooks
+    }
 #--}}}
   end
   def __trait_instance_method_list
@@ -477,7 +479,7 @@ class Module
                 return nil
               end
             else
-              @#{ name }
+              defined? @#{ name } and @#{ name }
           end
         end
       end
@@ -502,8 +504,11 @@ class Module
         hook_types = %w( pre munge cast type ducktype validate post )
 
         #{ klass }::__trait_search_path.each do |obj|
+
           break if hooks.values_at(*hook_types).compact.size == hook_types.size
+
           hook_types.each{|ht| hooks[ht] ||= obj.#{ hooks }['#{ name }'][ht]}
+
         end
 
         pre_hook, munge_hook, cast_hook, type_hook, ducktype_hook, validate_hook, post_hook = 
@@ -662,3 +667,21 @@ class Module
   end
 #--}}}
 end
+
+module TraitInit
+#--{{{
+  def trait_init opts = {}
+#--{{{
+    opts.each do |k,v| 
+      k = "#{ k }"
+      if respond_to? k
+        send k, v
+      else
+        raise ArgumentError, "invalid trait -- #{ self.class }##{ k }"
+      end
+    end
+#--}}}
+  end
+  alias_method "traitinit", "trait_init"
+#--}}}
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: traits
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2005-11-11 00:00:00.000000 -07:00
+  version: 0.9.0
+date: 2005-12-29 00:00:00.000000 -07:00
 summary: traits
 require_paths: 
   - lib
@@ -30,7 +30,7 @@ authors:
   - Ara T. Howard
 files: 
   - lib/traits.rb
-  - lib/traits-0.8.1.rb
+  - lib/traits-0.9.0.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []