enumerated_field 0.0.4 → 0.1.0

data/lib/enumerated_field.rb

@@ -1,3 +1,6 @@
+require "active_model"
+require "active_support/hash_with_indifferent_access"
+
 module EnumeratedField
 
   def self.included(klass)
@@ -10,7 +13,7 @@ module EnumeratedField
     # field_name typically corresponds to the database column name
     # values_array is a double array (not a hash to preserve order for when order matters.. ie select options)    
     def enum_field(field_name, values_array, options = {})
-      values_hash = {}
+      values_hash = ActiveSupport::HashWithIndifferentAccess.new
       values_array.each { |value, key| values_hash[key] = value }
       default_options = {
         :validate => true,
@@ -37,8 +40,12 @@ module EnumeratedField
 
         unless options[:validate] == false
           valid_values = values_hash.keys
-          valid_values += values_hash.keys.map do |key|
-            key.is_a?(String) ? key.to_sym : key.to_s
+          values_hash.keys.map do |key|
+            if key.is_a?(String) and not key.blank?
+              valid_values << key.to_sym
+            else
+              valid_values << key.to_s
+            end
           end
           validates field_name, :inclusion => valid_values,
             :allow_nil => options[:allow_nil], :allow_blank => options[:allow_blank]
@@ -71,7 +78,7 @@ module EnumeratedField
         # ex.  object.league_nfl?  which returns true if the objects league 
         # field is currently set to nfl otherwise false
         values_hash.keys.each do |key|
-          define_method("#{field_name}_#{key}?") { send(field_name) == key }
+          define_method("#{field_name}_#{key}?") { send(field_name).to_s == key.to_s }
         end
 
       end

data/lib/enumerated_field/version.rb

@@ -1,3 +1,3 @@
 module EnumeratedField
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/test/enumerated_field_test.rb

@@ -55,8 +55,8 @@ class EnumeratedFieldTest < Test::Unit::TestCase
     end
 
     should 'create contstants for the field keys' do
-      assert_equal :chiquita, Banana::BRAND_CHIQUITA
-      assert_equal :delmonte, Banana::BRAND_DELMONTE
+      assert_equal "chiquita", Banana::BRAND_CHIQUITA
+      assert_equal "delmonte", Banana::BRAND_DELMONTE
     end
 
     should 'create underscored constants from field keys which contain invalid constant name characters' do
@@ -79,6 +79,7 @@ class EnumeratedFieldTest < Test::Unit::TestCase
 
     should 'show Green for color_display of green' do
       assert_equal @red_apple.color_display_for(:green), 'Green'
+      assert_equal @red_apple.color_display_for('green'), 'Green'
     end
 
     should 'have two enum fields in one class' do

data/test/test_helper.rb

@@ -2,4 +2,3 @@ require 'test/unit'
 require 'turn'
 require 'shoulda'
 require 'lib/enumerated_field'
-require "active_model"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enumerated_field
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Luke Ludwig