ohm-contrib 0.0.33 → 0.0.34

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.33'
+    VERSION = '0.0.34'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"

data/lib/ohm/contrib/callbacks.rb

@@ -10,6 +10,8 @@ module Ohm
   #    - after_create
   #    - before_save
   #    - after_save
+  #    - before_update
+  #    - after_update
   #    - before_delete
   #    - after_delete
   #
@@ -176,10 +178,18 @@ module Ohm
     # If the save also succeeds, all after :save callbacks are
     # executed.
     def save
-      execute_callback(:before, :save)  if valid?
+      existing = !new?
+
+      if valid?
+        execute_callback(:before, :save)  
+        execute_callback(:before, :update) if existing
+      end
 
       super.tap do |is_saved|
-        execute_callback(:after, :save)  if is_saved
+        if is_saved
+          execute_callback(:after, :save)  
+          execute_callback(:after, :update) if existing
+        end
       end
     end
 
@@ -198,6 +208,8 @@ module Ohm
     def after_save()      end
     def before_create()   end
     def after_create()    end
+    def before_update()   end
+    def after_update()    end
     def before_delete()   end
     def after_delete()    end
 

data/test/callbacks_lint.rb

@@ -9,6 +9,8 @@ test "save on invalid" do
   assert ! post.did?(:do_after_create)
   assert ! post.did?(:do_before_save)
   assert ! post.did?(:do_after_save)
+  assert ! post.did?(:do_before_update)
+  assert ! post.did?(:do_after_update)
 end
 
 test "saving a valid model" do
@@ -21,6 +23,8 @@ test "saving a valid model" do
   assert post.did?(:do_after_create)
   assert post.did?(:do_before_save)
   assert post.did?(:do_after_save)
+  assert ! post.did?(:do_before_update)
+  assert ! post.did?(:do_after_update)
 end
 
 test "ensure create / save callbacks are only called once" do
@@ -33,7 +37,7 @@ test "ensure create / save callbacks are only called once" do
   assert 1 == post.count(:do_after_create)
 end
 
-test "using Post::create on a valid model invokes all callbacks" do
+test "Post::create on a valid model invokes all callbacks (except update)" do
   post = Post.create(:body => "The Body")
 
   assert post.did?(:do_before_validate)
@@ -42,6 +46,8 @@ test "using Post::create on a valid model invokes all callbacks" do
   assert post.did?(:do_after_create)
   assert post.did?(:do_before_save)
   assert post.did?(:do_after_save)
+  assert ! post.did?(:do_before_update)
+  assert ! post.did?(:do_after_update)
 end
 
 test "ensure Post::create only invokes save / create once" do
@@ -65,9 +71,34 @@ test "on successful save of existing record" do
   assert post.did?(:do_after_validate)
   assert post.did?(:do_before_save)
   assert post.did?(:do_after_save)
+  assert post.did?(:do_before_update)
+  assert post.did?(:do_after_update)
 
   assert 1 == post.count(:do_before_save)
   assert 1 == post.count(:do_after_save)
+  assert 1 == post.count(:do_before_update)
+  assert 1 == post.count(:do_after_update)
+end
+
+test "on successful save of existing record (using #update)" do
+  post = Post.create(:body => "The Body")
+  post = Post[post.id]
+  post.update(:body => "New Body")
+
+  assert ! post.did?(:do_before_create)
+  assert ! post.did?(:do_after_create)
+
+  assert post.did?(:do_before_validate)
+  assert post.did?(:do_after_validate)
+  assert post.did?(:do_before_save)
+  assert post.did?(:do_after_save)
+  assert post.did?(:do_before_update)
+  assert post.did?(:do_after_update)
+
+  assert 1 == post.count(:do_before_save)
+  assert 1 == post.count(:do_after_save)
+  assert 1 == post.count(:do_before_update)
+  assert 1 == post.count(:do_after_update)
 end
 
 test "on failed save of existing record" do
@@ -85,6 +116,9 @@ test "on failed save of existing record" do
 
   assert ! post.did?(:do_before_save)
   assert ! post.did?(:do_after_save)
+
+  assert ! post.did?(:do_before_update)
+  assert ! post.did?(:do_after_update)
 end
 
 test "on delete" do
@@ -101,5 +135,7 @@ test "on delete" do
   assert ! post.did?(:do_after_create)
   assert ! post.did?(:do_before_save)
   assert ! post.did?(:do_after_save)
+  assert ! post.did?(:do_before_update)
+  assert ! post.did?(:do_after_update)
 end
 

data/test/instance_callbacks_test.rb

@@ -28,6 +28,8 @@ protected
   def after_create()    incr(:do_after_create)    end
   def before_save()     incr(:do_before_save)     end
   def after_save()      incr(:do_after_save)      end
+  def before_update()   incr(:do_before_update)   end
+  def after_update()    incr(:do_after_update)    end
   def before_delete()   incr(:do_before_delete)   end
   def after_delete()    incr(:do_after_delete)    end
 

data/test/macro_callbacks_test.rb

@@ -18,6 +18,9 @@ class Post < Ohm::Model
 
   before :delete,   :do_before_delete
   after  :delete,   :do_after_delete
+  
+  before :update,   :do_before_update
+  after  :update,   :do_after_update
 
   def validate
     super
@@ -40,6 +43,8 @@ protected
   def do_after_create()    incr(:do_after_create)    end
   def do_before_save()     incr(:do_before_save)     end
   def do_after_save()      incr(:do_after_save)      end
+  def do_before_update()   incr(:do_before_update)   end
+  def do_after_update()    incr(:do_after_update)    end
   def do_before_delete()   incr(:do_before_delete)   end
   def do_after_delete()    incr(:do_after_delete)    end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 33
-  version: 0.0.33
+  - 34
+  version: 0.0.34
 platform: ruby
 authors: 
 - Cyril David