mcommons-values_for 0.0.7 → 0.0.8

data/lib/values_for.rb

@@ -26,6 +26,9 @@ module EnumFor
       
       prefix = opts.has_key?(:prefix) ? opts[:prefix] : attribute_s
 
+      # We don't accept the case where an empty string is a valid value, but we should provide a useful error message
+      raise ArgumentError, "Can't use values_for with an empty string" if opts[:has].any?{|v| v.respond_to?(:empty?) && v.empty? }
+      
       # Valid values are most likely Symbols anyway, but coerce them to be safe.
       valid_symbols = opts[:has].map{|v| v.to_sym }
 
@@ -46,7 +49,6 @@ module EnumFor
             read_attribute(attribute) == val_s    #   read_attribute(:foo) == 'foo'  
           end                                     # end
         end
-        
       end
       
       # Accepts assignment both from String and Symbol form of valid values.
@@ -54,15 +56,17 @@ module EnumFor
         merge(:in => valid_symbols | valid_symbols.map{|s| s.to_s } )
       
       # Custom reader method presents attribute value in Symbol form.
-      define_method(attribute_s) do                           # def foo
-        self[attribute].to_sym unless self[attribute].nil?    #   self[:foo].to_sym unless self[:foo].nil?
-      end                                                     # end
+      define_method(attribute_s) do                             # def foo
+        unless self[attribute].nil? || self[attribute].empty?   #   unless self[:foo].nil? || self[:foo].empty?
+          self[attribute].to_sym                                #     self[:foo].to_sym unless self[:foo].nil?
+        end                                                     #   end
+      end                                                       # end
       
       # Custom setter method casting all attribute input to String, allows 
       # assignment from Symbol form.
-      define_method(attribute_s + '=') do |other|  # def foo=(other)
-        self[attribute] = other.to_s               #    self[foo] = other 
-      end                                          # end
+      define_method(attribute_s + '=') do |other|         # def foo=(other)
+        self[attribute] = other.nil? ? nil : other.to_s   #   self[foo] = other unless other.nil?
+      end                                                 # end
       
       # Make collection of all valid attribute Symbols available to user
       # from plural name of attribute as class method.

data/spec/values_for_spec.rb

@@ -130,6 +130,17 @@ describe EnumFor do
     end
   end
   
+  describe "when a user tries to set an empty String as a valid value" do
+    it "should raise an IllegalArgumentError" do
+      lambda {
+        class Food2 < ActiveRecord::Base
+          set_table_name "tacos"
+          values_for :state, :has => ['stuff', '']
+        end
+      }.should raise_error(ArgumentError)
+    end
+  end
+  
   describe "behavior with existing methods of same name" do
     class Balloon < ActiveRecord::Base
       set_table_name "tacos"
@@ -160,6 +171,32 @@ describe EnumFor do
     end
   end
   
+  describe "getting and setting nil values" do
+    class Food2 < ActiveRecord::Base
+      set_table_name "tacos"
+      values_for :state, :has => ['stuff', 'morestuff'], :prefix => nil, :allow_nil => true, :message => "is great!"
+    end
+    
+    before do
+      @f = Food2.new
+      @f.state = nil
+    end
+    
+    it "should return a nil value without error" do
+      lambda {
+        @f.state
+      }.should_not raise_error
+    end
+    
+    it "should return nil when nil is set" do
+      @f.state.should == nil
+    end
+    
+    it "should store nil when nil is set" do
+      @f.state_before_type_cast.should == nil
+    end
+  end
+  
   describe "named scope creation" do
     describe "when not added" do
       it "should not create named scopes" do

data/values_for.gemspec

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

metadata

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