property 2.3.0 → 2.3.1

data/History.txt

@@ -1,4 +1,9 @@
-== 2.3.0
+== 2.3.1 2012-07-02
+
+* Major enhancements
+  * Added support for hash property merge.
+
+== 2.3.0 2012-05-23
 
 * Major enhancements
   * Fixed tests and sources for Ruby 1.9

data/lib/property/column.rb

@@ -6,7 +6,7 @@ module Property
   # such as name, type and options. It is also used to typecast from strings to
   # the proper type (date, integer, float, etc).
   class Column < ::ActiveRecord::ConnectionAdapters::Column
-    attr_accessor :index
+    attr_accessor :index, :caster
 
     SAFE_NAMES_REGEXP = %r{\A[a-zA-Z_]+\Z}
 

data/lib/property/dirty.rb

@@ -54,7 +54,7 @@ module Property
     def changed
       changes.keys
     end
-
+    
     def changes
       return {} unless @original_hash
       changes = {}

data/lib/property/properties.rb

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

data/lib/property/version.rb

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

data/property.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renaud Kern", "Gaspard Bucher"]
-  s.date = %q{2012-05-23}
+  s.date = %q{2012-07-02}
   s.description = %q{Wrap model properties into a single database column and declare properties from within the model.}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Renaud Kern
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 +02:00
+date: 2012-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency