unobservable 0.10.1 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0

data/lib/unobservable.rb

@@ -42,6 +42,30 @@ module Unobservable
   end
 
 
+  # There are 3 ways for end-users to provide an event handler:
+  #
+  # 1. They can pass an object that has a #call method
+  # 2. They can provide an object and the name of a method to invoke
+  # 3. They can pass in a block
+  def self.handler_for(*args, &block)
+    if block
+      return block
+    elsif args.size == 1
+      candidate = args[0]
+      if candidate.respond_to?(:to_proc)
+        return candidate.to_proc
+      else
+        raise ArgumentError, "The argument does not respond to the #to_proc method"
+      end
+    elsif args.size == 2
+      return args[0].method(args[1])
+    end
+
+    raise ArgumentError, "Unable to create an event handler using the given arguments"
+  end
+
+
+
   # This module is a mixin that provides support for "instance events".
   module ModuleSupport
     
@@ -167,32 +191,12 @@ module Unobservable
       @handlers = []
     end
 
-    # There are 3 ways for end-users to provide an event handler:
-    #
-    # 1. They can pass an object that has a #call method
-    # 2. They can provide an object and the name of a method to invoke
-    # 3. They can pass in a block
-    def handler_for(*args, &block)
-      if block
-        return block
-      elsif args.size == 1
-        candidate = args[0]
-        if candidate.respond_to?(:to_proc)
-          return candidate.to_proc
-        else
-          raise ArgumentError, "The argument does not respond to the #to_proc method"
-        end
-      elsif args.size == 2
-        return args[0].method(args[1])
-      end
 
-      raise ArgumentError, "Unable to create an event handler using the given arguments"
-    end
 
     # Registers the given event handler so that it will be
     # invoked when the event is raised.
     def register(*args, &block)
-      h = handler_for(*args, &block)
+      h = Unobservable.handler_for(*args, &block)
       @handlers << h
       return h
     end
@@ -205,7 +209,7 @@ module Unobservable
     # registered the same event handler 3 times, then you will
     # need to unregister it 3 times as well.
     def unregister(*args, &block)
-      h = handler_for(*args, &block)
+      h = Unobservable.handler_for(*args, &block)
       index = @handlers.index(h)
       if index
         @handlers.slice!(index)

data/spec/event_spec.rb

@@ -6,39 +6,6 @@ module Unobservable
     
     let(:e) { Event.new }
     
-    describe "#handler_for" do
-      it "raises an ArgumentError when it does not receive any arguments" do
-        expect{ e.handler_for() }.to raise_error(ArgumentError)
-      end
-
-
-      it "raises an ArgumentError when it is receives an argument that cannot be converted into a Proc" do
-        expect{ e.handler_for(Object.new) }.to raise_error(ArgumentError)
-      end
-      
-      it "allows a Proc to be used has an event handler" do
-        p = Proc.new {}
-        e.handler_for(p).should == p
-      end
-      
-      it "allows a Block to be used as an event handler" do
-        p = Proc.new {}
-        e.handler_for(&p).should == p
-      end
-      
-      it "can use a specified method on an object as an event handler" do
-        x = Object.new
-        e.handler_for(x, :class).should == x.method(:class)
-      end
-      
-      
-      it "raises an ArgumentError when it receives 3 or more arguments" do
-        expect{ e.handler_for(Proc.new, :foo, :bar) }.to raise_error(ArgumentError)
-      end
-
-
-    end
-    
     
     describe "#register" do
       

data/spec/unobservable_spec.rb

@@ -70,5 +70,41 @@ describe Unobservable do
 
   end
   
+  
+  
+  
+  describe "#handler_for" do
+    it "raises an ArgumentError when it does not receive any arguments" do
+      expect{ Unobservable.handler_for() }.to raise_error(ArgumentError)
+    end
+
+
+    it "raises an ArgumentError when it is receives an argument that cannot be converted into a Proc" do
+      expect{ Unobservable.handler_for(Object.new) }.to raise_error(ArgumentError)
+    end
+    
+    it "allows a Proc to be used has an event handler" do
+      p = Proc.new {}
+      Unobservable.handler_for(p).should == p
+    end
+    
+    it "allows a Block to be used as an event handler" do
+      p = Proc.new {}
+      Unobservable.handler_for(&p).should == p
+    end
+    
+    it "can use a specified method on an object as an event handler" do
+      x = Object.new
+      Unobservable.handler_for(x, :class).should == x.method(:class)
+    end
+    
+    
+    it "raises an ArgumentError when it receives 3 or more arguments" do
+      expect{ Unobservable.handler_for(Proc.new, :foo, :bar) }.to raise_error(ArgumentError)
+    end
+
+  end
+  
+  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unobservable
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1060921785598011427
+      hash: 2871391194077949932
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: