rack-mini-profiler 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3a413c784a90f894e6ae5b6025f9203d161d1f
-  data.tar.gz: 570faec20b83dc6069a7b91fb065835668093ad9
+  metadata.gz: 88d14211a1bd6e204377a0405f364fa9069029f0
+  data.tar.gz: 0c96e6d8d1df58cdd879319063e203efa846bd9f
 SHA512:
-  metadata.gz: c2c03d9750cfa1411b78993f16303bdb836a81b741cfea22cccc6209df9c506b6cf020cd0c3409fe77c869009fded27316683ded937b02759b990dbc5dde4a27
-  data.tar.gz: ba89510aba2923e06632876f740242325e26ebecd48d231b4fcef03cfe1a1417878eba48c63c0ca7d1e040ba029ff2493afdc0e1ff764be6d91fbb1c2c2abf20
+  metadata.gz: f681b1fe0dedcbd7ec6dc43f31cc0eb6d7dd78c0c69ae0b6bd040df166450a833a7f987c7d0167f2e54b30c37323bc99f48440078ad59052b852567a4d6ff442
+  data.tar.gz: dccb1eec80365ab26fd439d280ccc03fe3f0c9c72d193df117c1392b8f338abb4fbb72f676217c5ae5cd47bfb66a8249b4f7a6e244dcf1df7cd322bbff36c2d1

data/Ruby/CHANGELOG

@@ -148,5 +148,9 @@
   * Bugfix: SOLR patching had an incorrect monkey patch
   * Implemented exception tracing using TracePoint see pp=trace-exceptions
 
+30-August-2013
 
+  * 1.30
+  * Feature: Added Rack::MiniProfiler.counter_method(klass,name) for injecting counters
+  * Bug: Counters were not shifting the table correctly
 

data/Ruby/README.md

@@ -153,7 +153,7 @@ end
 
 ## Notes
 
-- Be sure to require rack_mini_profiler last in your Gemfile, when it is required it will monkey patch pg and mysql gems to insert instrumentation. If included to early no SQL will show up.
+- Be sure to require rack_mini_profiler last in your Gemfile, when it is required it will monkey patch pg and mysql gems to insert instrumentation. If included too early no SQL will show up.
 
 ## Available Options
 

data/Ruby/lib/html/includes.tmpl

@@ -159,6 +159,8 @@
     <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)">
       ${MiniProfiler.formatDuration(timing.SqlTimingsDurationMilliseconds)}
     </td>
+  {{else}}
+    <td colspan="2"></td>
   {{/if}}
 
   {{each page.CustomTimingNames}}

data/Ruby/lib/mini_profiler/client_settings.rb

@@ -1,20 +1,20 @@
 module Rack
   class MiniProfiler
     class ClientSettings
-      
+
       COOKIE_NAME = "__profilin"
 
       BACKTRACE_DEFAULT = nil
-      BACKTRACE_FULL = 1 
+      BACKTRACE_FULL = 1
       BACKTRACE_NONE = 2
 
       attr_accessor :disable_profiling
       attr_accessor :backtrace_level
 
-      
+
       def initialize(env)
         request = ::Rack::Request.new(env)
-        @cookie = request.cookies[COOKIE_NAME] 
+        @cookie = request.cookies[COOKIE_NAME]
         if @cookie
           @cookie.split(",").map{|pair| pair.split("=")}.each do |k,v|
             @orig_disable_profiling = @disable_profiling = (v=='t') if k == "dp"
@@ -22,7 +22,7 @@ module Rack
           end
         end
 
-        @backtrace_level = nil if !@backtrace_level.nil? && (@backtrace_level == 0 || @backtrace_level > BACKTRACE_NONE) 
+        @backtrace_level = nil if !@backtrace_level.nil? && (@backtrace_level == 0 || @backtrace_level > BACKTRACE_NONE)
         @orig_backtrace_level = @backtrace_level
 
       end
@@ -30,7 +30,7 @@ module Rack
       def write!(headers)
         if @orig_disable_profiling != @disable_profiling || @orig_backtrace_level != @backtrace_level || @cookie.nil?
           settings = {"p" =>  "t" }
-          settings["dp"] = "t" if @disable_profiling 
+          settings["dp"] = "t" if @disable_profiling
           settings["bt"] = @backtrace_level if @backtrace_level
           settings_string = settings.map{|k,v| "#{k}=#{v}"}.join(",")
           Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, :value => settings_string, :path => '/')
@@ -45,19 +45,19 @@ module Rack
         !@cookie.nil?
       end
 
-      def disable_profiling? 
+      def disable_profiling?
         @disable_profiling
       end
 
-      def backtrace_full? 
+      def backtrace_full?
         @backtrace_level == BACKTRACE_FULL
       end
 
-      def backtrace_default? 
+      def backtrace_default?
         @backtrace_level == BACKTRACE_DEFAULT
       end
-      
-      def backtrace_none? 
+
+      def backtrace_none?
         @backtrace_level == BACKTRACE_NONE
       end
     end

data/Ruby/lib/mini_profiler/page_timer_struct.rb

@@ -43,16 +43,16 @@ module Rack
       def root
         @attributes['Root']
       end
-      
+
       def to_json(*a)
         attribs = @attributes.merge(
-          "Started" => '/Date(%d)/' % @attributes['Started'], 
+          "Started" => '/Date(%d)/' % @attributes['Started'],
           "DurationMilliseconds" => @attributes['Root']['DurationMilliseconds'],
           "CustomTimingNames" => @attributes['CustomTimingStats'].keys.sort
-        )        
+        )
         ::JSON.generate(attribs, :max_nesting => 100)
       end
     end
-    
+
   end
 end

data/Ruby/lib/mini_profiler/profiler.rb

@@ -450,6 +450,9 @@ module Rack
         body << "#{k}: #{v}\n"
       end
 
+      body << "\n\nRuby Version\n---------------\n"
+      body << "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL}\n"
+
       body << "\n\nInternals\n---------------\n"
       body << "Storage Provider #{config.storage_instance}\n"
       body << "User #{user(env)}\n"

data/Ruby/lib/mini_profiler/profiling_methods.rb

@@ -55,8 +55,16 @@ module Rack
         end
       end
 
-      def profile_method(klass, method, &blk)
-        default_name = klass.to_s + " " + method.to_s
+      def counter_method(klass, method, &blk)
+        self.profile_method(klass, method, :counter, &blk)
+      end
+
+      def uncounter_method(klass, method)
+        self.unprofile_method(klass, method)
+      end
+
+      def profile_method(klass, method, type = :profile, &blk)
+        default_name = type==:counter ? method.to_s  : klass.to_s + " " + method.to_s
         clean = clean_method_name(method)
 
         with_profiling =  ("#{clean}_with_mini_profiler").intern
@@ -81,22 +89,34 @@ module Rack
               end
           end
 
-          parent_timer = Rack::MiniProfiler.current.current_timer
-          page_struct = Rack::MiniProfiler.current.page_struct
           result = nil
+          parent_timer = Rack::MiniProfiler.current.current_timer
 
-          Rack::MiniProfiler.current.current_timer = current_timer = parent_timer.add_child(name)
-          begin
-            result = self.send without_profiling, *args, &orig
-          ensure
-            current_timer.record_time
-            Rack::MiniProfiler.current.current_timer = parent_timer
+          if type == :counter
+            start = Time.now
+            begin
+              result = self.send without_profiling, *args, &orig
+            ensure
+              duration_ms = (Time.now - start).to_f * 1000
+              parent_timer.add_custom(name, duration_ms, Rack::MiniProfiler.current.page_struct )
+            end
+          else
+            page_struct = Rack::MiniProfiler.current.page_struct
+
+            Rack::MiniProfiler.current.current_timer = current_timer = parent_timer.add_child(name)
+            begin
+              result = self.send without_profiling, *args, &orig
+            ensure
+              current_timer.record_time
+              Rack::MiniProfiler.current.current_timer = parent_timer
+            end
           end
+
           result
         end
         klass.send :alias_method, method, with_profiling
       end
-      
+
       # Add a custom timing. These are displayed similar to SQL/query time in
       # columns expanding to the right.
       #

data/Ruby/lib/mini_profiler/request_timer_struct.rb

@@ -4,7 +4,7 @@ module Rack
   class MiniProfiler
 
     class RequestTimerStruct < TimerStruct
-      
+
       def self.createRoot(name, page)
         rt = RequestTimerStruct.new(name, page, nil)
         rt["IsRoot"]= true
@@ -77,7 +77,7 @@ module Rack
         self['SqlTimings'].push(timer)
         self['HasSqlTimings'] = true
         self['SqlTimingsDurationMilliseconds'] += elapsed_ms
-        page['DurationMillisecondsInSql'] += elapsed_ms        
+        page['DurationMillisecondsInSql'] += elapsed_ms
         timer
       end
 
@@ -103,13 +103,13 @@ module Rack
         self['DurationMilliseconds'] = milliseconds
         self['IsTrivial'] = true if milliseconds < self["TrivialDurationThresholdMilliseconds"]
         self['DurationWithoutChildrenMilliseconds'] = milliseconds - @children_duration
-        
+
         if @parent
           @parent.children_duration += milliseconds
         end
 
-      end     
+      end
     end
   end
-  
+
 end

data/Ruby/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '8ceae04dd2abbc08ffe85a258d408292'.freeze
+    VERSION = '94950211d89e89a9694bc493497ab05f'.freeze
   end
 end

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.29"
+	s.version = "0.1.30"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack