@@ -6,6 +6,7 @@ require 'hoe' Hoe.spec 'eventful' do |p| # self.rubyforge_name = 'eventfulx' # if different than 'eventful' p.developer('James Coglan', 'jcoglan@googlemail.com') + p.extra_deps = %w[methodphitamine] end # vim: syntax=ruby Rakefile @@ -1,16 +1,24 @@ require 'observer' +require 'rubygems' +require 'methodphitamine' module Eventful VERSION = '0.9.0' - class Observer + class Observer < Methodphitamine::It def initialize(&block) + super() @block = block end def update(*args) @block.call(*args) end + + # Patch this back in after Methodphitamine removes it + def respond_to?(*args) + Object.instance_method(:respond_to?).bind(self).call(*args) + end end module ObservableWithBlocks @@ -27,9 +35,12 @@ module Eventful include ObservableWithBlocks def on(event, &block) - add_observer do |*args| + observer = add_observer do |*args| type, data = args.first, [self] + args[1..-1] - block.call(*data) if type == event + if type == event + block ||= observer.to_proc + block.call(*data) + end end end lib/eventful.rb @@ -3,10 +3,19 @@ require "eventful" class Foo include Eventful + attr_reader :count + + def initialize + @count = 0 + end + + def bump!(x = 1) + @count += x + end end class TestEventful < Test::Unit::TestCase - def test_sanity + def test_named_events ayes, noes = 0, 0 f = Foo.new f.on(:aye) { |foo, x| ayes += x } @@ -24,4 +33,15 @@ class TestEventful < Test::Unit::TestCase assert_equal 1, ayes assert_equal 3, noes end + + def test_chaining + f = Foo.new + f.on(:aye).bump! 2 + f.on(:noe).bump! -1 + + 2.times { f.fire(:aye) } + f.fire(:noe) + + assert_equal 3, f.count + end end test/test_eventful.rb d542a5db13eb87bd668ad15fed7d1e43380f3d8d James Coglan jcoglan@googlemail.com http://github.com/jcoglan/eventful/commit/e48e9bcae01492eac46fbc5843525941f9210642 e48e9bcae01492eac46fbc5843525941f9210642 2009-06-18T03:57:12-07:00 2009-06-18T03:57:12-07:00 Implement methodphitamine-based chaining for event handlers. f8d3f7b9bc028108ac21aa5a9e6d1301bdda382f James Coglan jcoglan@googlemail.com