named_value_class 0.4.0 → 0.4.1

data/lib/named_value_class.rb

@@ -25,21 +25,25 @@ def NamedValueClass(klass_name,superclass, &block)
         named_values_module.const_set(@name, self)
       rescue NameError
         name_error_name = "NameError_#{@name}"
-        self.class.const_set(name_error_name, self)
-        named_values_module.const_set(name_error_name, self)
-        self.class.class_eval <<-EVAL
-          def self.#{@name}()
-            #{name_error_name}
-          end
-        EVAL
-        named_values_module.module_eval <<-EVAL
-          def self.#{@name}()
-            #{name_error_name}
-          end
-          def #{@name}()
-            #{name_error_name}
-          end
-        EVAL
+        begin
+          self.class.const_get(name_error_name)
+        rescue NameError
+          self.class.const_set(name_error_name, self)
+          named_values_module.const_set(name_error_name, self)
+          self.class.class_eval <<-EVAL
+            def self.#{@name}()
+              #{name_error_name}
+            end
+          EVAL
+          named_values_module.module_eval <<-EVAL
+            def self.#{@name}()
+              #{name_error_name}
+            end
+            def #{@name}()
+              #{name_error_name}
+            end
+          EVAL
+        end
       end
       
       this = self
@@ -83,7 +87,11 @@ def NamedValueClass(klass_name,superclass, &block)
   EVAL
   
   define_singleton_method klass_name do |name,value,attrs={}| 
-    klass.const_get(name) rescue klass.new(name,value,attrs)
+    begin
+      klass.const_get(name) || klass.const_get("NameError_#{name}")
+    rescue NameError #=> e
+      klass.new(name,value,attrs)
+    end
   end
   
   klass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: named_value_class
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-17 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.