rack-mini-profiler 0.1.13.pre → 0.1.18

data/CHANGELOG

@@ -63,3 +63,21 @@
   * made pp=full-backtrace "sticky"
   * added pp=normal-backtrace to clear the "sticky" state
   * change "pp=sample" to work with "caller" no need for stack trace gem
+
+4-September-2012 - Sam 
+
+  * 1.15.pre
+  * fixed annoying bug where client settings were not sticking 
+  * fixed long standing issue with Rack::ConditionalGet stopping MiniProfiler from working properly
+
+5-September-2012 - Sam 
+
+  * 1.16
+  * fixed long standing problem specs (issue with memory store)
+  * fixed issue where profiler would be dumped when you got a 404 in production (and any time rails is bypassed)
+  * implemented stacktrace properly
+
+9-September-2012 - Sam
+
+  * 1.17
+  * pp=sample was bust unless stacktrace was installed

data/lib/html/includes.js

@@ -114,7 +114,7 @@ var MiniProfiler = (function ($) {
 
                     }
                 }
-            } else if (ajaxStartTime != null && clientProbes.length > 0) {
+            } else if (ajaxStartTime != null && clientProbes && clientProbes.length > 0) {
                 clientPerformance = { timing: { navigationStart: ajaxStartTime.getTime() } };
                 ajaxStartTime = null;
             }

data/lib/html/includes.tmpl

@@ -43,7 +43,7 @@
             {{if HasSqlTimings}}
               <td colspan="2" class="profiler-number profiler-percent-in-sql" title="${MiniProfiler.getSqlTimingsCount(Root)} queries spent ${MiniProfiler.formatDuration(DurationMillisecondsInSql)} ms of total request time">
                 ${MiniProfiler.formatDuration(DurationMillisecondsInSql / DurationMilliseconds * 100)}
-                <span class="profiler-unit">% in qry</span>
+                <span class="profiler-unit">% in sql</span>
               </td>
             {{/if}}
             </tr>
@@ -138,10 +138,10 @@
     </td>
 
   {{if HasSqlTimings}}
-    <td class="profiler-duration {{if HasDuplicateSqlTimings}}profiler-warning{{/if}}" title="{{if HasDuplicateSqlTimings}}duplicate queries detected - {{/if}}${ExecutedReaders} reader, ${ExecutedScalars} scalar, ${ExecutedNonQueries} non-query statements executed">
+    <td class="profiler-duration {{if HasDuplicateSqlTimings}}profiler-warning{{/if}}" title="{{if HasDuplicateSqlTimings}}duplicate queries detected - {{/if}}{{if ExecutedReaders > 0 || ExecutedScalars > 0 || ExecutedNonQueries > 0}}${ExecutedReaders} reader, ${ExecutedScalars} scalar, ${ExecutedNonQueries} non-query statements executed{{/if}}">
       <a class="profiler-queries-show">
         {{if HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
-        ${SqlTimings.length} <span class="profiler-unit">qry</span>
+        ${SqlTimings.length} <span class="profiler-unit">sql</span>
       </a>
     </td>
     <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)">
@@ -192,4 +192,4 @@
     </td>
   </tr>
 
-</script>
+</script>

data/lib/mini_profiler/client_settings.rb

@@ -33,12 +33,12 @@ module Rack
           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)
+          Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, :value => settings_string, :path => '/')
         end
       end
 
       def discard_cookie!(headers)
-        Rack::Utils.delete_cookie_header!(headers, COOKIE_NAME)
+        Rack::Utils.delete_cookie_header!(headers, COOKIE_NAME, :path => '/')
       end
 
       def has_cookie?

data/lib/mini_profiler/profiler.rb

@@ -19,7 +19,7 @@ module Rack
 
 	class MiniProfiler
 
-		VERSION = '104'.freeze
+		VERSION = '107'.freeze
 
     class << self 
       
@@ -225,17 +225,30 @@ module Rack
       done_sampling = false
       quit_sampler = false
       backtraces = nil
-      missing_stacktrace = false
+      stacktrace_installed = true
       if query_string =~ /pp=sample/
+        skip_frames = 0
         backtraces = []
         t = Thread.current
+        
+        begin 
+          require 'stacktrace'
+          skip_frames = stacktrace.length
+        rescue LoadError
+          stacktrace_installed = false
+        end
+
         Thread.new {
           begin
             i = 10000 # for sanity never grab more than 10k samples 
             while i > 0
               break if done_sampling
               i -= 1
-              backtraces << t.backtrace
+              if stacktrace_installed
+                backtraces << t.stacktrace(0,-(1+skip_frames), StackFrame::Flags::METHOD | StackFrame::Flags::KLASS)
+              else
+                backtraces << t.backtrace 
+              end
               sleep 0.001
             end
           ensure
@@ -247,6 +260,12 @@ module Rack
 			status, headers, body = nil
       start = Time.now 
       begin 
+
+        # Strip all the caching headers so we don't get 304s back 
+        #  This solves a very annoying bug where rack mini profiler never shows up
+        env['HTTP_IF_MODIFIED_SINCE'] = nil
+        env['HTTP_IF_NONE_MATCH'] = nil
+
         status,headers,body = @app.call(env)
         client_settings.write!(headers)
       ensure
@@ -258,10 +277,14 @@ module Rack
 
       skip_it = current.discard
       if (config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
-        client_settings.discard_cookie!(headers)
+        # this is non-obvious, don't kill the profiling cookie on errors or short requests
+        # this ensures that stuff that never reaches the rails stack does not kill profiling
+        if status == 200 && ((Time.now - start) > 0.1) 
+          client_settings.discard_cookie!(headers)
+        end
         skip_it = true
       end
-      
+
       return [status,headers,body] if skip_it
 
       # we must do this here, otherwise current[:discard] is not being properly treated
@@ -280,7 +303,6 @@ module Rack
 
       if backtraces
         body.close if body.respond_to? :close
-        return help(:stacktrace, client_settings) if missing_stacktrace
         return analyze(backtraces, page_struct)
       end
       
@@ -360,7 +382,7 @@ module Rack
   pp=no-backtrace #{"(*) " if client_settings.backtrace_none?}: don't collect stack traces from all the SQL executed (sticky, use pp=normal-backtrace to enable)
   pp=normal-backtrace #{"(*) " if client_settings.backtrace_default?}: collect stack traces from all the SQL executed and filter normally
   pp=full-backtrace #{"(*) " if client_settings.backtrace_full?}: enable full backtraces for SQL executed (use pp=normal-backtrace to disable) 
-  pp=sample : sample stack traces and return a report isolating heavy usage (experimental)
+  pp=sample : sample stack traces and return a report isolating heavy usage (experimental works best with the stacktrace gem)
   pp=disable : disable profiling for this session 
   pp=enable : enable profiling for this session (if previously disabled)
 "
@@ -382,6 +404,7 @@ module Rack
         fulldump << "\n\n"
         distinct = {}
         trace.each do |frame|
+          frame = "#{frame.klass}::#{frame.method}" unless String === frame
           unless distinct[frame]
             distinct[frame] = true
             seen[frame] ||= 0

data/lib/mini_profiler/profiling_methods.rb

@@ -8,6 +8,22 @@ module Rack
 			  c.current_timer.add_sql(query, elapsed_ms, c.page_struct, c.skip_backtrace, c.full_backtrace) if (c && c.current_timer)
 		  end
 
+      def start_step(name)
+        if current
+          parent_timer = current.current_timer
+          current.current_timer = current_timer = current.current_timer.add_child(name)
+          [current_timer,parent_timer]
+        end
+      end
+
+      def finish_step(obj)
+        if obj && current
+          current_timer, parent_timer = obj
+          current_timer.record_time
+          current.current_timer = parent_timer
+        end
+      end
+
       # perform a profiling step on given block
       def step(name, opts = nil)
         if current
@@ -26,8 +42,11 @@ module Rack
       end
 
       def unprofile_method(klass, method)
-        with_profiling = (method.to_s + "_with_mini_profiler").intern
-        without_profiling = (method.to_s + "_without_mini_profiler").intern
+
+        clean = clean_method_name(method)
+
+        with_profiling = ("#{clean}_with_mini_profiler").intern
+        without_profiling = ("#{clean}_without_mini_profiler").intern
         
         if klass.send :method_defined?, with_profiling
           klass.send :alias_method, method, without_profiling
@@ -38,8 +57,10 @@ module Rack
 
       def profile_method(klass, method, &blk)
         default_name = klass.to_s + " " + method.to_s
-        with_profiling = (method.to_s + "_with_mini_profiler").intern
-        without_profiling = (method.to_s + "_without_mini_profiler").intern
+        clean = clean_method_name(method)
+
+        with_profiling =  ("#{clean}_with_mini_profiler").intern
+        without_profiling = ("#{clean}_without_mini_profiler").intern
         
         if klass.send :method_defined?, with_profiling
           return # dont double profile
@@ -67,6 +88,13 @@ module Rack
         end
         klass.send :alias_method, method, with_profiling
       end
+
+      private
+
+      def clean_method_name(method)
+        method.to_s.gsub(/[\?\!]/, "")
+      end
+
     end
   end
 end

data/lib/mini_profiler/storage/memory_store.rb

@@ -55,7 +55,7 @@ module Rack
       def cleanup_cache
         expire_older_than = ((Time.now.to_f - MiniProfiler::MemoryStore::EXPIRE_TIMER_CACHE) * 1000).to_i
         @timer_struct_lock.synchronize {
-          @timer_struct_cache.delete_if { |k, v| v['Root']['StartMilliseconds'] < expire_older_than }
+          @timer_struct_cache.delete_if { |k, v| v['Started'] < expire_older_than }
         }
       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.13.pre"
+	s.version = "0.1.18"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Aleks Totic","Sam Saffron", "Robin Ward"]
 	s.description = "Page loading speed displayed on every page. Optimize while you develop, performance is a feature."

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.13.pre
-  prerelease: 7
+  version: 0.1.18
+  prerelease: 
 platform: ruby
 authors:
 - Aleks Totic
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -131,13 +131,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -879601329
+      hash: -322245347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -322245347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24