renum 0.0.1 → 0.0.3

data/Manifest.txt

@@ -7,6 +7,7 @@ config/hoe.rb
 config/requirements.rb
 lib/renum.rb
 lib/renum/enumerated_value.rb
+lib/renum/enumerated_value_type_factory.rb
 lib/renum/version.rb
 log/debug.log
 script/destroy

data/lib/renum.rb

@@ -1,15 +1,14 @@
 $:.unshift File.dirname(__FILE__)
-require 'renum/enumerated_value'
+require 'renum/enumerated_value_type_factory'
 
 module Renum
   def enum type_name, values, &block
-    klass = Class.new EnumeratedValue
-    Object.const_set(type_name, klass)
-    klass.class_eval &block if block_given?
-    values.each do |name|
-      klass.const_set(name, klass.new(name))
-    end
+    nest = self.is_a?(Module) ? self : Object
+    EnumeratedValueTypeFactory.create(nest, type_name, values, &block)
   end
 end
 
 extend Renum
+Module.module_eval do
+  include Renum
+end

data/lib/renum/enumerated_value.rb

@@ -13,6 +13,7 @@ module Renum
       
     end
     
+    include Comparable
     attr_reader :name
     
     def initialize name
@@ -28,5 +29,9 @@ module Renum
       self.class.values.index self
     end
     
+    def <=> other
+      index <=> other.index
+    end
+    
   end
 end

data/lib/renum/enumerated_value_type_factory.rb

@@ -0,0 +1,15 @@
+require 'renum/enumerated_value'
+
+module Renum
+  module EnumeratedValueTypeFactory
+    def create nest, type_name, values, &block
+      klass = Class.new EnumeratedValue
+      nest.const_set(type_name, klass)
+      klass.class_eval &block if block_given?
+      values.each do |name|
+        klass.const_set(name, klass.new(name))
+      end
+    end
+    module_function :create
+  end
+end

data/lib/renum/version.rb

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

data/spec/renum_spec.rb

@@ -9,6 +9,10 @@ enum :Color, [ :RED, :GREEN, :BLUE ] do
   end
 end
 
+module MyNamespace
+  enum :FooValue, [ :Bar, :Baz, :Bat ]
+end
+
 describe "enum" do
   
   it "creates a class for the value type" do
@@ -45,4 +49,12 @@ describe "enum" do
     Status::NOT_STARTED.to_s.should == "Status::NOT_STARTED"
   end
   
+  it "makes values comparable" do
+    Color::RED.should < Color::GREEN
+  end
+  
+  it "allows enums to be nested in other modules or classes" do
+    MyNamespace::FooValue::Bar.class.should == MyNamespace::FooValue
+  end
+  
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>renum</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/renum"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/renum" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/renum" class="numbers">0.0.3</a>
     </div>
     <h1>&#x2192; &#8216;renum&#8217;</h1>
 
@@ -53,19 +53,19 @@
 	<h2>Demonstration of usage</h2>
 
 
-	<p>Renum allows you to do something like this:</p>
+	<p>Renum allows you to do things like this:</p>
 
 
-	<p><pre class='syntax'><span class="ident">enum</span> <span class="symbol">:Status</span><span class="punct">,</span> <span class="punct">[</span> <span class="symbol">:NOT_STARTED</span><span class="punct">,</span> <span class="symbol">:IN_PROGRESS</span><span class="punct">,</span> <span class="symbol">:COMPLETE</span> <span class="punct">]</span></pre></p>
+	<p><pre class='syntax'><span class="ident">enum</span> <span class="symbol">:Status</span><span class="punct">,</span> <span class="punct">[</span> <span class="symbol">:NOT_STARTED</span><span class="punct">,</span> <span class="symbol">:IN_PROGRESS</span><span class="punct">,</span> <span class="symbol">:COMPLETE</span> <span class="punct">]</span>
 
