clockblock 0.0.4 → 0.0.5

data/README.md

@@ -63,7 +63,7 @@ end
 Foo.extend Clockblock::Timing
 Foo.add_timing_to :bar, :baz
 puts Foo.instance_variable_get(:@future_timer_methods)
-class Foo; def baz; sleep 1; end; end
+class Foo; def baz; sleep 2; end; end
 f = Foo.new
 f.bar
 f.baz

data/lib/clockblock/timing.rb

@@ -3,7 +3,22 @@ module Clockblock
 
     module ClassMethods
       def receiver
-        self.is_a?(Class) ? self : (class << self; self; end)
+        self.is_a?(Class) ? self : self.singleton_class #(class << self; self; end)
+      end
+
+      def add_timing_to_method(method)
+        stashed_method = "#{method}_stashed_by_clockblock".to_sym
+        receiver.class_eval do
+          alias_method stashed_method, method
+          define_method method do |*args, &block|
+            @clockblock_timers ||= {}
+            @clockblock_timers[method] = Clockblock::Timer.new
+
+            @clockblock_timers[method].clock(method) do
+              send stashed_method, *args, &block
+            end
+          end
+        end
       end
 
       def add_timing_to *methods
@@ -17,30 +32,25 @@ module Clockblock
         end
       end
 
-      def method_added(method)
+      def future_method_added(method)
         if @future_timer_methods && @future_timer_methods.include?(method)
           unless @added_by_clockblock
             @added_by_clockblock = true
+            @future_timer_methods -= [method]
             add_timing_to_method method
           end
           @added_by_clockblock = false
         end
       end
 
-      def add_timing_to_method(method)
-        stashed_method = "#{method}_stashed_by_clockblock".to_sym
-        receiver.class_eval do
-          alias_method stashed_method, method
-          define_method method do |*args, &block|
-            @clockblock_timers ||= {}
-            @clockblock_timers[method] = Clockblock::Timer.new
+      def method_added(method)
+        future_method_added method
+      end
 
-            @clockblock_timers[method].clock(method) do
-              send stashed_method, *args, &block
-            end
-          end
-        end
+      def singleton_method_added(method)
+        future_method_added method
       end
+
     end
 
     def self.extended(base)

data/lib/clockblock/version.rb

@@ -1,3 +1,3 @@
 module Clockblock
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/clockblock/timing_spec.rb

@@ -1,15 +1,18 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe Clockblock::Timing do
-  describe "extending Clockblock::Timing in a class definition" do
-    let(:ret_val) { 42 }
+  let(:ret_val) { 42 }
 
-    def run_timing_specs(f)
-      f.bar(ret_val).must_equal ret_val
+  def run_timing_specs_on(f, *methods)
+    methods.each do |method|
+      f.send(method, ret_val).must_equal ret_val
       f.clockblock_timers.must_be_kind_of Hash
-      f.clockblock_timers.keys.must_include :bar
-      f.clockblock_timers[:bar].must_be_instance_of Clockblock::Timer
+      f.clockblock_timers.keys.must_include method
+      f.clockblock_timers[method].must_be_instance_of Clockblock::Timer
     end
+  end
+
+  describe "extending Clockblock::Timing in a class definition" do
 
     it "wraps an already defined method in a clock block" do
       
@@ -23,11 +26,11 @@ describe Clockblock::Timing do
 
       end
 
-      run_timing_specs foo_klass.new
+      run_timing_specs_on foo_klass.new, :bar
 
     end
 
-    it "wraps an undefined method in a clock block" do
+    it "eventually wraps an as yet undefined method in a clock block" do
       
       foo_klass = Class.new do
         extend Clockblock::Timing
@@ -39,7 +42,27 @@ describe Clockblock::Timing do
 
       end
 
-      run_timing_specs foo_klass.new
+      run_timing_specs_on foo_klass.new, :bar
+
+    end
+
+    it "wraps multiple methods in a clock block" do
+      
+      foo_klass = Class.new do
+        extend Clockblock::Timing
+        add_timing_to :bar, :baz
+
+        def bar(ret_val)
+          sleep 0.1; ret_val
+        end
+
+        def baz(ret_val)
+          sleep 0.1; ret_val
+        end
+
+      end
+
+      run_timing_specs_on foo_klass.new, :bar, :baz
 
     end
 
@@ -57,25 +80,73 @@ describe Clockblock::Timing do
         end
       end
 
-      run_timing_specs foo_klass.new
+      run_timing_specs_on foo_klass.new, :bar
 
     end
 
     it "class can be extended 'after the fact' and still wrap a method defined in a clock block" do
       
-      foo_klass = Class.new do
+      foo_klass_a = Class.new do
         def bar(ret_val)
           sleep 0.1; ret_val
         end
       end
 
-      foo_klass.class_eval do
+      foo_klass_b = Class.new do
+        def bar(ret_val)
+          sleep 0.1; ret_val
+        end
+      end
+
+      foo_klass_a.class_eval do
         extend Clockblock::Timing
         add_timing_to :bar
       end
 
-      run_timing_specs foo_klass.new
+      foo_klass_b.extend Clockblock::Timing
+      foo_klass_b.add_timing_to :bar
+
+      run_timing_specs_on foo_klass_a.new, :bar
+      run_timing_specs_on foo_klass_b.new, :bar
+
+    end
+  end
+
+  describe "extending Clockblock::Timing with an instance" do
+
+    it "wraps a defined method in a clock block" do
+      
+      foo_klass = Class.new do
+        def bar(ret_val)
+          sleep 0.1; ret_val
+        end
+      end
+
+      f = foo_klass.new
+      f.extend Clockblock::Timing
+      f.add_timing_to :bar
+
+      run_timing_specs_on f, :bar
 
     end
+
+    it "eventually wraps an undefined method in a clock block" do
+
+      foo_klass = Class.new do
+      end
+
+      f = foo_klass.new
+      f.extend Clockblock::Timing
+      f.add_timing_to :bar
+
+      def f.bar(ret_val)
+        sleep 0.1; ret_val
+      end
+
+      run_timing_specs_on f, :bar
+
+    end
+
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockblock
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: