document_hash 0.0.6 → 0.0.7

data/lib/document_hash/core.rb

@@ -43,13 +43,14 @@ module DocumentHash
     end
 
     def merge other
-      self.class.symbolize_keys other
-      super other
+      dup.merge! other
     end
 
     def merge! other
       self.class.symbolize_keys other
+      other = Hash[ other.collect{ |k, v| [ k, execute_before_change_callback(k,v) ] } ]
       super other
+      other.each { |k, v| changed_key k,v }
     end
 
     private 
@@ -69,7 +70,6 @@ module DocumentHash
 
       value = @before_change.call path, value if @before_change
       value = parent.__send__ :execute_before_change_callback, path.unshift(parent_key), value if parent
-
       value
     end
 

data/lib/document_hash/version.rb

@@ -1,3 +1,3 @@
 module DocumentHash
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: document_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: