Merge branch 'master' into 0.7.x

test/action/callbacks_test.rb

@@ -49,6 +49,16 @@
         action.article.must_be_nil
       end
     end
+
+    describe 'on handled error' do
+      it 'stops the callbacks execution and passes the control on exception handling' do
+        action   = HandledErrorBeforeMethodAction.new
+        response = action.call({})
+
+        response[0].must_equal 404
+        action.article.must_be_nil
+      end
+    end
   end
 
   describe '#after' do
@@ -97,5 +107,15 @@
         action.egg.must_be_nil
       end
     end
+
+    describe 'on handled error' do
+      it 'stops the callbacks execution and passes the control on exception handling' do
+        action   = HandledErrorAfterMethodAction.new
+        response = action.call({})
+
+        response[0].must_equal 404
+        action.egg.must_be_nil
+      end
+    end
   end
 end

test/fixtures.rb

@@ -79,6 +79,9 @@
   599 => 'Network connect timeout error'
 }
 
+class RecordNotFound < StandardError
+end
+
 module Test
   class Index
     include Hanami::Action
@@ -349,6 +352,16 @@ def set_article
   end
 end
 
+class HandledErrorBeforeMethodAction < BeforeMethodAction
+  configuration.handle_exceptions true
+  handle_exception RecordNotFound => 404
+
+  private
+  def set_article
+    raise RecordNotFound.new
+  end
+end
+
 class BeforeBlockAction
   include Hanami::Action
 
@@ -425,6 +438,16 @@ def set_egg
   end
 end
 
+class HandledErrorAfterMethodAction < AfterMethodAction
+  configuration.handle_exceptions true
+  handle_exception RecordNotFound => 404
+
+  private
+  def set_egg
+    raise RecordNotFound.new
+  end
+end
+
 class AfterBlockAction
   include Hanami::Action
 
@@ -635,9 +658,6 @@ def call(params)
   end
 end
 
-class RecordNotFound < StandardError
-end
-
 class HandledExceptionAction
   include Hanami::Action
   handle_exception RecordNotFound => 404