ohm-contrib 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/lib/ohm/contrib/callbacks.rb

@@ -36,7 +36,6 @@ module Ohm
   #     end
   #   end
   #
-
   module Callbacks
     def self.included(base)
       base.extend Macros
@@ -157,6 +156,13 @@ module Ohm
       end
     end
 
+    def delete
+      execute_callback(:before, :delete)
+      super.tap do |is_deleted|
+        execute_callback(:after, :delete)  if is_deleted
+      end
+    end
+
   private
     def execute_callback(position, method)
       self.class.callbacks[position][method].each do |callback|

data/lib/ohm/contrib.rb

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

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-05-28}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [

data/test/test_ohm_contrib_callbacks.rb

@@ -14,6 +14,9 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
 
     before :save,     :do_before_save
     after  :save,     :do_after_save
+    
+    before :delete,   :do_before_delete
+    after  :delete,   :do_after_delete
 
     def validate
       super
@@ -36,6 +39,9 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
     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_delete()   incr(:do_before_delete)   end
+    def do_after_delete()    incr(:do_after_delete)    end
+
 
     def incr(action)
       val = instance_variable_get("@#{ action }")
@@ -138,4 +144,27 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       assert ! @post.did?(:do_after_save)
     end
   end
-end
+
+  context "on delete" do
+    setup do
+      @post = Post.create(:body => "The Body")
+      @post = Post[@post.id]
+      @post.delete
+    end
+    
+    
+    should "call delete related callbacks once" do
+      assert_equal 1, @post.count(:do_before_delete)
+      assert_equal 1, @post.count(:do_after_delete)
+    end
+
+    should "not call all other callbacks" do
+      assert ! @post.did?(:do_before_validate)
+      assert ! @post.did?(:do_after_validate)
+      assert ! @post.did?(:do_before_create)
+      assert ! @post.did?(:do_after_create)
+      assert ! @post.did?(:do_before_save)
+      assert ! @post.did?(:do_after_save)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +08:00
+date: 2010-05-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency