clockblock 0.0.5 → 0.0.6

data/lib/clockblock/timing.rb

@@ -1,13 +1,19 @@
+require 'set'
+
 module Clockblock
   module Timing
 
     module ClassMethods
       def receiver
-        self.is_a?(Class) ? self : self.singleton_class #(class << self; self; end)
+        self.is_a?(Class) ? self : self.singleton_class
+      end
+
+      def stashed_method_name_for(method)
+        "#{method}_stashed_by_clockblock".to_sym
       end
 
       def add_timing_to_method(method)
-        stashed_method = "#{method}_stashed_by_clockblock".to_sym
+        stashed_method = stashed_method_name_for method
         receiver.class_eval do
           alias_method stashed_method, method
           define_method method do |*args, &block|
@@ -23,22 +29,20 @@ module Clockblock
 
       def add_timing_to *methods
         methods.each do |method|
-          if receiver.method_defined? method
+          if receiver.method_defined?(method) && !receiver.method_defined?(stashed_method_name_for(method))
             add_timing_to_method method
           else
-            @future_timer_methods ||= []
+            @future_timer_methods ||= Set.new
             @future_timer_methods << method
           end
         end
       end
 
       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
+        if !@added_by_clockblock && @future_timer_methods && @future_timer_methods.include?(method)
+          @added_by_clockblock = true
+          @future_timer_methods.subtract [method]
+          add_timing_to_method method
           @added_by_clockblock = false
         end
       end

data/lib/clockblock/version.rb

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

data/spec/lib/clockblock/timing_spec.rb

@@ -19,11 +19,8 @@ describe Clockblock::Timing do
       foo_klass = Class.new do
         extend Clockblock::Timing
 
-        def bar(ret_val)
-          sleep 0.1; ret_val
-        end
+        def bar(ret_val); sleep 0.1; ret_val; end
         add_timing_to :bar
-
       end
 
       run_timing_specs_on foo_klass.new, :bar
@@ -36,10 +33,7 @@ describe Clockblock::Timing do
         extend Clockblock::Timing
         add_timing_to :bar
 
-        def bar(ret_val)
-          sleep 0.1; ret_val
-        end
-
+        def bar(ret_val); sleep 0.1; ret_val; end
       end
 
       run_timing_specs_on foo_klass.new, :bar
@@ -52,14 +46,8 @@ describe Clockblock::Timing 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
-
+        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
@@ -71,14 +59,9 @@ describe Clockblock::Timing do
       foo_klass = Class.new do
         extend Clockblock::Timing
         add_timing_to :bar
-
       end
 
-      foo_klass.class_eval do
-        def bar(ret_val)
-          sleep 0.1; ret_val
-        end
-      end
+      foo_klass.class_eval{ def bar(ret_val); sleep 0.1; ret_val; end }
 
       run_timing_specs_on foo_klass.new, :bar
 
@@ -86,27 +69,21 @@ describe Clockblock::Timing do
 
     it "class can be extended 'after the fact' and still wrap a method defined in a clock block" do
       
-      foo_klass_a = Class.new do
-        def bar(ret_val)
-          sleep 0.1; ret_val
-        end
-      end
-
-      foo_klass_b = Class.new do
-        def bar(ret_val)
-          sleep 0.1; ret_val
-        end
-      end
+      foo_klass_a = Class.new{ def bar(ret_val); sleep 0.1; ret_val; end }
+      foo_klass_b = Class.new{ def bar(ret_val); sleep 0.1; ret_val; end }
 
+      # try it one way
       foo_klass_a.class_eval do
         extend Clockblock::Timing
         add_timing_to :bar
       end
 
+      run_timing_specs_on foo_klass_a.new, :bar
+
+      # try it the other way
       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
@@ -116,11 +93,7 @@ describe Clockblock::Timing 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
+      foo_klass = Class.new{ def bar(ret_val); sleep 0.1; ret_val; end }
 
       f = foo_klass.new
       f.extend Clockblock::Timing
@@ -132,16 +105,13 @@ describe Clockblock::Timing do
 
     it "eventually wraps an undefined method in a clock block" do
 
-      foo_klass = Class.new do
-      end
+      foo_klass = Class.new
 
       f = foo_klass.new
       f.extend Clockblock::Timing
       f.add_timing_to :bar
 
-      def f.bar(ret_val)
-        sleep 0.1; ret_val
-      end
+      def f.bar(ret_val); sleep 0.1; ret_val; end
 
       run_timing_specs_on f, :bar
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockblock
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70121750447240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70121750447240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70121750445980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70121750445980
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70121750445100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70121750445100
 description: Enables easy and DRY code timing capabilities.
 email:
 - jack.ross@technekes.com
@@ -100,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Wrap your code in a Clock Block to measure execution duration.