mm_partial_update 0.1.7 → 0.1.8

data/lib/mm_partial_update/plugins/partial_update.rb

@@ -40,8 +40,7 @@ module MmPartialUpdate
 
         def create_or_update_changes(options={})
           #assert_root_saved
-          update_command  = prepare_update_command
-          execute_command(update_command, options)
+          update_comment = execute_command(options)
           #callbacks and changes_only are not valid
           # options for regular MongoMapper saves.
           # clear_changes_to_subtree will pass this options
@@ -114,16 +113,19 @@ module MmPartialUpdate
           end
         end
 
-        def execute_command(update_command,options)
+        def execute_command(options)
           if options[:callbacks]
             context = new? ? :create : :update
             run_callbacks(:save) do
               run_callbacks(context) do
-                update_command.execute()
+                # the update command cannot be prepared before callbacks are run
+                # if they are to be run because they may change the state of the
+                # entity, and those changes need to be persisted
+                prepare_update_command.tap{ |c|c.execute() }
               end
             end
           else
-            update_command.execute()
+            prepare_update_command.tap{ |c|c.execute() }
           end
         end
 

data/lib/mm_partial_update/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MmPartialUpdate
-    Version = '0.1.7'
+    Version = '0.1.8'
 end

data/test/functional/plugins/test_partial_update.rb

@@ -21,6 +21,14 @@ class TestPartialUpdate < Test::Unit::TestCase
       person.name.should == "Esteban"
     end
 
+    should "persist changes made during before_save" do
+      person = Person.create! :name=>"Willard!"
+      person.ensure_me = nil
+      person.save_changes
+      person.reload
+      person.ensure_me.should == "here i am!"
+    end
+
     should "update changes to a saved entity, preserving unchanged values" do
       person = Person.new :name=>"Willard"
       person.pets.build :name=>"Magma", :age=>2

data/test/models.rb

@@ -4,11 +4,17 @@ class Person
   include MongoMapper::Document
   include CallbacksSupport
   key :name, String
+  key :ensure_me, String
   many :pets
   one :happy_place
   one :favorite_pet, :class_name=>'Pet'
 
   timestamps!
+
+  before_save :do_the_needful
+  def do_the_needful
+    self.ensure_me ||= "here i am!"
+  end
 end
 
 class HappyPlace #Test non-embedded proxies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm_partial_update
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Nathan Stults
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,24 +134,24 @@ extra_rdoc_files: []
 
 files: 
 - lib/mm_partial_update.rb
-- lib/mm_partial_update/extensions.rb
 - lib/mm_partial_update/update_command.rb
 - lib/mm_partial_update/plugins/document.rb
-- lib/mm_partial_update/plugins/partial_update.rb
 - lib/mm_partial_update/plugins/embedded_document.rb
+- lib/mm_partial_update/plugins/partial_update.rb
+- lib/mm_partial_update/extensions.rb
 - lib/mm_partial_update/embedded_collection.rb
 - lib/mm_partial_update/one_embedded_proxy.rb
 - lib/mm_partial_update/version.rb
+- test/callbacks_support.rb
+- test/test_mm_partial_update.rb
 - test/functional/plugins/test_partial_update.rb
-- test/functional/plugins/test_embedded_document.rb
 - test/functional/plugins/test_document.rb
+- test/functional/plugins/test_embedded_document.rb
 - test/functional/test_update_command.rb
+- test/test_partial_update.rb
 - test/test_helper.rb
 - test/models.rb
-- test/callbacks_support.rb
 - test/test_update_command.rb
-- test/test_partial_update.rb
-- test/test_mm_partial_update.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true