RubyGems - traits - Versions diffs - 0.9.1 → 0.10.0 - Mend

traits 0.9.1 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README +76 -7
data/README.tmpl +31 -3
data/gen_readme.rb +1 -1
data/lib/{traits-0.9.1.rb → traits-0.10.0.rb} +261 -12
data/lib/traits.rb +261 -12
data/sample/i.rb +2 -0
data/sample/p.rb +2 -2
data/sample/q.rb +24 -0
data/traits-0.10.0.gem +0 -0
metadata +5 -3

data/README CHANGED

@@ -3,19 +3,47 @@ URLS
   http://rubyforge.org/projects/codeforpeople/
   http://codeforpeople.com/lib/ruby/traits
+INSTALL
+  yes|sudo gem install traits
 ABOUT
-  traits.rb is set of attr_* like methods on steroids, caffeine, and botox.  it
-  encourages better living through meta-programming and uniform access
+  traits.rb is set of attr_* like methods on steroids, caffeine, and botox.
+  it encourages better living through meta-programming and uniform access
   priciples. traits.rb supports smart inheritence of class attributes and a
   fistful of hooks for veryifying and munging attr values.
 VERSION
-  0.9.1
+  0.10.0
 HISTORY
+  0.10.0
+    - removed use of additional instance var to denote whether a value had
+      been set.  now the test is only 'defined? @#{ name }'.
+  0.9.2
+    - fixed a bug where list traits, for example
+        trait 'letters' => %w[ a b c ]
+      were flattened in a way that exploded trait initialization
+    - streamlined TraitInit module
+    - added OpenTraits class and otraits method
+        conf = otraits{
+          port 42
+          host 'forty-two'
+        }
+        p conf.port            #=> 42
+        p conf.host            #=> 'forty-two'
+        conf.username 'zaphod'
+        p conf                 #=> {"username"=>"zaphod", "port"=>42, "host"=>"forty-two"}
   0.9.0
     - luke kaines made quite a few suggestions and bug reports that enabled this
       release including making a few methods indifferent about string/symbol
@@ -422,6 +450,7 @@ SAMPLES
         p r?
         self.r = 42
         p r
+        p r?
       end
     end
     C::new.using_private_writer_and_query
@@ -435,6 +464,7 @@ SAMPLES
         p w?
         self.w = 'forty-two'
         p w
+        p w?
       end
     end
     D::new.using_private_reader
@@ -443,8 +473,10 @@ SAMPLES
     false
     42
+    true
     false
     "forty-two"
+    true
   <========< sample/j.rb >========>
@@ -664,13 +696,50 @@ SAMPLES
     end
     c = C::new "li" => [4, 2], "ls" => %w[4 2]
-    p c.li.join
-    p c.ls.join
+    p c.li
+    p c.ls
   ~ > ruby sample/p.rb
-    "42"
-    "42"
+    [4, 2]
+    ["4", "2"]
+  <========< sample/q.rb >========>
+  ~ > cat sample/q.rb
+    require 'traits'
+    #
+    # the OpenTraits class is similar to an OpenStruct but, imho, easier to use.
+    # the otraits shorthand can be used to contruct one
+    #
+    #
+    # options passed as args dynamically create and init traits
+    #
+      config = otraits :port => 42
+      p config.port
+    #
+    # any passed block does the same but, via a method missing hood and traits
+    # getter/setters, the syntax is very clean
+    #
+      config = otraits{
+        port 42
+        host 'forty-two'
+      }
+      p config.port
+      p config.host
+      config.username 'zaphod'
+      p config
+  ~ > ruby sample/q.rb
+    42
+    42
+    "forty-two"
+    {"username"=>"zaphod", "port"=>42, "host"=>"forty-two"}
 CAVEATS

data/README.tmpl CHANGED

@@ -3,19 +3,47 @@ URLS
   http://rubyforge.org/projects/codeforpeople/
   http://codeforpeople.com/lib/ruby/traits
+INSTALL
+  yes|sudo gem install traits
 ABOUT
-  traits.rb is set of attr_* like methods on steroids, caffeine, and botox.  it
-  encourages better living through meta-programming and uniform access
+  traits.rb is set of attr_* like methods on steroids, caffeine, and botox.
+  it encourages better living through meta-programming and uniform access
   priciples. traits.rb supports smart inheritence of class attributes and a
   fistful of hooks for veryifying and munging attr values.
 VERSION
-  0.9.1
+  0.10.0
 HISTORY
+  0.10.0
+    - removed use of additional instance var to denote whether a value had
+      been set.  now the test is only 'defined? @#{ name }'.
+  0.9.2
+    - fixed a bug where list traits, for example
+        trait 'letters' => %w[ a b c ]
+      were flattened in a way that exploded trait initialization
+    - streamlined TraitInit module
+    - added OpenTraits class and otraits method
+        conf = otraits{
+          port 42
+          host 'forty-two'
+        }
+        p conf.port            #=> 42
+        p conf.host            #=> 'forty-two'
+        conf.username 'zaphod'
+        p conf                 #=> {"username"=>"zaphod", "port"=>42, "host"=>"forty-two"}
   0.9.0
     - luke kaines made quite a few suggestions and bug reports that enabled this
       release including making a few methods indifferent about string/symbol

data/gen_readme.rb CHANGED

@@ -19,7 +19,7 @@ Dir['sample/*'].each do |sample|
   cmd = "ruby #{ sample }"
   samples << indent(prompt + cmd, 2) << "\n\n"
-  cmd = "ruby -I ./lib -r ./lib/traits.rb #{ sample }"
+  cmd = "ruby -I./lib/ #{ sample }"
   samples << indent(`#{ cmd } 2>&1`, 4) << "\n"
 end

data/lib/{traits-0.9.1.rb → traits-0.10.0.rb} RENAMED

@@ -1,5 +1,9 @@
-$__TRAIT_DEBUG__ = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
-$__TRAIT_VERSION__ = "0.9.1"
+module Traits
+#--{{{
+  VERSION = "0.10.0"
+  DEBUG = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
+#--}}}
+end
 class Object
 #--{{{
@@ -61,6 +65,7 @@ class Object
     ducktype = nil
     default = nil
     names_and_defaults = nil
+    toggle = nil
     if block and not block.respond_to? :__trait_default
       block.__trait_singleton_class.class_eval{ attr '__trait_default' }
@@ -77,6 +82,7 @@ class Object
     type = __trait_getopt(opts, 'type', __trait_getopt(opts, 'case'))
     ducktype = __trait_getopt opts, 'ducktype'
     default = __trait_getopt opts, 'default'
+    toggle = __trait_getopt opts, 'toggle'
     list, hashes = list.partition{|arg| not Hash === arg}
     hashes << opts unless opts.empty? # in which case it was not, in fact, opts
@@ -91,7 +97,9 @@ class Object
     # 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 ]
+    #names_and_defaults = Hash[ *names_and_defaults.to_a.map{|k,v| ["#{ k }", v]}.flatten ]
+    h = names_and_defaults
+    h.keys.each{|k| h[k.to_s] = h.delete(k)}
     list.each{|name| names_and_defaults[name] = default}
@@ -105,6 +113,7 @@ class Object
       'ducktype' => ducktype,
       'validate' => validate,
       'post' => post,
+      'toggle' => toggle,
     }
     names_and_hooks = names.inject({}){|h, name| h.update name => hooks}
@@ -202,6 +211,8 @@ class Object
       reader_trait
       r_traits
       r_trait
+      rtraits
+      rtrait
       has_readers
       has_reader
       has_r
@@ -212,6 +223,8 @@ class Object
       writer_trait
       w_traits
       w_trait
+      wtraits
+      wtrait
       has_writers
       has_writer
       has_w
@@ -230,6 +243,7 @@ class Object
     end
 #--}}}
 end
 class Class
 #--{{{
   def __trait_singleton_super
@@ -240,6 +254,7 @@ class Class
   end
 #--}}}
 end
 class Module
 #--{{{
@@ -248,7 +263,7 @@ class Module
     begin
       module_eval(*a, &b)
     rescue Exception => e
-      STDERR.puts([a, b].inspect) if $__TRAIT_DEBUG__
+      STDERR.puts([a, b].inspect) if Traits::DEBUG
       raise
     end
 #--}}}
@@ -388,6 +403,7 @@ class Module
       getter = "#{ name }"
       setter = "#{ name }="
       query = "#{ name }?"
+      toggle = "#{ name }!"
       defaults[getter] = default if default
       list['readers'] << getter
@@ -406,6 +422,10 @@ class Module
         code = __trait_gen_query_code name, 'public'
         __trait_module_eval code
       end
+      unless instance_methods.include? toggle
+        code = __trait_gen_toggle_code name, 'private'
+        __trait_module_eval code
+      end
 #--}}}
   end
@@ -414,6 +434,7 @@ class Module
       reader = "#{ name }"
       writer = "#{ name }="
       query = "#{ name }?"
+      toggle = "#{ name }!"
       defaults[reader] = default if default
       list['writers'] << writer
@@ -432,6 +453,10 @@ class Module
         code = __trait_gen_query_code name, 'private'
         __trait_module_eval code
       end
+      unless instance_methods.include? toggle
+        code = __trait_gen_toggle_code name, 'public'
+        __trait_module_eval code
+      end
 #--}}}
   end
@@ -454,7 +479,8 @@ class Module
         unless a.empty?
           send('#{ name }=', *a, &b)
         else
-          unless(defined?(@________#{ name }_set) and @________#{ name }_set)
+          #unless(defined?(@________#{ name }_set) and @________#{ name }_set)
+          unless defined? @#{ name }
             #{ klass }::__trait_search_path.each do |obj|
                 defaults = obj.#{ defaults }
                 if defaults.has_key? '#{ name }'
@@ -485,7 +511,7 @@ class Module
       end
       #{ access_protection } '#{ name }'.intern
     code
-    puts reader_code if $__TRAIT_DEBUG__
+    puts reader_code if Traits::DEBUG
     reader_code
 #--}}}
   end
@@ -601,7 +627,7 @@ class Module
         @#{ name } = value
-        @________#{ name }_set = true
+        #@________#{ name }_set = true
         if post_hook
           [ post_hook ].flatten.each do |post|
@@ -631,7 +657,7 @@ class Module
       end
       #{ access_protection } '#{ name }='.intern
     code
-    puts writer_code if $__TRAIT_DEBUG__
+    puts writer_code if Traits::DEBUG
     writer_code
 #--}}}
   end
@@ -644,11 +670,193 @@ class Module
       end
       # #{ access_protection } '#{ name }?'.intern
     code
-    puts query_code if $__TRAIT_DEBUG__
+    puts query_code if Traits::DEBUG
     query_code
 #--}}}
   end
+  def __trait_gen_toggle_code name, access_protection = 'public'
+#--{{{
+    s = __trait_singleton?
+    klass = s ? 'self' : 'self.class'
+    hooks = s ? '__trait_singleton_method_hooks' : '__trait_instance_method_hooks'
+    writer_code = <<-code
+      def #{ name }!
+        hooks = {}
+        hook_types = %w( pre munge cast type ducktype validate post toggle )
+        #{ 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, toggle_hook =
+          hooks.values_at(*hook_types)
+        toggle =
+          if defined? @________#{ name }_toggle
+            @________#{ name }_toggle
+          else
+            if toggle_hook
+              case toggle_hook
+                when Proc
+                  t = Object.new
+                  sc = class << t
+                    self
+                  end
+                  sc.module_eval{
+                    define_method 'shift' do
+                      toggle_hook.call
+                    end
+                    define_method 'push' do
+                    end
+                  }
+                  t
+                when Enumerable
+                  toggle_hook.to_a
+                when NilClass, TrueClass
+                  @________#{ name }_toggle = [true, false]
+                else
+                  if toggle_hook.respond_to?('shift') and toggle_hook.respond_to?('push')
+                    toggle_hook
+                  else
+                    raise "bad toggle <\#{ toggle_hook.inspect }>"
+                  end
+              end
+            else
+              @________#{ name }_toggle = [true, false]
+            end
+          end
+        value = toggle.shift
+        toggle.push value
+        if pre_hook
+          [ pre_hook ].flatten.each do |pre|
+            if Proc === pre
+              case pre.arity
+                when 0
+                  __trait_evaluate &pre
+                when 1
+                  __trait_evaluate value, &pre
+                else
+                  __trait_evaluate "#{ name }", value, &pre
+              end
+            else
+              case method("\#{ pre }").arity
+                when 0
+                  send "\#{ pre }"
+                when 1
+                  send "\#{ pre }", value
+                else
+                  send "\#{ pre }", "#{ name }", value
+              end
+            end
+          end
+        end
+        if cast_hook
+          [ cast_hook ].flatten.each do |cast|
+            value =
+              if Proc === cast
+                __trait_evaluate value, &cast
+              else
+                send cast, value
+              end
+          end
+        end
+        if munge_hook
+          [ munge_hook ].flatten.each do |munge|
+            value =
+              if Proc === munge
+                __trait_evaluate value, &munge
+              else
+                value.send munge
+              end
+          end
+        end
+        if type_hook
+          [ type_hook ].flatten.each do |type|
+            is_valid =
+              if Proc === type
+                __trait_evaluate(value, &type) === value
+              else
+                type === value
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        if ducktype_hook
+          [ ducktype_hook ].flatten.each do |ducktype|
+            is_valid =
+              if Proc === ducktype
+                value.respond_to? __trait_evaluate(value, &ducktype)
+              else
+                value.respond_to? ducktype
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        if validate_hook
+          [ validate_hook ].flatten.each do |validate|
+            is_valid =
+              if Proc === validate
+                __trait_evaluate value, &validate
+              else
+                send "\#{ validate }", value
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        @#{ name } = value
+        #@________#{ name }_set = true
+        if post_hook
+          [ post_hook ].flatten.each do |post|
+            if Proc === post
+              case post.arity
+                when 0
+                  __trait_evaluate &post
+                when 1
+                  __trait_evaluate value, &post
+                else
+                  __trait_evaluate "#{ name }", value, &post
+              end
+            else
+              case method("\#{ post }").arity
+                when 0
+                  send "\#{ post }"
+                when 1
+                  send "\#{ post }", value
+                else
+                  send "\#{ post }", "#{ name }", value
+              end
+            end
+          end
+        end
+        @#{ name }
+      end
+      #{ access_protection } '#{ name }='.intern
+    code
+    puts writer_code if Traits::DEBUG
+    writer_code
+#--}}}
+  end
   def __trait_gen_access_protection_code name, access_protection = nil
 #--{{{
     access_protection ||= 'public'
@@ -661,7 +869,7 @@ class Module
         else
           "public '#{ name }'.intern"
       end
-    puts access_protection_code if $__TRAIT_DEBUG__
+    puts access_protection_code if Traits::DEBUG
     access_protection_code
 #--}}}
   end
@@ -676,8 +884,8 @@ module TraitInit
       args, opts = argv.partition{|arg| not Hash === arg}
       args.flatten!
       opts = opts.inject({}){|h,h2| h.update h2}
-      msgs = r_traits
-      args.each{|arg| send msgs.shift, v}
+      msgs = self.class.r_traits
+      args.each{|arg| send msgs.shift, arg}
       opts.each do |k,v|
         k = "#{ k }"
         if respond_to? k
@@ -711,3 +919,44 @@ module TraitInit
   end
 #--}}}
 end
+class OpenTraits
+#--{{{
+  def initialize h = {}, &b
+    h.each{|k,v| trait k => v}
+    instance_eval &b if b
+  end
+  def method_missing m, *a, &b
+    m = m.to_s.delete '='
+    unless respond_to? m
+      if a.empty?
+        b ? trait(m, &b) : trait(m)
+      else
+        b ? trait(m => a.shift, &b) : trait(m => a.shift)
+      end
+    end
+    send m
+  end
+  def to_hash
+    rtraits.inject({}){|h,t| h.update t => send(t)}
+  end
+  alias_method "to_h", "to_hash"
+  def to_s *a, &b
+    to_hash.to_s *a, &b
+  end
+  def inspect *a, &b
+    to_hash.inspect *a, &b
+  end
+  def to_yaml *a, &b
+    to_hash.to_yaml *a, &b
+  end
+#--}}}
+end
+def OpenTraits(*a, &b) OpenTraits::new(*a, &b) end
+def opentraits(*a, &b) OpenTraits::new(*a, &b) end
+def otraits(*a, &b) OpenTraits::new(*a, &b) end

data/lib/traits.rb CHANGED

@@ -1,5 +1,9 @@
-$__TRAIT_DEBUG__ = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
-$__TRAIT_VERSION__ = "0.9.1"
+module Traits
+#--{{{
+  VERSION = "0.10.0"
+  DEBUG = ENV['__TRAIT_DEBUG__'] || ENV['TRAIT_DEBUG'] || ENV['DEBUG']
+#--}}}
+end
 class Object
 #--{{{
@@ -61,6 +65,7 @@ class Object
     ducktype = nil
     default = nil
     names_and_defaults = nil
+    toggle = nil
     if block and not block.respond_to? :__trait_default
       block.__trait_singleton_class.class_eval{ attr '__trait_default' }
@@ -77,6 +82,7 @@ class Object
     type = __trait_getopt(opts, 'type', __trait_getopt(opts, 'case'))
     ducktype = __trait_getopt opts, 'ducktype'
     default = __trait_getopt opts, 'default'
+    toggle = __trait_getopt opts, 'toggle'
     list, hashes = list.partition{|arg| not Hash === arg}
     hashes << opts unless opts.empty? # in which case it was not, in fact, opts
@@ -91,7 +97,9 @@ class Object
     # 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 ]
+    #names_and_defaults = Hash[ *names_and_defaults.to_a.map{|k,v| ["#{ k }", v]}.flatten ]
+    h = names_and_defaults
+    h.keys.each{|k| h[k.to_s] = h.delete(k)}
     list.each{|name| names_and_defaults[name] = default}
@@ -105,6 +113,7 @@ class Object
       'ducktype' => ducktype,
       'validate' => validate,
       'post' => post,
+      'toggle' => toggle,
     }
     names_and_hooks = names.inject({}){|h, name| h.update name => hooks}
@@ -202,6 +211,8 @@ class Object
       reader_trait
       r_traits
       r_trait
+      rtraits
+      rtrait
       has_readers
       has_reader
       has_r
@@ -212,6 +223,8 @@ class Object
       writer_trait
       w_traits
       w_trait
+      wtraits
+      wtrait
       has_writers
       has_writer
       has_w
@@ -230,6 +243,7 @@ class Object
     end
 #--}}}
 end
 class Class
 #--{{{
   def __trait_singleton_super
@@ -240,6 +254,7 @@ class Class
   end
 #--}}}
 end
 class Module
 #--{{{
@@ -248,7 +263,7 @@ class Module
     begin
       module_eval(*a, &b)
     rescue Exception => e
-      STDERR.puts([a, b].inspect) if $__TRAIT_DEBUG__
+      STDERR.puts([a, b].inspect) if Traits::DEBUG
       raise
     end
 #--}}}
@@ -388,6 +403,7 @@ class Module
       getter = "#{ name }"
       setter = "#{ name }="
       query = "#{ name }?"
+      toggle = "#{ name }!"
       defaults[getter] = default if default
       list['readers'] << getter
@@ -406,6 +422,10 @@ class Module
         code = __trait_gen_query_code name, 'public'
         __trait_module_eval code
       end
+      unless instance_methods.include? toggle
+        code = __trait_gen_toggle_code name, 'private'
+        __trait_module_eval code
+      end
 #--}}}
   end
@@ -414,6 +434,7 @@ class Module
       reader = "#{ name }"
       writer = "#{ name }="
       query = "#{ name }?"
+      toggle = "#{ name }!"
       defaults[reader] = default if default
       list['writers'] << writer
@@ -432,6 +453,10 @@ class Module
         code = __trait_gen_query_code name, 'private'
         __trait_module_eval code
       end
+      unless instance_methods.include? toggle
+        code = __trait_gen_toggle_code name, 'public'
+        __trait_module_eval code
+      end
 #--}}}
   end
@@ -454,7 +479,8 @@ class Module
         unless a.empty?
           send('#{ name }=', *a, &b)
         else
-          unless(defined?(@________#{ name }_set) and @________#{ name }_set)
+          #unless(defined?(@________#{ name }_set) and @________#{ name }_set)
+          unless defined? @#{ name }
             #{ klass }::__trait_search_path.each do |obj|
                 defaults = obj.#{ defaults }
                 if defaults.has_key? '#{ name }'
@@ -485,7 +511,7 @@ class Module
       end
       #{ access_protection } '#{ name }'.intern
     code
-    puts reader_code if $__TRAIT_DEBUG__
+    puts reader_code if Traits::DEBUG
     reader_code
 #--}}}
   end
@@ -601,7 +627,7 @@ class Module
         @#{ name } = value
-        @________#{ name }_set = true
+        #@________#{ name }_set = true
         if post_hook
           [ post_hook ].flatten.each do |post|
@@ -631,7 +657,7 @@ class Module
       end
       #{ access_protection } '#{ name }='.intern
     code
-    puts writer_code if $__TRAIT_DEBUG__
+    puts writer_code if Traits::DEBUG
     writer_code
 #--}}}
   end
@@ -644,11 +670,193 @@ class Module
       end
       # #{ access_protection } '#{ name }?'.intern
     code
-    puts query_code if $__TRAIT_DEBUG__
+    puts query_code if Traits::DEBUG
     query_code
 #--}}}
   end
+  def __trait_gen_toggle_code name, access_protection = 'public'
+#--{{{
+    s = __trait_singleton?
+    klass = s ? 'self' : 'self.class'
+    hooks = s ? '__trait_singleton_method_hooks' : '__trait_instance_method_hooks'
+    writer_code = <<-code
+      def #{ name }!
+        hooks = {}
+        hook_types = %w( pre munge cast type ducktype validate post toggle )
+        #{ 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, toggle_hook =
+          hooks.values_at(*hook_types)
+        toggle =
+          if defined? @________#{ name }_toggle
+            @________#{ name }_toggle
+          else
+            if toggle_hook
+              case toggle_hook
+                when Proc
+                  t = Object.new
+                  sc = class << t
+                    self
+                  end
+                  sc.module_eval{
+                    define_method 'shift' do
+                      toggle_hook.call
+                    end
+                    define_method 'push' do
+                    end
+                  }
+                  t
+                when Enumerable
+                  toggle_hook.to_a
+                when NilClass, TrueClass
+                  @________#{ name }_toggle = [true, false]
+                else
+                  if toggle_hook.respond_to?('shift') and toggle_hook.respond_to?('push')
+                    toggle_hook
+                  else
+                    raise "bad toggle <\#{ toggle_hook.inspect }>"
+                  end
+              end
+            else
+              @________#{ name }_toggle = [true, false]
+            end
+          end
+        value = toggle.shift
+        toggle.push value
+        if pre_hook
+          [ pre_hook ].flatten.each do |pre|
+            if Proc === pre
+              case pre.arity
+                when 0
+                  __trait_evaluate &pre
+                when 1
+                  __trait_evaluate value, &pre
+                else
+                  __trait_evaluate "#{ name }", value, &pre
+              end
+            else
+              case method("\#{ pre }").arity
+                when 0
+                  send "\#{ pre }"
+                when 1
+                  send "\#{ pre }", value
+                else
+                  send "\#{ pre }", "#{ name }", value
+              end
+            end
+          end
+        end
+        if cast_hook
+          [ cast_hook ].flatten.each do |cast|
+            value =
+              if Proc === cast
+                __trait_evaluate value, &cast
+              else
+                send cast, value
+              end
+          end
+        end
+        if munge_hook
+          [ munge_hook ].flatten.each do |munge|
+            value =
+              if Proc === munge
+                __trait_evaluate value, &munge
+              else
+                value.send munge
+              end
+          end
+        end
+        if type_hook
+          [ type_hook ].flatten.each do |type|
+            is_valid =
+              if Proc === type
+                __trait_evaluate(value, &type) === value
+              else
+                type === value
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        if ducktype_hook
+          [ ducktype_hook ].flatten.each do |ducktype|
+            is_valid =
+              if Proc === ducktype
+                value.respond_to? __trait_evaluate(value, &ducktype)
+              else
+                value.respond_to? ducktype
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        if validate_hook
+          [ validate_hook ].flatten.each do |validate|
+            is_valid =
+              if Proc === validate
+                __trait_evaluate value, &validate
+              else
+                send "\#{ validate }", value
+              end
+            raise ArgumentError,
+              "validation of <\#{ value.inspect }> failed!" unless is_valid
+          end
+        end
+        @#{ name } = value
+        #@________#{ name }_set = true
+        if post_hook
+          [ post_hook ].flatten.each do |post|
+            if Proc === post
+              case post.arity
+                when 0
+                  __trait_evaluate &post
+                when 1
+                  __trait_evaluate value, &post
+                else
+                  __trait_evaluate "#{ name }", value, &post
+              end
+            else
+              case method("\#{ post }").arity
+                when 0
+                  send "\#{ post }"
+                when 1
+                  send "\#{ post }", value
+                else
+                  send "\#{ post }", "#{ name }", value
+              end
+            end
+          end
+        end
+        @#{ name }
+      end
+      #{ access_protection } '#{ name }='.intern
+    code
+    puts writer_code if Traits::DEBUG
+    writer_code
+#--}}}
+  end
   def __trait_gen_access_protection_code name, access_protection = nil
 #--{{{
     access_protection ||= 'public'
@@ -661,7 +869,7 @@ class Module
         else
           "public '#{ name }'.intern"
       end
-    puts access_protection_code if $__TRAIT_DEBUG__
+    puts access_protection_code if Traits::DEBUG
     access_protection_code
 #--}}}
   end
@@ -676,8 +884,8 @@ module TraitInit
       args, opts = argv.partition{|arg| not Hash === arg}
       args.flatten!
       opts = opts.inject({}){|h,h2| h.update h2}
-      msgs = r_traits
-      args.each{|arg| send msgs.shift, v}
+      msgs = self.class.r_traits
+      args.each{|arg| send msgs.shift, arg}
       opts.each do |k,v|
         k = "#{ k }"
         if respond_to? k
@@ -711,3 +919,44 @@ module TraitInit
   end
 #--}}}
 end
+class OpenTraits
+#--{{{
+  def initialize h = {}, &b
+    h.each{|k,v| trait k => v}
+    instance_eval &b if b
+  end
+  def method_missing m, *a, &b
+    m = m.to_s.delete '='
+    unless respond_to? m
+      if a.empty?
+        b ? trait(m, &b) : trait(m)
+      else
+        b ? trait(m => a.shift, &b) : trait(m => a.shift)
+      end
+    end
+    send m
+  end
+  def to_hash
+    rtraits.inject({}){|h,t| h.update t => send(t)}
+  end
+  alias_method "to_h", "to_hash"
+  def to_s *a, &b
+    to_hash.to_s *a, &b
+  end
+  def inspect *a, &b
+    to_hash.inspect *a, &b
+  end
+  def to_yaml *a, &b
+    to_hash.to_yaml *a, &b
+  end
+#--}}}
+end
+def OpenTraits(*a, &b) OpenTraits::new(*a, &b) end
+def opentraits(*a, &b) OpenTraits::new(*a, &b) end
+def otraits(*a, &b) OpenTraits::new(*a, &b) end

data/sample/i.rb CHANGED

@@ -18,6 +18,7 @@ class C
     p r?
     self.r = 42
     p r
+    p r?
   end
 end
 C::new.using_private_writer_and_query
@@ -31,6 +32,7 @@ class D
     p w?
     self.w = 'forty-two'
     p w
+    p w?
   end
 end
 D::new.using_private_reader

data/sample/p.rb CHANGED

@@ -19,5 +19,5 @@ class C
 end
 c = C::new "li" => [4, 2], "ls" => %w[4 2]
-p c.li.join
-p c.ls.join
+p c.li
+p c.ls

data/sample/q.rb ADDED

@@ -0,0 +1,24 @@
+require 'traits'
+#
+# the OpenTraits class is similar to an OpenStruct but, imho, easier to use.
+# the otraits shorthand can be used to contruct one
+#
+#
+# options passed as args dynamically create and init traits
+#
+  config = otraits :port => 42
+  p config.port
+#
+# any passed block does the same but, via a method missing hood and traits
+# getter/setters, the syntax is very clean
+#
+  config = otraits{
+    port 42
+    host 'forty-two'
+  }
+  p config.port
+  p config.host
+  config.username 'zaphod'
+  p config

data/traits-0.10.0.gem ADDED

File without changes

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: traits
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-date: 2006-06-01 00:00:00.000000 -06:00
+  version: 0.10.0
+date: 2006-10-05 00:00:00.000000 -06:00
 summary: traits
 require_paths:
   - lib
@@ -36,8 +36,9 @@ files:
   - README.tmpl
   - gen_readme.rb
   - gemspec.rb
+  - traits-0.10.0.gem
   - lib/traits.rb
-  - lib/traits-0.9.1.rb
+  - lib/traits-0.10.0.rb
   - sample/a.rb
   - sample/b.rb
   - sample/c.rb
@@ -53,6 +54,7 @@ files:
   - sample/m.rb
   - sample/n.rb
   - sample/p.rb
+  - sample/q.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []