iron-enum 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.2 / 2013-03-25
+
+* Improve edge cases for Enum::Core#options to correctly return [] for nil and [] explicit parameters
+* Add type coercion to enum_attr setter to allow setting via string iff that string represents a valid value in string form
+
 == 1.0.1 / 2013-03-23
 
 * Add validation of inclusion for ActiveRecord enum_attr owners

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Irongaze Consulting LLC
+Copyright (c) 2013 Irongaze Consulting LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Version.txt

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/iron/enum.rb

@@ -2,25 +2,24 @@
 #
 # Sample usage:
 #
-# Enum.enable_support(:all)
-# module Fruit
-#   enum :apple, 1
-#   enum :pear,  2
-# end
+#   module Fruit
+#     enum :apple, 1
+#     enum :pear,  2
+#   end
 #
 # Yields:
 #
-# Fruit::APPLE => 1
-# Fruit.name(1) => 'Apple'
-# Fruit.keys => [:apple, :pear]
-# etc...
+#   Fruit::APPLE => 1
+#   Fruit.name(1) => 'Apple'
+#   Fruit.keys => [:apple, :pear]
 #
+# etc...
 module Enum
 
-  # Indexes into our definition list
-  KEY_IDX = 0
+  # Indexes into our internal enum list
+  KEY_IDX =   0
   VALUE_IDX = 1
-  NAME_IDX = 2
+  NAME_IDX =  2
 
   # Legacy method of enum creation.  Call with a set of arrays, one for each desired enum.  Arrays should
   # contain the parameters supported by #enum, e.g. [:key, <value>, "<optional name>"]
@@ -31,7 +30,7 @@ module Enum
   end
 
   # Add an enumerated constant to the given module/class.  The key should be a symbol, the value a fixed integer
-  # that the symbol represents.  The name is an optional user-friendly name for the enum, which will efault to
+  # that the symbol represents.  The name is an optional user-friendly name for the enum, which will default to
   # a capitalized version of the key.
   #
   # Sample usage:

data/lib/iron/enum/core.rb

@@ -49,14 +49,7 @@ module Enum
     # Used for select tag options, optionally pass set of keys/ids to include, eg if there are only
     # a subset that would be valid for selection in a given context.
     def options(*included)
-      included.flatten!
-      if included.empty?
-        # All options
-        enum_list.collect {|row| option_for(row.first)}
-      else
-        # Only the specified ones
-        included.collect {|key| option_for(key)}.compact
-      end
+      rows_for(*included).collect {|row| option_for(row[KEY_IDX])}
     end
 
     # Array in order required by select fields
@@ -75,6 +68,7 @@ module Enum
 
     def to_key(id)
       return id if id.is_a?(Symbol)
+      id = id.to_i if id.is_a?(String) && id.to_i.to_s == id
       row = enum_list.find {|row| row[VALUE_IDX] == id}
       row.nil? ? nil : row[KEY_IDX]
     end
@@ -87,6 +81,7 @@ module Enum
     end
 
     def rows_for(*included)
+      return [] if included.count == 1 && (included.first == [] || included.first == nil)
       included.flatten!
       if included.empty?
         # All enums

data/spec/enum/attr_spec.rb

@@ -32,5 +32,10 @@ describe Enum do
       expect { @obj.pos = 4000 }.to raise_error
     end
     
+    it 'should convert strings that are ints to ints on setting values' do
+      @obj.pos = '1'
+      @obj.pos.should == 1
+    end
+  
   end
 end

data/spec/enum/option_spec.rb

@@ -16,5 +16,13 @@ describe Enum do
       OptionTest.options(:gamma, :beta).should == [['Monkeys', 20], ['Beta', 10]]
     end
     
+    it 'should return no options for nil' do
+      OptionTest.options(nil).should == []
+    end
+    
+    it 'should return no options for empty set' do
+      OptionTest.options([]).should == []
+    end
+    
   end
 end

data/spec/enum/value_spec.rb

@@ -27,6 +27,6 @@ describe Enum do
     it 'should return select values' do
       ValueTest.values(:alpha, :gamma).should == [5, 2]
     end
-  
+    
   end
 end

metadata

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