named_value_class 0.5.0 → 0.6.0

data/lib/named_value_class.rb

@@ -1,6 +1,9 @@
 require 'delegate'
 
-def NamedValueClass(klass_name,superclass,&block)
+# see README for documention
+def NamedValueClass(attrs={},&block)
+  klass_name, superclass = attrs.first
+  attrs.delete(klass_name)
   target = (self.class == Object ? Kernel : self)
   
   target.module_eval "class #{klass_name} < DelegateClass(superclass); end"
@@ -9,20 +12,33 @@ def NamedValueClass(klass_name,superclass,&block)
   klass.module_eval do
     def self.inherited(child)
       super
-      this = self
-      const_get(self.to_s.sub(/::.+/,'')).instance_eval do
-        define_method child.to_s do |name,value,attrs={}|
-          begin
-            const_get(name) || const_get("NameError_#{name}")
-          rescue NameError #=> e
-            child.new(name,value,attrs)
+      code = proc do |attrs={}|
+        name, value = attrs.first
+        begin
+          const_get(name) || const_get("NameError_#{name}")
+        rescue NameError #=> e
+          child.new(attrs)
+        end
+      end
+      if (mod = const_get(self.to_s.sub(/::.+$/,''))) == Kernel
+        mod.instance_eval do
+          define_method child.to_s.sub(/^.+::/,''), &code
+        end
+      else
+        to_s.split(/::/)[0..-2].inject(Kernel) do |m,e|
+          m.const_get(e)
+        end.instance_eval do
+          module_eval do
+            define_singleton_method child.to_s.sub(/^.+::/,''), &code
           end
         end
       end
     end
   
-    def initialize(name,value,attrs = {})
-      @name = name.to_s
+    def initialize(attrs = {})
+      @name, value = attrs.first
+      attrs.delete(@name)
+      @name = @name.to_s
       super(value)
       
       attrs.each do |(attr,val)|
@@ -114,11 +130,12 @@ def NamedValueClass(klass_name,superclass,&block)
     end
   EVAL
   
-  define_singleton_method klass_name do |name,value,attrs={}| 
+  define_singleton_method klass_name do |attrs={}| 
+    name, value = attrs.first
     begin
       klass.const_get(name) || klass.const_get("NameError_#{name}")
     rescue NameError #=> e
-      klass.new(name,value,attrs)
+      klass.new(attrs)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: named_value_class
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,8 +11,8 @@ bindir: bin
 cert_chain: []
 date: 2011-11-18 00:00:00.000000000Z
 dependencies: []
-description: Quickly add class delegate constants which output their names, not their
-  values.  This may be desirable for some DSLs.
+description: Quickly add customizable class delegate constants which output their
+  names, not their values.  This may be desirable for some DSLs.
 email: mgarriss@gmail.com
 executables: []
 extensions: []
@@ -42,6 +42,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Quickly add class delegate constants which output their names, not their
-  values.  This may be desirable for some DSLs.
+summary: Quickly add customizable class delegate constants which output their names,
+  not their values.  This may be desirable for some DSLs.
 test_files: []