rubyperf 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/perf/meter.rb

@@ -4,6 +4,7 @@
 #
 
 require "benchmark"
+require "rubyperf"
 
 module Perf
 
@@ -42,8 +43,10 @@ module Perf
       @instrumented_methods     = {METHOD_TYPE_INSTANCE=>[],METHOD_TYPE_CLASS=>[]}
       @class_methods            = []
       @subtract_overhead        = @options[:subtract_overhead]
-      @@overhead              ||= measure_overhead  if @subtract_overhead
-      @measurements             = {}      # A hash of Measure
+      if @subtract_overhead
+        @@overhead              ||= measure_overhead
+        @measurements             = {}      # A hash of Measure; must repeat here to cleanup what measure_overhead did
+      end
     end
 
     def overhead
@@ -54,6 +57,10 @@ module Perf
       end
     end
 
+    def has_measures?
+      @measurements.length > 0
+    end
+
     # Returns the total time - expressed with a Benchmark::Tms object - for all the blocks measures
     def blocks_time
       @measurements[PATH_MEASURES].time if @measurements[PATH_MEASURES]

data/lib/perf/meter_factory.rb

@@ -3,6 +3,8 @@
 # https://github.com/lpasqualis/rubyperf
 #
 
+require "rubyperf"
+
 module Perf
 
   # Very simple Perf::Meter factory and singleton management.

data/lib/perf/no_op_meter.rb

@@ -12,6 +12,16 @@ module Perf
   #
   class NoOpMeter
 
+    def measurements
+    end
+
+    def current_path
+    end
+
+    def has_measures?
+      false
+    end
+
     def initialize(options=nil)
     end
 
@@ -67,12 +77,16 @@ module Perf
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s =~ /^report_(.*)$/
-        klass=Object.const_get("Perf").const_get("ReportFormat#{$1.capitalize}")
+        klass=Object.const_get("Perf").const_get("ReportFormat#{camelize($1)}")
         return nil if klass
       end
       super
     end
 
+    def camelize(from)
+      from.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    end
+
   end
 
 end

data/lib/perf/report_format.rb

@@ -3,6 +3,8 @@
 # https://github.com/lpasqualis/rubyperf
 #
 
+require "rubyperf"
+
 module Perf
 
   #

data/lib/perf/report_format_list_of_measures.rb

@@ -5,7 +5,6 @@
 
 
 require 'rubyperf'
-require 'cgi'
 
 module Perf
 

data/rubyperf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyperf}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpasqualis"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "test/perf_test_example.rb",
     "test/rubyperf_test_helpers.rb",
     "test/test_meter_factory.rb",
+    "test/test_no_op_meter.rb",
     "test/test_perf_meter.rb"
   ]
   s.homepage = %q{http://github.com/lpasqualis/rubyperf}

data/test/test_no_op_meter.rb

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2012 Lorenzo Pasqualis - DreamBox Learning, Inc
+# https://github.com/lpasqualis/rubyperf
+#
+
+require "test/unit"
+
+require 'helper'
+
+require 'rubyperf'
+
+require 'rubyperf_test_helpers'
+require 'perf_test_example'
+
+class TestNoOpMeter < Test::Unit::TestCase
+
+  def test_basic
+    m=Perf::NoOpMeter.new
+    assert !m.has_measures?
+    v=m.measure(:a) do
+      m.measure(:b) do
+        123
+      end
+    end
+    assert_equal 123,v
+
+    m.method_meters(PerfTestExample,[:test,:test_np,:test_with_measure],[:static_method]) do
+      a=PerfTestExample.new
+      a.test(1,2,3)
+      a.test_np
+      a.test_with_measure
+      PerfTestExample.static_method
+    end
+
+    assert_nil m.report_html
+    assert_nil m.report_simple
+    assert_nil m.report_list_of_measures
+    error=false
+    begin
+      m.report_this_does_not_exists
+    rescue
+      error=true
+    end
+    assert error
+    assert_nil m.measurements
+    assert_nil m.current_path
+
+    assert_equal 123,m.measure_result(:something) {123}
+    assert_equal 123,m.measure_result(:something) {m.measure(:blah){123}}
+  end
+
+
+end

data/test/test_perf_meter.rb

@@ -116,6 +116,13 @@ class TestPerfMeter < Test::Unit::TestCase
                 m.report_list_of_measures
   end
 
+  def test_has_measures
+    m=Perf::Meter.new
+    assert !m.has_measures?
+    m.measure(:a) {assert m.has_measures?}
+    assert m.has_measures?
+  end
+
   def test_methods_with_measure
     Perf::MeterFactory.clear_all!
     m=Perf::MeterFactory.get

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyperf
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - lpasqualis
@@ -109,6 +109,7 @@ files:
 - test/perf_test_example.rb
 - test/rubyperf_test_helpers.rb
 - test/test_meter_factory.rb
+- test/test_no_op_meter.rb
 - test/test_perf_meter.rb
 has_rdoc: true
 homepage: http://github.com/lpasqualis/rubyperf