cerealize 0.8.4 → 0.8.5

data/CHANGES

@@ -1,5 +1,14 @@
 = cerealize changes history
 
+== cerealize 0.8.5 -- 2010-09-29
+
+* Fix a bug that nil can't be set in cerealized column.
+  This shows the bug:
+
+    apple = Apple.find(Apple.create(:data => [5]).id)
+    apple.update_attributes(:data => nil)
+    assert_equal nil, apple.data # => shouldn't be [5]
+
 == cerealize 0.8.4 -- 2010-09-29
 
 * Fixed activerecord dependency, should be <3

data/cerealize.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cerealize}
-  s.version = "0.8.3"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cardinal Blue", "Lin Jen-Shin (aka godfat 真常)", "Jaime Cham"]

data/lib/cerealize/version.rb

@@ -1,4 +1,4 @@
 
 module Cerealize
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/lib/cerealize.rb

@@ -151,7 +151,7 @@ module Cerealize
       mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{property}_update_if_dirty
           # See if we have a new cur value
-          if #{field_cache}
+          if instance_variable_defined?('@#{property}')
             value     = #{field_cache}
             value_enc = cerealize_encode(:#{property}, value)
 
@@ -164,10 +164,11 @@ module Cerealize
                value     != cerealize_decode(:#{property}, #{field_orig}))
               self[:#{property}] = value_enc
             end
+
+            remove_instance_variable('@#{property}')
           end
 
-          self.#{field_orig}  = nil
-          self.#{field_cache} = nil
+          self.#{field_orig} = nil
         end
       RUBY
 

data/test/test_basic.rb

@@ -34,6 +34,25 @@ class BasicTest < Test::Unit::TestCase
     assert_equal 'mood: cheerful', Dog.new(:mood => 'cheerful').mood
   end
 
+  def test_setting_nil_in_hash
+    apple = Apple.create(:data => {:name => 'pine'})
+    assert_equal({:name => 'pine'}, apple.data)
+    assert_equal 'pine', apple.name
+    apple.data[:name] = nil
+    assert_equal nil, apple.name
+    apple.save; apple.reload
+    assert_equal nil, apple.name
+    assert_equal({:name => nil}, apple.data)
+  end
+
+  def test_save_nil
+    apple = Apple.find(Apple.create(:data => [5]).id)
+    assert_equal [5], apple.data
+    apple.update_attributes(:data => nil)
+    assert_equal nil, apple.data
+    assert_equal nil, Apple.find(apple.id).data
+  end
+
   def test_encoding_yaml
     set_encoding(:yaml)
     Boat.create :name => 'yamato', :captain => Person.new('kosaku')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Cardinal Blue