iron-enum 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.3 / 2013-06-21
+
+* Minor bugfix to allow better handling of setting an enum attr with a blank string as if it were setting to nil
+
 == 1.0.2 / 2013-03-25
 
 * Improve edge cases for Enum::Core#options to correctly return [] for nil and [] explicit parameters

data/Version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/iron/enum/attr_support.rb

@@ -122,6 +122,7 @@ module Enum
             end
 
             def #{attr_field}=(val)
+              val = nil if val.is_a?(String) && val.empty?
               @#{attr_field} = #{enum_klass}.value(val)
             end
           eos

data/lib/iron/enum/core.rb

@@ -67,8 +67,18 @@ module Enum
     private
 
     def to_key(id)
+      return nil if id.nil?
       return id if id.is_a?(Symbol)
-      id = id.to_i if id.is_a?(String) && id.to_i.to_s == id
+      if id.is_a?(String)
+        # Check for "15" style ids - common in web usage a la Rails where params come in as text
+        if id.to_i.to_s == id
+          # Yup, convert
+          id = id.to_i
+        else
+          # No, so invalid
+          return nil
+        end
+      end
       row = enum_list.find {|row| row[VALUE_IDX] == id}
       row.nil? ? nil : row[KEY_IDX]
     end

data/spec/enum/attr_spec.rb

@@ -36,6 +36,16 @@ describe Enum do
       @obj.pos = '1'
       @obj.pos.should == 1
     end
+    
+    it 'should set empty strings as nil' do
+      @obj.pos = ''
+      @obj.pos.should be_nil
+    end
+    
+    it 'should raise on setting to invalid strings' do
+      expect {@obj.pos = 'abc'}.to raise_error
+      expect {@obj.pos = '1a'}.to raise_error
+    end
   
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-enum
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec