property 2.3.1 → 2.3.2

data/History.txt

@@ -1,3 +1,8 @@
+== 2.3.2 2012-07-02
+
+* Minor enhancements
+  * Fix a bug in merge hash with a nil original value.
+
 == 2.3.1 2012-07-02
 
 * Major enhancements

data/lib/property/properties.rb

@@ -34,8 +34,9 @@ module Property
             delete(key)
           end
         elsif value.kind_of?(Hash) && column.klass <= Hash && column.caster.respond_to?(:merge_hash)
+          orig = self[key]
           # We *MUST* duplicate hash here or Dirty will not function correctly.
-          value = column.caster.merge_hash(self[key].dup, value)
+          value = column.caster.merge_hash(orig ? orig.dup : {}, value)
           if value.blank?
             if default = column.default_for(@owner)
               super(key, default)

data/lib/property/version.rb

@@ -1,3 +1,3 @@
 module Property
-  VERSION = '2.3.1'
-end
+  VERSION = '2.3.2'
+end

data/property.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "2.3.1"
+  s.version = "2.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renaud Kern", "Gaspard Bucher"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Renaud Kern