classy_enum 0.7.0 → 0.7.1

data/Gemfile

@@ -2,6 +2,10 @@ source :rubygems
 
 gem 'rails', '~> 3.0'
 
+group :development do
+  gem 'jeweler', '1.4.0'
+end
+
 group :test do
   gem 'rspec', '~> 2.0'
   gem 'rspec-rails', '~> 2.0'

data/Gemfile.lock

@@ -39,7 +39,14 @@ GEM
       actionpack (>= 2.3.0)
       activesupport (>= 2.3.0)
       i18n (>= 0.4.0)
+    gemcutter (0.6.1)
+    git (1.2.5)
     i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.5.1)
     linecache (0.43)
     mail (2.2.7)
       activesupport (>= 2.3.6)
@@ -83,6 +90,8 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
     thor (0.14.3)
     treetop (1.4.8)
@@ -94,6 +103,7 @@ PLATFORMS
 
 DEPENDENCIES
   formtastic (~> 1.1)
+  jeweler (= 1.4.0)
   rails (~> 3.0)
   rspec (~> 2.0)
   rspec-rails (~> 2.0)

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/classy_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{classy_enum}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Brown"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-02-06}
   s.description = %q{A utility that adds class based enum functionality to ActiveRecord attributes}
   s.email = %q{github@lette.us}
   s.extra_rdoc_files = [
@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/classy_enum.rb",
      "lib/classy_enum/attributes.rb",
+     "lib/classy_enum/base.rb",
+     "lib/classy_enum/class_methods.rb",
+     "lib/classy_enum/instance_methods.rb",
      "lib/classy_enum/semantic_form_builder.rb",
      "lib/generators/classy_enum/classy_enum_generator.rb",
      "lib/generators/classy_enum/templates/enum.rb",
@@ -42,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/beerlington/classy_enum}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{A class based enumerator utility for Ruby on Rails}
   s.test_files = [
     "spec/classy_enum_attributes_spec.rb",

data/lib/classy_enum/attributes.rb

@@ -18,26 +18,24 @@ module ClassyEnum
     #  class Alarm < ActiveRecord::Base
     #    classy_enum_attr :priority, :alarm_priority
     #  end
-    def classy_enum_attr(klass, method=nil)
+    def classy_enum_attr(enum, attribute=nil)
 
-      method ||= klass
+      attribute ||= enum
 
-      klass = klass.to_s.camelize.constantize
+      klass = enum.to_s.camelize.constantize
 
       self.instance_eval do
 
         # Add ActiveRecord validation to ensure it won't be saved unless it's an option
-        validates_each [method], :allow_nil => true do |record, attr_name, value|
-          record.errors.add(attr_name, "must be one of #{klass.all.map(&:to_sym).join(', ')}") unless klass.all.map(&:to_s).include? value.to_s
-        end
+        validates_inclusion_of attribute, :in => klass.all, :message => "must be one of #{klass.valid_options}"
 
         # Define getter method that returns a ClassyEnum instance
-        define_method method do
+        define_method attribute do
           klass.build(super())
         end
 
         # Define setter method that accepts either string or symbol for member
-        define_method "#{method}=" do |value|
+        define_method "#{attribute}=" do |value|
           super(value.to_s)
         end
 

data/lib/classy_enum/base.rb

@@ -0,0 +1,52 @@
+module ClassyEnum
+
+  class Base
+
+    # Macro for defining enum members within a ClassyEnum class.
+    # Accepts an array of symbols or strings which are converted to
+    # ClassyEnum members as descents of their parent class.
+    #
+    # ==== Example
+    #  # Define an enum called Priority with three child classes
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  The child classes will be defined with the following constants:
+    #  PriorityLow, PriorityMedium, and PriorityHigh
+    #
+    #  These child classes can be instantiated with either:
+    #  Priority.build(:low) or PriorityLow.new
+    #
+    def self.enum_classes(*options)
+      self.const_set("OPTIONS", options) unless self.const_defined? "OPTIONS"
+
+      self.extend ClassyEnum::ClassMethods
+      self.send(:include, ClassyEnum::InstanceMethods)
+      self.send(:include, Comparable)
+
+      options.each_with_index do |option, index|
+
+        klass = Class.new(self) do
+          @index = index + 1
+          @option = option
+
+          def initialize
+            @to_s = self.class.instance_variable_get('@option').to_s
+            @index = self.class.instance_variable_get('@index')
+          end
+
+          # Define methods to test member type (ie member.option?)
+          options.each do |o|
+            self.send(:define_method, "#{o}?", lambda { o == option })
+          end
+
+        end
+
+        klass_name = "#{self}#{option.to_s.camelize}"
+        Object.const_set(klass_name, klass) unless Object.const_defined? klass_name
+      end
+    end
+  end
+
+end

data/lib/classy_enum/class_methods.rb

@@ -0,0 +1,63 @@
+module ClassyEnum
+  module ClassMethods
+
+    # Build a new ClassyEnum child instance
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  Priority.build(:low) # => PriorityLow.new
+    def build(option)
+      return option if option.blank?
+      return TypeError.new("Valid #{self} options are #{self.valid_options}") unless self::OPTIONS.include? option.to_sym
+      Object.const_get("#{self}#{option.to_s.camelize}").new
+    end
+
+    alias :find :build
+
+    # Returns an array of all instantiated enums
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  Priority.all # => [PriorityLow.new, PriorityMedium.new, PriorityHigh.new]
+    def all
+      self::OPTIONS.map {|e| build(e) }
+    end
+
+    # Returns a 2D array for Rails select helper options.
+    # Also used internally for Formtastic support
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :really_high
+    #  end
+    #
+    #  Priority.select_options # => [["Low", "low"], ["Really High", "really_high"]]
+    def select_options
+      all.map {|e| [e.name, e.to_s] }
+    end
+
+    # Returns a comma separated list of valid enum options.
+    # Also used internally for ActiveRecord model validation error messages
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  Priority.valid_options # => "low, medium, high"
+    def valid_options
+      self::OPTIONS.map(&:to_s).join(', ')
+    end
+
+  end
+end

data/lib/classy_enum/instance_methods.rb

@@ -0,0 +1,105 @@
+module ClassyEnum
+  module InstanceMethods
+    # Returns an integer representing the order that this element was defined in.
+    # Also used internally for sorting.
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  @priority = PriorityMedium.new
+    #  @priority.index # => 2
+    def index
+      @index
+    end
+
+    alias :to_i :index
+
+    # Returns the name or string corresponding to element
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  @priority = PriorityLow.new
+    #  @priority.to_s # => 'low'
+    def to_s
+      @to_s
+    end
+
+    # Returns a Symbol corresponding to a string representation of element,
+    # creating the symbol if it did not previously exist
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  @priority = PriorityLow.new
+    #  @priority.to_sym # => :low
+    def to_sym
+      @to_s.to_sym
+    end
+
+    # Returns string representing enum in Rails titleize format
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high, :really_high
+    #  end
+    #
+    #  @priority = Priority.build(:really_high)
+    #  @priority.name # => "Really High"
+    def name
+      @to_s.titleize
+    end
+
+    # Sort an array of elements based on the order they are defined
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Priority < ClassyEnum::Base
+    #    enum_classes :low, :medium, :high
+    #  end
+    #
+    #  @low = Priority.build(:low)
+    #  @medium = Priority.build(:medium)
+    #  @high = Priority.build(:high)
+    #  priorities = [@low, @high, @medium]
+    #  priorities.sort # => [@low, @medium, @high]
+    #  priorities.max # => @high
+    #  priorities.min # => @low
+    def <=> other
+      @index <=> other.index
+    end
+
+    # Determine if the enum attribute is a particular member.
+    # Accepts a symbol or string representing a member
+    #
+    # ==== Example
+    #  # Create an Enum with some elements
+    #  class Breed < ClassyEnum::Base
+    #    enum_classes :golden_retriever, :snoop
+    #  end
+    #
+    #  # Create an ActiveRecord class using the Breed enum
+    #  class Dog < ActiveRecord::Base
+    #    classy_enum_attr :breed
+    #  end
+    #
+    #  @dog = Dog.new(:breed => :snoop)
+    #  @dog.breed.is? :snoop # => true
+    #  @dog.breed.is? 'snoop' # => true
+    #  @dog.breed.is? :golden_retriever # => false
+    def is?(obj)
+      obj.to_s == to_s
+    end
+
+  end
+end

data/lib/classy_enum/semantic_form_builder.rb

@@ -7,7 +7,7 @@ module ClassyEnum
         enum_class = (options[:enum_class] || method).to_s.classify.constantize rescue Error.invalid_classy_enum_object(method)
         options[:collection] = enum_class.select_options
       else
-        Error.invalid_classy_enum_object unless enum_class.respond_to? :enum_classes
+        Error.invalid_classy_enum_object(method) unless enum_class.is_a? ClassyEnum::Base
         options[:collection] = enum_class.class.superclass.select_options
         options[:selected] = enum_class.to_s
       end
@@ -20,7 +20,7 @@ module ClassyEnum
 
   module Error # :nodoc: all
     def self.invalid_classy_enum_object(method)
-      raise "#{method} is not a ClassyEnum object"
+      raise "#{method} is not a ClassyEnum object. Make sure you've added 'classy_enum_attr :#{method}' to your model"
     end
   end
 end

data/lib/classy_enum.rb

@@ -1,179 +1,9 @@
+require "classy_enum/base"
+require "classy_enum/class_methods"
+require "classy_enum/instance_methods"
 require "classy_enum/attributes"
 
 if Gem.available? 'formtastic'
   require 'formtastic'
   require 'classy_enum/semantic_form_builder'
 end
-
-module ClassyEnum
-
-  class Base
-
-    # Macro for defining enum members within a ClassyEnum class.
-    # Accepts an array of symbols or strings which are converted to
-    # ClassyEnum members as descents of their parent class.
-    #
-    # ==== Example
-    #  # Define an enum called Priority with three child classes
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high
-    #  end
-    #
-    #  The child classes will be defined with the following constants:
-    #  PriorityLow, PriorityMedium, and PriorityHigh
-    #
-    #  These child classes can be instantiated with either:
-    #  Priority.build(:low) or PriorityLow.new
-    #
-    def self.enum_classes(*options)
-      self.send(:attr_reader, :enum_classes)
-
-      self.const_set("OPTIONS", options) unless self.const_defined? "OPTIONS"
-
-      self.extend ClassMethods
-
-      options.each_with_index do |option, index|
-
-        klass = Class.new(self) do
-          include InstanceMethods
-
-          attr_reader :to_s, :to_sym, :index
-
-          @index = index + 1
-          @option = option
-
-          def initialize
-            @to_s = self.class.instance_variable_get('@option').to_s
-            @to_sym = @to_s.to_sym
-            @index = self.class.instance_variable_get('@index')
-          end
-
-        end
-
-        klass_name = "#{self}#{option.to_s.camelize}"
-        Object.const_set(klass_name, klass) unless Object.const_defined? klass_name
-      end
-    end
-  end
-
-  module ClassMethods
-
-    # Build a new ClassyEnum child instance
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high
-    #  end
-    #
-    #  Priority.build(:low) # => PriorityLow.new
-    def build(option)
-      return option if option.blank?
-      return TypeError.new("Valid #{self} options are #{self.valid_options}") unless self::OPTIONS.include? option.to_sym
-      Object.const_get("#{self}#{option.to_s.camelize}").new
-    end
-
-    alias :find :build
-
-    # Returns an array of all instantiated enums
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high
-    #  end
-    #
-    #  Priority.all # => [PriorityLow.new, PriorityMedium.new, PriorityHigh.new]
-    def all
-      self::OPTIONS.map {|e| build(e) }
-    end
-
-    # Returns a 2D array for Rails select helper options.
-    # Also used internally for Formtastic support
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :really_high
-    #  end
-    #
-    #  Priority.select_options # => [["Low", "low"], ["Really High", "really_high"]]
-    def select_options
-      all.map {|e| [e.name, e.to_s] }
-    end
-
-    # Returns a comma separated list of valid enum options.
-    # Also used internally for ActiveRecord model validation error messages
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high
-    #  end
-    #
-    #  Priority.valid_options # => "low, medium, high"
-    def valid_options
-      self::OPTIONS.map(&:to_s).join(', ')
-    end
-
-  end
-
-  module InstanceMethods
-    # Returns string representing enum in Rails titleize format
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high, :really_high
-    #  end
-    #
-    #  @priority = Priority.build(:really_high)
-    #  @priority.name # => "Really High"
-    def name
-      @to_s.titleize
-    end
-
-    # Sort an array of elements based on the order they are defined
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Priority < ClassyEnum::Base
-    #    enum_classes :low, :medium, :high
-    #  end
-    #
-    #  @low = Priority.build(:low)
-    #  @medium = Priority.build(:medium)
-    #  @high = Priority.build(:high)
-    #  priorities = [@low, @high, @medium]
-    #  priorities.sort # => [@low, @medium, @high]
-    #  priorities.max # => @high
-    #  priorities.min # => @low
-    def <=> other
-      @index <=> other.index
-    end
-
-    # Determine if the enum attribute is a particular member.
-    # Accepts a symbol or string representing a member
-    #
-    # ==== Example
-    #  # Create an Enum with some elements
-    #  class Breed < ClassyEnum::Base
-    #    enum_classes :golden_retriever, :snoop
-    #  end
-    #
-    #  # Create an ActiveRecord class using the Breed enum
-    #  class Dog < ActiveRecord::Base
-    #    classy_enum_attr :breed
-    #  end
-    #
-    #  @dog = Dog.new(:breed => :snoop)
-    #  @dog.breed.is? :snoop # => true
-    #  @dog.breed.is? 'snoop' # => true
-    #  @dog.breed.is? :golden_retriever # => false
-    def is?(obj)
-      obj.to_s == to_s
-    end
-
-  end
-
-end

data/spec/classy_enum_attributes_spec.rb

@@ -1,50 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "A Dog Collection" do
-  before(:each) do
-    dog1 = Dog.new(:breed => :golden_retriever)
-    dog2 = Dog.new(:breed => :snoop)
-
-    @dogs = [dog1, dog2]
-  end
-
-  it "should sort by breed" do
-    @dogs.sort_by(&:breed).should == @dogs
-  end
-end
-
 describe "A Dog" do
 
-  before(:each) { @dog = Dog.new(:breed => :golden_retriever) }
+  context "with valid breed options" do
+    before { @dog = Dog.new(:breed => :golden_retriever) }
 
-  it "should have an enumerable breed" do
-    @dog.breed.class.should == BreedGoldenRetriever
-  end
+    it "should have a classy enum breed" do
+      @dog.breed.should be_a(BreedGoldenRetriever)
+    end
 
-  it "should respond to enum_classes" do
-    @dog.breed.should respond_to('enum_classes')
+    it "should be valid with a valid option" do
+      @dog.should be_valid
+    end
   end
 
-  it "should know which member the enum is" do
-    @dog.breed.is?(:golden_retriever).should be_true
+  it "should not be valid with a nil breed" do
+    Dog.new(:breed => nil).should_not be_valid
   end
 
-  it "should be valid with a valid option" do
-    @dog.should be_valid
+  it "should not be valid with a blank breed" do
+    Dog.new(:breed => "").should_not be_valid
   end
 
-  context "with an invalid breed option" do
-    before { @dog.breed = :golden_doodle }
+  context "with invalid breed options" do
+    before { @dog = Dog.new(:breed => :fake_breed) }
 
     it "should not be valid with an invalid option" do
       @dog.should_not be_valid
     end
 
-    it "should have an error for the breed" do
-      @dog.valid?
-      @dog.errors.should include(:breed)
-    end
-
     it "should have an error message containing the right options" do
       @dog.valid?
       @dog.errors[:breed].should include("must be one of #{Breed.all.map(&:to_sym).join(', ')}")
@@ -53,18 +37,10 @@ describe "A Dog" do
 
 end
 
-class Thing < ActiveRecord::Base
-  classy_enum_attr :breed, :dog_breed
-end
-
-describe "A Thing" do
-  before(:each) { @thing = Thing.new(:dog_breed => :snoop) }
-
-  it "should have an enumerable dog breed as breed" do
-    @thing.dog_breed.class.should == BreedSnoop
-  end
+describe "A ClassyEnum that has a different field name than the enum" do
+  before { @dog = OtherDog.new(:other_breed => :snoop) }
 
-  it "should have a base class of Breed" do
-    @thing.dog_breed.should respond_to('enum_classes')
+  it "should have a classy enum breed" do
+    @dog.other_breed.should be_a(BreedSnoop)
   end
 end

data/spec/classy_enum_semantic_form_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec/spec_helper"
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'using enum_select input' do
   include FormtasticSpecHelper
@@ -11,69 +11,67 @@ describe 'using enum_select input' do
   end
 
   context "when building a form with a classy_enum select" do
-    before(:each) do
-      @output = semantic_form_for(Dog.new(:breed => :snoop), :url => "/") do |builder|
-        concat(builder.input(:breed, :as => :enum_select))
+    context "with an object that has the enum set" do
+      before(:each) do
+        @output = semantic_form_for(Dog.new(:breed => :snoop), :url => "/") do |builder|
+          concat(builder.input(:breed, :as => :enum_select))
+        end
       end
-    end
 
-    it "should produce a form tag" do
-      @output.should =~ /<form/
-    end
+      it "should produce an unselected option tag for Golden Retriever" do
+        regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
+        @output.should =~ regex
+      end
 
-    it "should produce an unselected option tag for Golden Retriever" do
-      regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
-      @output.should =~ regex
-    end
+      it "should produce a selected option tag for Snoop" do
+        regex = Regexp.new("<option value=\\\"snoop\\\" selected=\\\"selected\\\">Snoop")
+        @output.should =~ regex
+      end
 
-    it "should produce an selected option tag for Snoop" do
-      regex = Regexp.new("<option value=\\\"snoop\\\" selected=\\\"selected\\\">Snoop")
-      @output.should =~ regex
+      it "should not produce a blank selected option tag" do
+        regex = Regexp.new("<option value=\"\"><")
+        @output.should_not =~ regex
+      end
     end
-  end
 
-  context "when building a form with a classy_enum select, but the existing value is nil" do
-    before(:each) do
-      @output = semantic_form_for(Dog.new, :url => "/") do |builder|
-        concat(builder.input(:other_breed, :as => :enum_select, :enum_class => :breed))
+    context "with an object that has a nil enum" do
+      before(:each) do
+        @output = semantic_form_for(Dog.new, :url => "/") do |builder|
+          concat(builder.input(:breed, :as => :enum_select))
+        end
       end
-    end
 
-    it "should produce a form tag" do
-      @output.should =~ /<form/
-    end
+      it "should produce an unselected option tag for Golden Retriever" do
+        regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
+        @output.should =~ regex
+      end
 
-    it "should produce an unselected option tag for Golden Retriever" do
-      regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
-      @output.should =~ regex
-    end
+      it "should not produce an selected option tag" do
+        regex = Regexp.new("selected")
+        @output.should_not =~ regex
+      end
 
-    it "should produce an unselected option tag for Snoop" do
-      regex = Regexp.new("<option value=\\\"snoop\\\">Snoop")
-      @output.should =~ regex
     end
-  end
 
-  context "when building a form with a classy_enum select, using the enum_attr option" do
-    before(:each) do
-      @output = semantic_form_for(Dog.new, :url => "/") do |builder|
-        concat(builder.input(:breed, :as => :enum_select))
+    context "with an object with a different attribute name which requires the enum_class" do
+      before(:each) do
+        @output = semantic_form_for(OtherDog.new, :url => "/") do |builder|
+          concat(builder.input(:other_breed, :as => :enum_select, :enum_class => :breed))
+        end
       end
-    end
 
-    it "should produce a form tag" do
-      @output.should =~ /<form/
-    end
+      it "should produce an unselected option tag for Golden Retriever" do
+        regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
+        @output.should =~ regex
+      end
 
-    it "should produce an unselected option tag for Golden Retriever" do
-      regex = Regexp.new("<option value=\\\"golden_retriever\\\">Golden Retriever")
-      @output.should =~ regex
-    end
+      it "should not produce an selected option tag" do
+        regex = Regexp.new("selected")
+        @output.should_not =~ regex
+      end
 
-    it "should produce an unselected option tag for Snoop" do
-      regex = Regexp.new("<option value=\\\"snoop\\\">Snoop")
-      @output.should =~ regex
     end
+
   end
 
   it "should raise an error if the attribute is not a ClassyEnum object" do
@@ -81,7 +79,7 @@ describe 'using enum_select input' do
       @output = semantic_form_for(Dog.new(:breed => :snoop), :url => "/") do |builder|
         concat(builder.input(:id, :as => :enum_select))
       end
-    end.should raise_error("id is not a ClassyEnum object")
+    end.should raise_error("id is not a ClassyEnum object. Make sure you've added 'classy_enum_attr :id' to your model")
   end
 
   it "should raise an error if the attribute is not a ClassyEnum object and its value is nil" do
@@ -89,7 +87,7 @@ describe 'using enum_select input' do
       @output = semantic_form_for(Dog.new, :url => "/") do |builder|
         concat(builder.input(:id, :as => :enum_select))
       end
-    end.should raise_error("id is not a ClassyEnum object")
+    end.should raise_error("id is not a ClassyEnum object. Make sure you've added 'classy_enum_attr :id' to your model")
   end
 
 end

data/spec/classy_enum_spec.rb

@@ -81,6 +81,10 @@ describe "A ClassyEnum element" do
   it "should inherit the default class methods" do
     TestEnumOne.test_class_method?.should be_false
   end
+
+  it "should compare different elements based on their index" do
+    TestEnumOne.new.should == TestEnumOne.new
+  end
 end
 
 describe "A ClassyEnum instance" do
@@ -90,18 +94,34 @@ describe "A ClassyEnum instance" do
     @enum.class.should == TestEnumOne
   end
 
-  it "should return true for is_element?(:one)" do
+  it "should return true for is?(:one)" do
     @enum.is?(:one).should be_true
   end
 
-  it "should return true for is_element?('one')" do
+  it "should return true for is?('one')" do
     @enum.is?('one').should be_true
   end
 
+  it "should return true for one?" do
+    @enum.one?.should be_true
+  end
+
+  it "should return false for two?" do
+    @enum.two?.should be_false
+  end
+
   it "should be a TestEnum" do
     @enum.should be_a(TestEnum)
   end
 
+  it "should have an index" do
+    @enum.index.should == 1
+  end
+
+  it "should index as to_i" do
+    @enum.to_i.should == 1
+  end
+
   it "should convert to a string" do
     @enum.to_s.should == "one"
   end

data/spec/spec_helper.rb

@@ -15,12 +15,12 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
 ActiveRecord::Schema.define(:version => 1) do
   create_table :dogs, :force => true do |t|
     t.string :breed
-    t.string :other_breed
   end
 
-  create_table :things, :force => true do |t|
-    t.string :dog_breed
+  create_table :other_dogs, :force => true do |t|
+    t.string :other_breed
   end
+
 end
 
 class Breed < ClassyEnum::Base
@@ -29,6 +29,9 @@ end
 
 class Dog < ActiveRecord::Base
   classy_enum_attr :breed
+end
+
+class OtherDog < ActiveRecord::Base
   classy_enum_attr :breed, :other_breed
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classy_enum
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Peter Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -05:00
+date: 2011-02-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,9 @@ files:
 - init.rb
 - lib/classy_enum.rb
 - lib/classy_enum/attributes.rb
+- lib/classy_enum/base.rb
+- lib/classy_enum/class_methods.rb
+- lib/classy_enum/instance_methods.rb
 - lib/classy_enum/semantic_form_builder.rb
 - lib/generators/classy_enum/classy_enum_generator.rb
 - lib/generators/classy_enum/templates/enum.rb
@@ -153,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A class based enumerator utility for Ruby on Rails