andrewtimberlake-couch_potato 0.2.8.1 → 0.2.8.2

data/lib/couch_potato/persistence/dirty_attributes.rb

@@ -19,9 +19,20 @@ module CouchPotato
       
       def reset_dirty_attributes
         self.class.properties.each do |property|
-          instance_variable_set("@#{property.name}_was", send(property.name))
+          instance_variable_set("@#{property.name}_was", clone_attribute(send(property.name)))
+        end
+      end
+      
+      def clone_attribute(value)
+        if [Fixnum, Symbol, TrueClass, FalseClass, NilClass, Float].include?(value.class)
+          value
+        elsif [Hash, Array].include?(value.class)
+          #Deep clone
+          Marshal::load(Marshal::dump(value))
+        else
+          value.clone
         end
       end
     end
   end
-end
+end

data/lib/couch_potato/persistence/simple_property.rb

@@ -20,14 +20,6 @@ module CouchPotato
             end if attributes
           end
           private :assign_attribute_copies_for_dirty_tracking
-          
-          def clone_attribute(value)
-            if [Fixnum, Symbol, TrueClass, FalseClass, NilClass, Float].include?(value.class)
-              value
-            else
-              value.clone
-            end
-          end
 
           define_method "#{name}" do
             value = self.instance_variable_get("@#{name}")

data/spec/unit/dirty_attributes_spec.rb

@@ -33,6 +33,24 @@ describe 'dirty attribute tracking' do
       @couchrest_db.should_receive(:save_doc)
       @db.save_document(plate)
     end
+
+    it "should correctly track dirty hashes (deep clone)" do
+      plate = Plate.new :food => {:veggies => ['carrots', 'peas']}
+      @db.save_document(plate)
+      plate.food[:veggies] << 'beans'
+      @couchrest_db.should_receive(:save_doc)
+      @db.save_document(plate)
+    end
+
+    it "should correctly track dirty hashes (deep clone) after a save" do
+      plate = Plate.new :food => {:veggies => ['carrots', 'peas']}
+      @db.save_document(plate)
+      plate.food[:veggies] << 'beans'
+      @db.save_document(plate)
+      plate.food[:veggies] << 'cauliflower'
+      @couchrest_db.should_receive(:save_doc)
+      @db.save_document(plate)
+    end
   end
   
   describe "newly created object" do
@@ -110,4 +128,4 @@ describe 'dirty attribute tracking' do
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andrewtimberlake-couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.8.1
+  version: 0.2.8.2
 platform: ruby
 authors: 
 - Alexander Lang