-
-	<p>and this:</p>
-
-
-	<p><pre class='syntax'><span class="ident">enum</span> <span class="symbol">:Color</span><span class="punct">,</span> <span class="punct">[</span> <span class="symbol">:RED</span><span class="punct">,</span> <span class="symbol">:GREEN</span><span class="punct">,</span> <span class="symbol">:BLUE</span> <span class="punct">]</span> <span class="keyword">do</span>
+<span class="ident">enum</span> <span class="symbol">:Color</span><span class="punct">,</span> <span class="punct">[</span> <span class="symbol">:RED</span><span class="punct">,</span> <span class="symbol">:GREEN</span><span class="punct">,</span> <span class="symbol">:BLUE</span> <span class="punct">]</span> <span class="keyword">do</span>
   <span class="keyword">def </span><span class="method">abbr</span>
     <span class="ident">name</span><span class="punct">[</span><span class="number">0</span><span class="punct">..</span><span class="number">0</span><span class="punct">]</span>
   <span class="keyword">end</span>
+<span class="keyword">end</span>
+
+<span class="keyword">module </span><span class="module">MyNamespace</span>
+  <span class="ident">enum</span> <span class="symbol">:FooValue</span><span class="punct">,</span> <span class="punct">[</span> <span class="symbol">:Bar</span><span class="punct">,</span> <span class="symbol">:Baz</span><span class="punct">,</span> <span class="symbol">:Bat</span> <span class="punct">]</span>
 <span class="keyword">end</span></pre></p>
 
 
@@ -108,6 +108,14 @@
     <span class="constant">Status</span><span class="punct">::</span><span class="constant">NOT_STARTED</span><span class="punct">.</span><span class="ident">to_s</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="punct">&quot;</span><span class="string">Status::NOT_STARTED</span><span class="punct">&quot;</span>
   <span class="keyword">end</span>
   
+  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">makes values comparable</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+    <span class="constant">Color</span><span class="punct">::</span><span class="constant">RED</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">&lt;</span> <span class="constant">Color</span><span class="punct">::</span><span class="constant">GREEN</span>
+  <span class="keyword">end</span>
+  
+  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">allows enums to be nested in other modules or classes</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+    <span class="constant">MyNamespace</span><span class="punct">::</span><span class="constant">FooValue</span><span class="punct">::</span><span class="constant">Bar</span><span class="punct">.</span><span class="ident">class</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="constant">MyNamespace</span><span class="punct">::</span><span class="constant">FooValue</span>
+  <span class="keyword">end</span>
+  
 <span class="keyword">end</span></pre></p>
 
 

data/website/index.txt

@@ -15,16 +15,18 @@ h2. Installing
 
 h2. Demonstration of usage
 
-Renum allows you to do something like this:
+Renum allows you to do things like this:
 
-<pre syntax="ruby">enum :Status, [ :NOT_STARTED, :IN_PROGRESS, :COMPLETE ]</pre>
+<pre syntax="ruby">enum :Status, [ :NOT_STARTED, :IN_PROGRESS, :COMPLETE ]
 
-and this:
-
-<pre syntax="ruby">enum :Color, [ :RED, :GREEN, :BLUE ] do
+enum :Color, [ :RED, :GREEN, :BLUE ] do
   def abbr
     name[0..0]
   end
+end
+
+module MyNamespace
+  enum :FooValue, [ :Bar, :Baz, :Bat ]
 end</pre>
 
 Giving you something that satisfies this spec:
@@ -65,6 +67,14 @@ Giving you something that satisfies this spec:
     Status::NOT_STARTED.to_s.should == "Status::NOT_STARTED"
   end
   
+  it "makes values comparable" do
+    Color::RED.should < Color::GREEN
+  end
+  
+  it "allows enums to be nested in other modules or classes" do
+    MyNamespace::FooValue::Bar.class.should == MyNamespace::FooValue
+  end
+  
 end</pre>
 
 h2. License

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: renum
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 date: 2007-11-02 00:00:00 -04:00
 summary: Renum is a Ruby enum implementation
 require_paths: 
@@ -38,6 +38,7 @@ files:
 - config/requirements.rb
 - lib/renum.rb
 - lib/renum/enumerated_value.rb
+- lib/renum/enumerated_value_type_factory.rb
 - lib/renum/version.rb
 - log/debug.log
 - script/destroy