has-guarded-handlers 1.4.0 → 1.4.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/has-guarded-handlers)
 
+# [1.4.1](https://github.com/adhearsion/has-guarded-handlers/compare/v1.4.0...v1.4.1) - [2012-12-08](https://rubygems.org/gems/has-guarded-handlers/versions/1.4.1)
+  * Bugfix: Report handler execution correctly in edge cases
+
 # [1.4.0](https://github.com/adhearsion/has-guarded-handlers/compare/v1.3.1...v1.4.0) - [2012-12-08](https://rubygems.org/gems/has-guarded-handlers/versions/1.4.0)
   * Feature: Return true/false from #trigger_handler depending on wether a handler was called or not
 

data/lib/has_guarded_handlers.rb

@@ -80,13 +80,23 @@ module HasGuardedHandlers
   # @param [Object] the event object to yield to the handler block
   def trigger_handler(type, event)
     return unless handler = handlers_of_type(type)
+    called = false
     catch :halt do
-      handler.find do |guards, handler, tmp|
-        val = catch(:pass) { call_handler handler, guards, event }
+      h = handler.find do |guards, handler, tmp|
+        called = true
+        val = catch(:pass) do
+          if guarded?(guards, event)
+            called = false
+          else
+            handler.call event
+            true
+          end
+        end
         delete_handler_if(type) { |_, h, _| h.equal? handler } if tmp && val
         val
       end
     end
+    !!called
   end
 
   private
@@ -110,12 +120,6 @@ module HasGuardedHandlers
     values
   end
 
-  def call_handler(handler, guards, event) # :nodoc:
-    return if guarded?(guards, event)
-    handler.call event
-    true
-  end
-
   def new_handler_id # :nodoc:
     SecureRandom.uuid
   end

data/lib/has_guarded_handlers/version.rb

@@ -1,3 +1,3 @@
 module HasGuardedHandlers
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/has_guarded_handlers_spec.rb

@@ -25,16 +25,21 @@ describe HasGuardedHandlers do
   end
 
   it 'can register a one-shot (tmp) handler' do
-    response.expects(:call).once.with(event)
-    event.expects(:foo).once.returns :bar
+    response.expects(:call).times(3).with(event)
+    event.expects(:foo).times(3).returns :bar
 
     nomatch_event = mock 'Event(nomatch)'
-    nomatch_event.expects(:foo).once.returns :baz
+    nomatch_event.expects(:foo).twice.returns :baz
 
+    subject.register_handler(:event, :foo => :bar) do |e|
+      response.call e
+      throw :pass
+    end
     subject.register_tmp_handler(:event, :foo => :bar) { |e| response.call e }
 
-    subject.trigger_handler :event, nomatch_event
-    subject.trigger_handler :event, event
+    subject.trigger_handler(:event, nomatch_event).should be_false
+    subject.trigger_handler(:event, event).should be_true
+    subject.trigger_handler(:event, event).should be_true
   end
 
   it 'can unregister a handler after registration' do
@@ -60,7 +65,7 @@ describe HasGuardedHandlers do
       throw :halt
       response.fail
     end
-    subject.trigger_handler :event, event
+    subject.trigger_handler(:event, event).should be_true
   end
 
   it 'allows for passing to the next handler of the same type' do
@@ -75,7 +80,20 @@ describe HasGuardedHandlers do
     subject.register_handler :event do |_|
       response.handle2
     end
-    subject.trigger_handler :event, event
+    subject.trigger_handler(:event, event).should be_true
+  end
+
+  context 'when there is nothing to pass to' do
+    it 'correctly indicates that a handler was called' do
+      response.expects(:handle1).once
+      response.expects(:fail).never
+      subject.register_handler :event do |_|
+        response.handle1
+        throw :pass
+        response.fail
+      end
+      subject.trigger_handler(:event, event).should be_true
+    end
   end
 
   describe 'when registering handlers with the same priority' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has-guarded-handlers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1393339349049738714
+      hash: -1217172567679436302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1393339349049738714
+      hash: -1217172567679436302
 requirements: []
 rubyforge_project: has-guarded-handlers
 rubygems_version: 1.8.24