has_enum 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/has_enum.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_enum}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Korth", "Konstantin Shabanov"]

data/lib/has_enum/active_record.rb

@@ -35,9 +35,9 @@ module HasEnum
           end
           
           define_method(:"#{attribute}=") do |value|
-            value = value.to_s.insert(0, ':') if symbols
-
-            if values.find{ |val| val == value }
+            value = value.to_s.insert(0, ':') if symbols and value
+            
+            if value.nil? or values.find{ |val| val == value }
               write_attribute(attribute, value.blank? ? nil : value.to_s)
             else
               errors.add(:"#{attribute}", "#{value} is not in enum")
@@ -45,7 +45,7 @@ module HasEnum
           end
           
           define_method(:"#{attribute}") do
-            if symbols
+            if symbols and read_attribute(attribute.to_sym)
               read_attribute(attribute.to_sym).tap{|str| str.slice!(0)}.to_sym
             else
               read_attribute(attribute.to_sym)

data/spec/has_enum_spec.rb

@@ -17,6 +17,11 @@ describe HasEnum::ActiveRecord do
       end
     end
     
+    it "should accept nil value for the attribute" do
+      @model.category = nil
+      @model.category.should be_nil
+    end
+    
     it "should reject non enum values for the attribute" do
       @model.category = 'objects'
       @model.errors[:category].size.should eql(1)
@@ -71,14 +76,10 @@ describe HasEnum::ActiveRecord do
       @model.status = :pending
       @model.should be_pending
     end
-  end
-
-  describe "foo enum" do
-    it "should accept attribute values starting with 'bar'" do
-      ['bar', 'barcode', 'bargain'].each do |value|
-        @model.foo = value
-        @model.should be_valid
-      end
+    
+    it "should accept nil value for the attribute" do
+      @model.status = nil
+      @model.status.should be_nil
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Andreas Korth
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2849921123741147368
+      hash: 4222407025214625140
       segments: 
       - 0
       version: "0"