hookr 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.1 / 2011-07-06
+
+* 1 bug fix
+  * Ruby 1.9 compatability (thanks schleyfox!)
+
 == 1.1.0 / 2010-09-13
 
 * 1 minor ehancement

data/lib/hookr.rb

@@ -1,5 +1,12 @@
 require 'set'
-require 'generator'
+
+if '1.9'.respond_to?(:force_encoding)
+  require 'enumerator'
+  MyEnumerator = Enumerator
+else
+  require 'generator'
+  MyEnumerator = Generator
+end
 require 'rubygems'
 require 'fail_fast'
 
@@ -254,14 +261,14 @@ module HookR
       fetch_or_create_hooks[hook_name].execute_callbacks(event)
     end
 
-    # Returns a Generator which yields:
+    # Returns a Enumerator which yields:
     # 1. Wildcard callbacks, in reverse order, followed by
     # 2. +hook_name+ callbacks, in reverse order, followed by
     # 3. a proc which delegates to +block+
     #
     # Intended for use with recursive hook execution.
     def callback_generator(hook_name, block)
-      Generator.new do |g|
+      MyEnumerator.new do |g|
         fetch_or_create_hooks[:__wildcard__].each_callback_reverse do |callback|
           g.yield callback
         end
@@ -508,6 +515,14 @@ module HookR
       end
     end
 
+    def to_a
+      if frozen? && !@keys
+        @hash.keys.sort
+      else
+        super
+      end
+    end
+
     # get the first callback
     def first
       each do |cb|
@@ -521,7 +536,7 @@ module HookR
 
   end
 
-  Callback = Struct.new(:handle, :index) do
+  class Callback < Struct.new(:handle, :index)
     include Comparable
     include FailFast::Assertions
 
@@ -646,8 +661,8 @@ module HookR
       assert(recursive, callbacks)
       event = self.class.new(source, name, arguments, recursive, callbacks)
       event.arguments = args unless args.empty?
-      if callbacks.next?
-        callbacks.next.call(event)
+      if c = callbacks.next
+        c.call(event)
       else
         raise "No more callbacks!"
       end

data/spec/hookr_spec.rb

@@ -173,7 +173,7 @@ describe HookR::Hooks do
 
       it "should define a Listener class responding to #foo and #bar" do
         @listener_class = @class::Listener
-        @listener_class.instance_methods(false).should include("foo", "bar")
+        @listener_class.instance_methods(false).map(&:to_s).should include("foo", "bar")
       end
 
       describe "given a subscribed Listener" do

data/version.txt

@@ -0,0 +1 @@
+1.1.1

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hookr
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2011-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fail-fast
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -35,14 +38,16 @@ dependencies:
   name: bones
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 3
-        - 4
         - 7
-        version: 3.4.7
+        - 0
+        version: 3.7.0
   type: :development
   version_requirements: *id002
 description: HookR is a publish/subscribe callback hook facility for Ruby.
@@ -67,6 +72,7 @@ files:
 - spec/hookr_spec.rb
 - spec/spec_helper.rb
 - test/test_hookr.rb
+- version.txt
 has_rdoc: true
 homepage: http://hookr.rubyforge.org
 licenses: []
@@ -78,23 +84,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hookr
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A callback hooks framework for Ruby.