rubyperf 1.3.1 → 1.3.2

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/perf/meter.rb

@@ -417,7 +417,7 @@ protected
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s =~ /^report_(.*)$/
         klass=Object.const_get("Perf").const_get("ReportFormat#{camelize($1)}")
-        return klass.new.format(self) if klass
+        return klass.new.format(self,arguments[0]) if klass
       end
       super
     end

data/lib/perf/report_format.rb

@@ -26,6 +26,7 @@ module Perf
     #
 
     def format(perf,options={})
+      options||={}
       options[:max_count_len] ||= 6
       rep=[]
       percents={}

data/lib/perf/report_format_html.rb

@@ -9,14 +9,42 @@ require 'cgi'
 module Perf
   class ReportFormatHtml < ReportFormat
 
-    PERCENT_FORMAT    = "%.3f"
-    INDENT            = "&nbsp;"*3
+    PERCENT_FORMAT    = "%.2f"                   # default for :time_format
+    TIME_FORMAT       = "%.7f"                   # default for :percent_format
+    COUNT_FORMAT      = "%d"                     # default for :count_format
+    INDENT            = "&nbsp;"*3               # default for :indent_string
 
     def initialize
       super
       @line=0
     end
 
+    # Formats the report in HTML format and returns an array of strings containing the report.
+    #
+    # ==== Attributes
+    #
+    # * +perf+ - The Perf::Meter object to report
+    # * +options+ - A hash of options as follows:
+    #     :time_format => sprintf format of the time (see TIME_FORMAT for default)
+    #     :percent_foramt => sprintf format of the percent (see PERCENT_FORMAT for default)
+    #     :count_format   => sprintf format of the count (see COUNT_FORMAT for default)
+    #     :indent_string  => what string to use to indent the path (see INDENT for default)
+    #
+    # ==== Example
+    #
+    # m=Perf::Meter.new
+    # m.measure(:something) { something }
+    # m.report_html()
+
+    def format(perf,options={})
+      options||={}
+      @time_format     = options[:time_format]    || TIME_FORMAT
+      @percent_format  = options[:percent_format] || PERCENT_FORMAT
+      @count_format    = options[:count_format]   || COUNT_FORMAT
+      @indent_string   = options[:indent_string]   || INDENT
+      super
+    end
+
     # Formats the header
     def format_header(v)
       "<table class='rubyperf_report'><tr>" \
@@ -33,15 +61,15 @@ module Perf
     # Formats the measure
     def format_measure(v)
       @line+=1
-       percent= v[:percent].is_a?(String) ? v[:percent] : (PERCENT_FORMAT%v[:percent])
+       percent= v[:percent].is_a?(String) ? v[:percent] : (@percent_format % v[:percent])
       "<tr class='#{@line % 2==0 ? "even_row" : "odd_row"}'>" \
         "<td class='title'>#{v[:title]}</td>" \
         "<td class='percent'>#{percent}</td>" \
-        "<td class='count'>#{v[:count]}</td>" \
-        "<td class='user_time'>#{v[:time].utime}</td>" \
-        "<td class='system_time'>#{v[:time].stime}</td>" \
-        "<td class='total_time'>#{v[:time].total}</td>" \
-        "<td class='real_time'>#{v[:time].real}</td>" \
+        "<td class='count'>#{@count_format % v[:count]}</td>" \
+        "<td class='user_time'>#{@time_format % v[:time].utime}</td>" \
+        "<td class='system_time'>#{@time_format % v[:time].stime}</td>" \
+        "<td class='total_time'>#{@time_format % v[:time].total}</td>" \
+        "<td class='real_time'>#{@time_format % v[:time].real}</td>" \
       "</tr>"
     end
 
@@ -51,7 +79,7 @@ module Perf
 
     def format_title(what,options)
       path=what.split("\\")
-      "#{(path.size-2) ? INDENT*(path.size-2) : ""}\\#{CGI.escapeHTML(path.last)}"
+      "#{(path.size-2) ? @indent_string * (path.size-2) : ""}\\#{CGI.escapeHTML(path.last)}"
     end
 
   end

data/lib/perf/report_format_simple.rb

@@ -49,6 +49,7 @@ module Perf
     EXTRA_SPACES_AFTER_TITLE  = 2
 
     def format(perf,options={})
+      options ||= {}
       options[:indent]        ||= DEFAULT_INDENT
       super perf,options
     end

data/rubyperf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyperf}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpasqualis"]
@@ -44,13 +44,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/lpasqualis/rubyperf}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{rubyperf helps you measure ruby code performance}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])

data/test/test_perf_meter.rb

@@ -108,6 +108,7 @@ class TestPerfMeter < Test::Unit::TestCase
     assert PerfTestExample.new.methods.sort == imethods
 
     assert_equal 6,m.report_simple.length
+    assert_equal 6,m.report_html(:percent_format=>"%.8f").length
     assert_equal 6,m.report_html.length
     assert_equal ['\methods,0',
                   '\methods\#<Class:PerfTestExample>.static_method,1',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyperf
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  segments_generated: true
+  version: 1.3.2
 platform: ruby
 authors: 
 - lpasqualis
@@ -20,64 +20,60 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  name: shoulda
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  type: :development
-  name: shoulda
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
-  type: :development
-  name: bundler
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 6
         - 4
+        segments_generated: true
         version: 1.6.4
-  type: :development
-  name: jeweler
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  name: rcov
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  type: :development
-  name: rcov
-  version_requirements: *id004
+  requirement: *id004
 description: Used to easily measure the performance of blocks of Ruby code, expressions and methods; provides reporting in various formats
 email: lpasqualis@gmail.com
 executables: []
@@ -121,27 +117,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: rubyperf helps you measure ruby code performance