callback 0.2.0 → 0.3.0

data/CHANGES

@@ -1,3 +1,6 @@
+2006-11-24 (0.3.0)
+  * Added Module#callback method. Also added all of the callback methods into Object.
+
 2006-11-04 (0.2.0)
   * Added register_callback as an alias to define_callback. Added unregistration of callbacks in the
     unregister_callback and undefine_callback methods.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/clean'
 require 'rake/rdoctask'
 
 PKG_NAME = "callback"
-PKG_VERSION   = "0.2.0"
+PKG_VERSION   = "0.3.0"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/callback.rb

@@ -1,3 +1,4 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/callback/callback"
-require "#{dir}/callback/callback_container"
+require "callback/callback"
+require "callback/extensions/object"
+require "callback/extensions/module"
+require "callback/callback_container"

data/lib/callback/callback.rb

@@ -1,21 +1,34 @@
 module Callback
-  def define_callback(key, callback_proc=nil, &callback_block)
-    callbacks.define(key, callback_proc, &callback_block)
+  module ModuleMethods
+    def callback(event_name)
+      module_eval %{
+        def on_#{event_name}(&block)
+          define_callback(:#{event_name}, &block)
+        end
+      }
+    end
   end
-  alias_method :register_callback, :define_callback
 
-  def undefine_callback(key, callback_proc)
-    callbacks.undefine(key, callback_proc)
-  end
-  alias_method :unregister_callback, :undefine_callback
+  module InstanceMethods
+    def define_callback(key, callback_proc=nil, &callback_block)
+      callbacks.define(key, callback_proc, &callback_block)
+    end
+    alias_method :register_callback, :define_callback
 
-  protected
-  def notify_callbacks(key, *args, &error_handler)
-    callbacks.notify(key, *args, &error_handler)
-  end
+    def undefine_callback(key, callback_proc)
+      callbacks.undefine(key, callback_proc)
+    end
+    alias_method :unregister_callback, :undefine_callback
+
+    protected
+    def notify_callbacks(key, *args, &error_handler)
+      callbacks.notify(key, *args, &error_handler)
+    end
 
-  private
-  def callbacks
-    @callbacks ||= CallbackContainer.new
+    private
+    def callbacks
+      @callbacks ||= CallbackContainer.new
+    end
   end
+  include InstanceMethods
 end

data/lib/callback/extensions/module.rb

@@ -0,0 +1,3 @@
+class Module
+  include Callback::ModuleMethods
+end

data/lib/callback/extensions/object.rb

@@ -0,0 +1,3 @@
+class Object
+  include Callback::InstanceMethods
+end

data/spec/module_spec.rb

@@ -0,0 +1,19 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/spec_helper"
+
+context "A Module" do
+  specify "should define callback methods" do
+    the_class = Class.new do
+      callback :foo
+      def call
+        notify_callbacks :foo
+      end
+    end
+
+    the_obj = the_class.new
+    the_obj.on_foo do
+      :bar
+    end
+    the_obj.call.should == [:bar]
+  end
+end

data/spec/{callback_spec.rb → object_spec.rb}

@@ -1,10 +1,9 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/spec_helper"
 
-context "A Callback" do
+context "An Object" do
   setup do
     @callback_object = Object.new
-    @callback_object.extend Callback
     class << @callback_object
       public :notify_callbacks
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "rubygems"
 require "spec"
 dir = File.dirname(__FILE__)
-require "#{dir}/../lib/callback"
+$LOAD_PATH << "#{dir}/../lib"
+require "callback"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: callback
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-11-04 00:00:00 -08:00
+  version: 0.3.0
+date: 2006-11-24 00:00:00 -08:00
 summary: A simple callback library for ruby objects.
 require_paths: 
 - lib
@@ -36,11 +36,15 @@ files:
 - lib/callback.rb
 - lib/callback/callback.rb
 - lib/callback/callback_container.rb
-- spec/callback_spec.rb
+- lib/callback/extensions/module.rb
+- lib/callback/extensions/object.rb
+- spec/module_spec.rb
 - spec/spec_helper.rb
 - spec/spec_suite.rb
+- spec/object_spec.rb
 test_files: 
-- spec/callback_spec.rb
+- spec/module_spec.rb
+- spec/object_spec.rb
 rdoc_options: []
 
 extra_rdoc_files: