duelinmarkers-renum 1.0.2 → 1.1.0

data/README.textile

@@ -115,6 +115,25 @@ h2. License
 
 This code is free to use under the terms of the MIT license. 
 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 h2. Contact
 
 Renum was created by John D. Hume. Comments are welcome. Send an email to duelin dot markers at gmail or "contact me via my blog":http://elhumidor.blogspot.com/.

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/renum/enumerated_value_type_factory.rb

@@ -18,9 +18,10 @@ module Renum
         setup_for_definition_in_block(klass) if values == :defined_in_block
         klass.class_eval &block if block_given?
         if values == :defined_in_block
-          klass.block_defined_values.each do |value_name, init_args|
+          klass.block_defined_values.each do |value_name, init_args, instance_block|
             value = klass.new(value_name)
             klass.const_set(value_name, value)
+            value.instance_eval &instance_block if instance_block
             value.init *init_args if init_args.any?
           end
           teardown_from_definition_in_block(klass)
@@ -37,8 +38,8 @@ module Renum
             @block_defined_values ||= []
           end
 
-          def self.method_missing value_name, *init_args
-            block_defined_values << [value_name, init_args]
+          def self.method_missing value_name, *init_args, &instance_block
+            block_defined_values << [value_name, init_args, instance_block]
           end
         end
       end

data/renum.gemspec

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{renum}
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Hume"]
+  s.date = %q{2009-07-07}
+  s.description = %q{provides a readable but terse enum facility for Ruby}
+  s.email = %q{duelin.markers@gmail.com}
+  s.extra_rdoc_files = [
+    "README.textile"
+  ]
+  s.files = [
+    "README.textile",
+     "Rakefile",
+     "VERSION",
+     "lib/renum.rb",
+     "lib/renum/enumerated_value.rb",
+     "lib/renum/enumerated_value_type_factory.rb",
+     "renum.gemspec",
+     "spec/renum_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/duelinmarkers/renum}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{provides a readable but terse enum facility for Ruby}
+  s.test_files = [
+    "spec/renum_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/spec/renum_spec.rb

@@ -2,34 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 enum :Status, [ :NOT_STARTED, :IN_PROGRESS, :COMPLETE ]
 
-module MyNamespace
-  enum :FooValue, %w( Bar Baz Bat )
-end
-
-enum :Color, [ :RED, :GREEN, :BLUE ] do
-  def abbr
-    name[0..0]
-  end
-end
-
-enum :Size do
-  Small("Really really tiny")
-  Medium("Sort of in the middle")
-  Large("Quite big")
-
-  attr_reader :description
-
-  def init description
-    @description = description
-  end
-end
-
-enum :HairColor do
-  BLONDE()
-  BRUNETTE()
-  RED()
-end
-
 describe "basic enum" do
   
   it "creates a class for the value type" do
@@ -67,18 +39,46 @@ describe "basic enum" do
   end
 end
 
+module MyNamespace
+  enum :FooValue, %w( Bar Baz Bat )
+end
+
 describe "nested enum" do
   it "is namespaced in the containing module or class" do
     MyNamespace::FooValue::Bar.class.should == MyNamespace::FooValue
   end
 end
 
+enum :Color, [ :RED, :GREEN, :BLUE ] do
+  def abbr
+    name[0..0]
+  end
+end
+
 describe "enum with a block" do
   it "can define additional instance methods" do
     Color::RED.abbr.should == "R"
   end
 end
 
+enum :Size do
+  Small("Really really tiny")
+  Medium("Sort of in the middle")
+  Large("Quite big")
+
+  attr_reader :description
+
+  def init description
+    @description = description
+  end
+end
+
+enum :HairColor do
+  BLONDE()
+  BRUNETTE()
+  RED()
+end
+
 describe "enum with no values array and values declared in the block" do
   it "provides an alternative means of declaring values where extra information can be provided for initialization" do
     Size::Small.description.should == "Really really tiny"
@@ -97,12 +97,50 @@ describe "enum with no values array and values declared in the block" do
   end
 end
 
-# It was reported on my blog that <=> was causing segfaults.
-# I'd love to figure out why, but first I'd love to fix that. 
-describe "digging into this segfault/illegal instruction issue, renum" do
+enum :Rating do
+  NotRated()
+  
+  ThumbsDown do
+    def description
+      "real real bad"
+    end
+  end
+  
+  ThumbsUp do
+    def description
+      "so so good"
+    end
+    
+    def thumbs_up_only_method
+      "this method is only defined on ThumbsUp"
+    end
+  end
+  
+  def description
+    raise NotImplementedError
+  end
+end
+
+describe "an enum with instance-specific method definitions" do
+  it "allows each instance to have its own behavior" do
+    Rating::ThumbsDown.description.should == "real real bad"
+    Rating::ThumbsUp.description.should == "so so good"
+  end
+  
+  it "uses the implementation given at the top level if no alternate definition is given for an instance" do
+    lambda { Rating::NotRated.description }.should raise_error(NotImplementedError)
+  end
+  
+  it "allows definition of a method on just one instance" do
+    Rating::ThumbsUp.thumbs_up_only_method.should == "this method is only defined on ThumbsUp"
+    lambda { Rating::NotRated.thumbs_up_only_method }.should raise_error(NoMethodError)
+  end
+end
+
+describe "<=> comparison issue that at one time was causing segfaults on MRI" do
   it "doesn't cause the ruby process to bomb!" do
     Color::RED.should < Color::GREEN
     Color::RED.should_not > Color::GREEN
     Color::RED.should < Color::BLUE
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: duelinmarkers-renum
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - John Hume
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -07:00
+date: 2009-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,14 +22,13 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- License.txt
 - README.textile
 - Rakefile
 - VERSION
 - lib/renum.rb
 - lib/renum/enumerated_value.rb
 - lib/renum/enumerated_value_type_factory.rb
-- lib/renum/version.rb
+- renum.gemspec
 - spec/renum_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2007 John D. Hume
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/renum/version.rb

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