mcommons-enum_for 0.0.2 → 0.0.3

data/enum_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{enum_for}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mal McKay and Justin Leitgeb"]

data/lib/enum_for.rb

@@ -17,13 +17,20 @@ module EnumFor
       attribute = args.first
       
       plural_attribute = attribute.to_s.pluralize
-      validates_inclusion_of attribute, options.except(:has, :prefix).merge(:in => options[:has].map{|v| v.to_s})
+      
+      # Accept both symbol and string forms for setting.  They'll both be saved as strings in the DB anyway,
+      # so no need to accept only one form in the validation.
+      all_valid_values = options[:has].map{|v| v.to_s} | options[:has].map{|v| v.to_sym}
+      
+      validates_inclusion_of attribute, options.except(:has, :prefix).merge(:in => all_valid_values )
       const_set(plural_attribute.upcase, options[:has])
       
       prefix = options.has_key?(:prefix) ? options[:prefix] : attribute.to_s
       
-      prefixed_values = options[:has].map{|v| [[prefix, v].compact.join('_'), v] }
-      
+      prefixed_values = options[:has].inject({}) do |res, elem| 
+        res.merge( [prefix, elem].compact.join('_') => elem.to_sym )
+      end
+
       prefixed_values.each do |pv, v|
         # Set constants for values
         const_set(pv.upcase, v)
@@ -39,6 +46,11 @@ module EnumFor
         end
       end
 
+      # Attributes returned are cast as Symbols from their VARCHAR representation in the DB.
+      define_method(attribute.to_s) do
+        self[attribute].to_sym unless self[attribute].nil?
+      end
+      
       # Define a custom setter method which casts input to a String.  Since we present the configuration
       # of enum_fu using Symbols, this makes sense to provide to the user.
       define_method("#{attribute}=") do |other|

data/spec/enum_for_spec.rb

@@ -27,62 +27,83 @@ describe EnumFor do
     @taco = Taco.new(:state => 'new')
   end
   
-  it "should make a valid model when given a valid state" do
-    @taco.should be_valid
-  end
-  
-  it "should be valid when an attribute is set to a valid symbol" do
-    Taco.new(:state => :composed).should be_valid
-  end
-  
-  it "should not be valid when an attribute is set to an invalid symbol" do
-    Taco.new(:state => :bogus).should_not be_valid
-  end
-  
-  it "should not create a valid model when given an invalid state" do
-    Taco.create(:state => 'barfed').should_not be_valid
-  end
-  
-  it "should return all possible states when plural of the attribute is called" do
-    Taco::STATES.should == [ :new, :composed, :served, :eaten ]
-  end
-  
-  it "should return all possible states when plural of attribute is called as class method" do
-    Taco.states.should == [ :new, :composed, :served, :eaten ]
-  end
-  
-  it "should define constants for each type" do
-    Taco::STATE_EATEN.should == :eaten
+  describe "model validation" do
+    it "should make a valid model when given a valid state" do
+      @taco.should be_valid
+    end
+
+    it "should retrieve a symbol when the model is created with attribute set to string" do
+      @taco.state.should == :new
+    end
+
+    it "should be valid when an attribute is set to a valid symbol" do
+      Taco.new(:state => :composed).should be_valid
+    end
+
+    it "should not be valid when an attribute is set to an invalid symbol" do
+      Taco.new(:state => :bogus).should_not be_valid
+    end
+
+    it "should not create a valid model when given an invalid state" do
+      Taco.create(:state => 'barfed').should_not be_valid
+    end
   end
   
-  it "should define predicate methods for each valid state" do
-    @taco.state_eaten?
-  end
+  describe "storage and retrieval of possible states in class" do
+    it "should return all possible states when plural of the attribute is called as constant" do
+      Taco::STATES.should == [ :new, :composed, :served, :eaten ]
+    end
+
+    it "should return all possible states when plural of attribute is called as class method" do
+      Taco.states.should == [ :new, :composed, :served, :eaten ]
+    end
 
-  class Food < ActiveRecord::Base
-    set_table_name "tacos"
-    enum_for :state, :has => [:stuff, :morestuff], :prefix => nil
+    it "should define constants for each type" do
+      Taco::STATE_EATEN.should == :eaten
+    end
   end
   
-  it "should not prefix predicate methods if asked not to" do
-    Food.new(:state => :stuff).stuff?.should be_true
+  describe "definition of predicate methods" do
+    it "should define predicate methods for each valid state" do
+      @taco.should respond_to(:state_eaten?)
+    end
   end
-  
-  it "should allow strings for attribute values even when initialized with symbols" do
-    Food.new(:state => 'stuff').should be_valid
+
+  describe "with prefix option" do
+    class Food < ActiveRecord::Base
+      set_table_name "tacos"
+      enum_for :state, :has => [:stuff, :morestuff], :prefix => nil
+    end
+
+    it "should not prefix predicate methods if asked not to" do
+      Food.new(:state => :stuff).should respond_to(:stuff?)
+    end
   end
   
-  class Balloon < ActiveRecord::Base
-    set_table_name "tacos"
-    enum_for :state, :has => [:stuff, :morestuff], :prefix => nil
+  describe "casting of values set and retrieved to correct type" do
+    it "should allow strings for attribute values even when initialized with symbols" do
+      Food.new(:state => 'stuff').should be_valid
+    end
     
-    def stuff?
-      "not a boolean"
+    it "should retrieve a symbol when a string is set and the attribute value is a symbol" do
+      f = Food.new(:state => 'stuff')
+      f.state.should == :stuff
     end
   end
   
-  it "should not define a predicate method when a one already exists" do
-    Balloon.new(:state => :stuff).stuff?.should == "not a boolean"
+  describe "behavior with existing methods of same name" do
+    class Balloon < ActiveRecord::Base
+      set_table_name "tacos"
+      enum_for :state, :has => [:stuff, :morestuff], :prefix => nil
+
+      def stuff?
+        "not a boolean"
+      end
+    end
+
+    it "should not define a predicate method when a one already exists" do
+      Balloon.new(:state => :stuff).stuff?.should == "not a boolean"
+    end
   end
 
   describe "with validation options" do   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcommons-enum_for
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mal McKay and Justin Leitgeb