From 323036104e89e931e0c967b15a623112dd62c68b Mon Sep 17 00:00:00 2001
From: Wildfalcon <laurie@wildfalcon.com>
Date: Wed, 2 Dec 2009 10:43:49 +0000
Subject: [PATCH] Updated the way error callbacks work

If a callback is declared (:error => :error_method) and error_method exists
then error_method is called if an error is raised

If a callback is declared but the method does not exist, then a NoMethodError
is raised if an error is raised

If no callback is declard, then any error raised will get propogated
---
 lib/aasm/event.rb      |  3 ++-
 spec/unit/aasm_spec.rb | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/aasm/event.rb b/lib/aasm/event.rb
index addb1f5..3e7a518 100644
--- a/lib/aasm/event.rb
+++ b/lib/aasm/event.rb
@@ -82,9 +82,10 @@ module AASM
 
       def execute_error_callback(obj, error, error_callback=nil)
         callback = error_callback || @error
+        raise error unless callback
         case(callback)
           when String, Symbol
-            raise error unless obj.respond_to?(callback.to_sym)
+            raise NoMethodError unless obj.respond_to?(callback.to_sym)
             obj.send(callback, error)
           when Proc
             callback.call(obj, error)
diff --git a/spec/unit/aasm_spec.rb b/spec/unit/aasm_spec.rb
index 18a3ba4..c92f7ec 100644
--- a/spec/unit/aasm_spec.rb
+++ b/spec/unit/aasm_spec.rb
@@ -6,7 +6,7 @@ class Foo
   aasm_state :open, :exit => :exit
   aasm_state :closed, :enter => :enter
 
-  aasm_event :close, :success => :success_callback, :error => :error_callback do
+  aasm_event :close, :success => :success_callback do
     transitions :to => :closed, :from => [:open]
   end
 
@@ -272,6 +272,12 @@ end
 describe AASM, '- event callbacks' do
   describe "with an error callback defined" do
     before do
+      class Foo
+        aasm_event :safe_close, :success => :success_callback, :error => :error_callback do
+          transitions :to => :closed, :from => [:open]
+        end
+      end
+
       @foo = Foo.new
     end
 
@@ -280,12 +286,17 @@ describe AASM, '- event callbacks' do
       end
       @foo.stub!(:enter).and_raise(e=StandardError.new)
       @foo.should_receive(:error_callback).with(e)
-      @foo.close!
+      @foo.safe_close!
     end
 
-    it "should propagrate an exception if exceptionis raised and error_callback is not defined" do
-      @foo.stub!(:enter).and_raise("ErrorPropagated")
-      lambda{@foo.close!}.should raise_error(StandardError, "ErrorPropagated")
+    it "should raise NoMethodError if exceptionis raised and error_callback is declared but not defined" do
+      @foo.stub!(:enter).and_raise(StandardError)
+      lambda{@foo.safe_close!}.should raise_error(NoMethodError)
+    end
+    
+    it "should propagate an error if no error callback is declared" do
+        @foo.stub!(:enter).and_raise("Cannot enter safe")
+        lambda{@foo.close!}.should raise_error(StandardError, "Cannot enter safe")  
     end
   end