fixed bug where after callbacks wouldn't get run if method returned f…

…alse
nakajima · Nov 14, 2008 · f637891 · f637891
1 parent 72ed19e
commit f637891
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/booty_call/callbacker.rb b/lib/booty_call/callbacker.rb
@@ -52,7 +52,7 @@ def #{method_id}(*args, &block)
           catch(#{method_id.to_sym.inspect}) do
             result = nil
             return unless run_callbacks(:before, #{method_id.inspect})
-            return unless run_callbacks(:around, #{method_id.inspect}) do
+            run_callbacks(:around, #{method_id.inspect}) do
               result = __PRISTINE__(#{method_id.inspect}, *args, &block)
             end
             run_callbacks(:after, #{method_id.inspect}, result)

diff --git a/spec/callbacker_spec.rb b/spec/callbacker_spec.rb
@@ -353,6 +353,12 @@ def pitch
           object.foo
           object.results.should == [:foo]
         end
+
+        it "still gets called when method returns false" do
+          callbacker.after(:bar?) { @results << :called }
+          object.bar?(:foo)
+          object.results.should == [false, :called]
+        end
 
         it "can be more than one per method" do
           callbacker.after(:foo) { ping! }
@@ -419,7 +425,7 @@ def pitch
           object.foo
           object.results.should == [:foo]
         end
-
+        
         it "gets access to result of method call" do
           callbacker.after(:foo, :bar)