RubyGems - rack-mini-profiler - Versions diffs - 0.9.8 → 0.9.9 - Mend

rack-mini-profiler 0.9.8 → 0.9.9

Potentially problematic release.

This version of rack-mini-profiler might be problematic. Click here for more details.

Files changed (25) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +17 -0
data/README.md +40 -19
data/lib/html/includes.css +12 -0
data/lib/html/includes.js +53 -18
data/lib/html/includes.less +17 -3
data/lib/html/profile_handler.js +1 -1
data/lib/mini_profiler/asset_version.rb +1 -1
data/lib/mini_profiler/config.rb +2 -1
data/lib/mini_profiler/gc_profiler.rb +18 -22
data/lib/mini_profiler/profiler.rb +47 -63
data/lib/mini_profiler/profiling_methods.rb +17 -11
data/lib/mini_profiler/storage/file_store.rb +2 -0
data/lib/mini_profiler/timer_struct/page.rb +8 -0
data/lib/mini_profiler/timer_struct/request.rb +8 -0
data/lib/mini_profiler/timer_struct/sql.rb +2 -2
data/lib/mini_profiler/version.rb +1 -1
data/lib/mini_profiler_rails/railtie.rb +17 -10
data/lib/patches/db/activerecord.rb +2 -0
data/lib/patches/db/mongo.rb +5 -1
data/lib/patches/db/neo4j.rb +14 -0
data/lib/patches/db/riak.rb +103 -0
data/lib/patches/sql_patches.rb +3 -1
data/rack-mini-profiler.gemspec +1 -1
metadata +7 -5

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661dc965f1499d7a00baa35f5699e91e1552ff68
-  data.tar.gz: 7bbccf4b17154aab14f7bd2012afcf2dac0efe25
+  metadata.gz: 09e877779936ca60a9be72fc14ae574a450cd338
+  data.tar.gz: b53fc49ccabb1d8560c0ee8014199388fbf6749a
 SHA512:
-  metadata.gz: 903fe47823489fae4a2b18aff1cddca204130c1e41b2132c5db951007a5c1fe85b7b110f3264b8abc2f22c07d438071b81c93251bc31cbe26db725b868ca0a2a
-  data.tar.gz: 400bb2bf85475461de90d238eb95cbac925710f758f576c7371cb7b25ef0998bf39d637835520b42dd96fbbeb7cd53f36fe531f83e9e9c8c1cf36022795fcb8c
+  metadata.gz: a5b9ced034cd204f59eb4be61c718a97960fed72a7e4484af99748b9ed62eb7a736a7ebc78668b46b71f743432c53758ced36f918a1c31859c7f965917f0c826
+  data.tar.gz: 3c97726e0f276ff8b1bd3cf220f64f4b9908ca950b4485f6c9978c05d3479582aa166314e0dbc2afb2c1cb478ebb6801f1459a9cb4bcc51df7cec7826ee96356

data/CHANGELOG.md CHANGED

@@ -1,5 +1,22 @@
 # CHANGELOG
+##
+## 0.9.9 2016-03-06
+- [FIX] removes alias_method_chain in favor of alias_method until Ruby 1.9.3 (@ayfredlund)
+- [FIX] Dont block mongo when already patched for another db (@rrooding @kbrock)
+- [FIX] get_profile_script when running under passenger configured with RailsBaseURI (@nspring)
+- [FEATURE] Add support for neo4j (@ProGM)
+- [FIX] ArgumentError: comparison of String with 200 failed (@paweljw)
+- [FEATURE] Add support for Riak (@janx)
+- [PERF] GC profiler much faster (@dgynn)
+- [FIX] If local storage is disabled don't bomb out (@elia)
+- [FIX] Create tmp directory when actually using it (@kbrock)
+- [ADDED] Default collapse_results setting that collapses multiple timings on same page to a single one (@sam)
+- [ADDED] Rack::MiniProfiler.profile_singleton_method (@kbrock)
+- [CHANGE] Added Rack 2.0 support (and dropped support for Rack 1.1) (@dgynn)
 ## 0.9.8 - 2015-11-27 (Sam Saffron)
 - [FEATURE] disable_env_dump config setting (@mathias)

data/README.md CHANGED

@@ -66,11 +66,17 @@ end
 ```ruby
 require 'rack-mini-profiler'
+home = lambda { |env|
+  [200, {'Content-Type' => 'text/html'}, ["<html><body>hello!</body></html>"]]
+}
 builder = Rack::Builder.new do
   use Rack::MiniProfiler
-  map('/')    { run get }
+  map('/') { run home }
 end
+run builder
 ```
 #### Sinatra
@@ -145,11 +151,11 @@ if Rails.env.production?
 end
 ```
-MemoryStore stores results in a processes heap - something that does not work well in a multi process environment.
-FileStore stores results in the file system - something that may not work well in a multi machine environment.
-RedisStore/MemcacheStore work in multi process and multi machine environments (RedisStore only saves results for up to 24 hours so it won't continue to fill up Redis).
+`MemoryStore` stores results in a processes heap - something that does not work well in a multi process environment.
+`FileStore` stores results in the file system - something that may not work well in a multi machine environment.
+`RedisStore`/`MemcacheStore` work in multi process and multi machine environments (`RedisStore` only saves results for up to 24 hours so it won't continue to fill up Redis).
-Additionally you may implement an AbstractStore for your own provider.
+Additionally you may implement an `AbstractStore` for your own provider.
 ### User result segregation
@@ -167,6 +173,17 @@ Rack::MiniProfiler.config.user_provider = Proc.new{ |env| CurrentUser.get(env) }
 The string this function returns should be unique for each user on the system (for anonymous you may need to fall back to ip address)
+### Profiling specific methods
+You can increase the granularity of profiling by measuring the performance of specific methods. Add methods of interest to an initializer.
+```ruby
+Rails.application.config.to_prepare do
+  ::Rack::MiniProfiler.profile_singleton_method(User, :non_admins) { |a| "executing all_non_admins" }
+  ::Rack::MiniProfiler.profile_method(User, :favorite_post) { |a| "executing favorite_post" }
+end
+```
 ### Configuration Options
 You can set configuration options using the configuration accessor on `Rack::MiniProfiler`.
@@ -178,19 +195,23 @@ Rack::MiniProfiler.config.start_hidden = true
 ```
 The available configuration options are:
-* pre_authorize_cb - A lambda callback you can set to determine whether or not mini_profiler should be visible on a given request. Default in a Rails environment is only on in development mode. If in a Rack app, the default is always on.
-* position - Can either be 'right' or 'left'. Default is 'left'.
-* skip_paths - Specifies path list that can be skipped.
-* skip_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
-* auto_inject (default true) - when false the miniprofiler script is not injected in the page
-* backtrace_ignores (default nil) - an array of regexes you can use to filter out unwanted lines from the backtraces
-* backtrace_includes (default nil, or [/^\/?(app|config|lib|test)/] in rails) - an array of regexes you can use to keep lines in the backtrace
-* backtrace_remove (default nil, or Rails.root in rails) - A string or regex to remove part of each line in the backtrace
-* toggle_shortcut (default Alt+P) - a jquery.hotkeys.js-style keyboard shortcut, used to toggle the mini_profiler's visibility. See https://github.com/jeresig/jquery.hotkeys for more info.
-* start_hidden (default false) - Whether or not you want the mini_profiler to be visible when loading a page
-* backtrace_threshold_ms (default zero) - Minimum SQL query elapsed time before a backtrace is recorded. Backtrace recording can take a couple of milliseconds on rubies earlier than 2.0, impacting performance for very small queries.
-* flamegraph_sample_rate (default 0.5ms) - How often fast_stack should get stack trace info to generate flamegraphs
-* disable_env_dump (default false) - When enabled, disables the `?pp=env` which can be useful when you are concerned about not sending ENV vars out over HTTP.
+Option|Default|Description
+-------|---|--------
+pre_authorize_cb|Rails: dev only<br>Rack: always on|A lambda callback that returns true to make mini_profiler visible on a given request.
+position|`'left'`|Display mini_profiler on `'right'` or `'left'`.
+skip_paths|`[]`|Paths that skip profiling.
+skip_schema_queries|Rails dev: `'true'`<br>Othwerwise: `'false'`|`'true'` to log schema queries.
+auto_inject|`true`|`true` to inject the miniprofiler script in the page.
+backtrace_ignores|`[]`|Regexes of lines to be removed from backtraces.
+backtrace_includes|Rails: `[/^\/?(app|config|lib|test)/]`<br>Rack: `[]`|Regexes of lines to keep in backtraces.
+backtrace_remove|rails: `Rails.root`<br>Rack: `nil`|A string or regex to remove part of each line in the backtrace.
+toggle_shortcut|Alt+P|Keyboard shortcut to toggle the mini_profiler's visibility. See [jquery.hotkeys](https://github.com/jeresig/jquery.hotkeys).
+start_hidden|`false`|`false` to make mini_profiler visible on page load.
+backtrace_threshold_ms|`0`|Minimum SQL query elapsed time before a backtrace is recorded. Backtrace recording can take a couple of milliseconds on rubies earlier than 2.0, impacting performance for very small queries.
+flamegraph_sample_rate|`0.5ms`|How often to capture stack traces for flamegraphs.
+disable_env_dump|`false`|`true` disables `?pp=env`, which prevents sending ENV vars over HTTP.
+base_url_path|`'/mini-profiler-resources/'`|Path for assets; added as a prefix when naming assets and sought when responding to requests.
+collapse_results|`true`|If multiple timing results exist in a single page, collapse them till clicked.
 ### Custom middleware ordering (required if using `Rack::Deflate` with Rails)

data/lib/html/includes.css CHANGED

@@ -267,6 +267,7 @@
 .profiler-results.profiler-left {
   left: 0px;
 }
+.profiler-results.profiler-left.profiler-no-controls .profiler-totals,
 .profiler-results.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
 .profiler-results.profiler-left .profiler-controls {
   -webkit-border-bottom-right-radius: 10px;
@@ -280,6 +281,7 @@
 .profiler-results.profiler-right {
   right: 0px;
 }
+.profiler-results.profiler-right.profiler-no-controls .profiler-totals,
 .profiler-results.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
 .profiler-results.profiler-right .profiler-controls {
   -webkit-border-bottom-left-radius: 10px;
@@ -316,6 +318,16 @@
   color: #fff;
   font-weight: normal;
 }
+.profiler-results .profiler-totals .profiler-reqs {
+  font-family: Consolas, monospace, serif;
+  font-size: 10px;
+  margin-left: 6px;
+}
+.profiler-results .profiler-totals .profiler-reqs:before {
+  font-family: Consolas, monospace, serif;
+  content: "×";
+  margin-right: 1px;
+}
 .profiler-results .profiler-controls {
   display: block;
   font-size: 12px;

data/lib/html/includes.js CHANGED

@@ -10,9 +10,12 @@ var MiniProfiler = (function () {
         ajaxStartTime
         ;
-    var hasLocalStorage = function () {
+    var hasLocalStorage = function (keyPrefix) {
         try {
-            return 'localStorage' in window && window['localStorage'] !== null;
+            // attempt to save to localStorage as Safari private windows will throw an error
+            localStorage[keyPrefix+'-test'] = '1';
+            localStorage.removeItem(keyPrefix+'-test');
+            return 'localStorage' in window && window['localStorage'] !== null ;
         } catch (e) {
             return false;
         }
@@ -23,7 +26,7 @@ var MiniProfiler = (function () {
     };
     var save = function (keyPrefix, value) {
-        if (!hasLocalStorage()) { return; }
+        if (!hasLocalStorage(keyPrefix)) { return; }
         // clear old keys with this prefix, if any
         for (var i = 0; i < localStorage.length; i++) {
@@ -37,7 +40,7 @@ var MiniProfiler = (function () {
     };
     var load = function (keyPrefix) {
-        if (!hasLocalStorage()) { return null; }
+        if (!hasLocalStorage(keyPrefix)) { return null; }
         return localStorage[getVersionedKey(keyPrefix)];
     };
@@ -62,7 +65,7 @@ var MiniProfiler = (function () {
     };
     var getClientPerformance = function() {
-        return window.performance == null ? null : window.performance;
+        return window.performance === null ? null : window.performance;
     };
     var fetchResults = function (ids) {
@@ -86,7 +89,7 @@ var MiniProfiler = (function () {
                 clientPerformance = getClientPerformance();
-                if (clientPerformance != null) {
+                if (clientPerformance !== null) {
                     // ie is buggy strip out functions
                     var copy = { navigation: {}, timing: {} };
@@ -114,7 +117,7 @@ var MiniProfiler = (function () {
                     }
                 }
-            } else if (ajaxStartTime != null && clientProbes && clientProbes.length > 0) {
+            } else if (ajaxStartTime !== null && clientProbes && clientProbes.length > 0) {
                 clientPerformance = { timing: { navigationStart: ajaxStartTime.getTime() } };
                 ajaxStartTime = null;
             }
@@ -146,9 +149,39 @@ var MiniProfiler = (function () {
         return $('#profilerTemplate').tmpl(json);
     };
+    var totalsControl;
+    var reqs = 0;
+    var totalTime = 0;
     var buttonShow = function (json) {
         var result = renderTemplate(json);
+        totalTime += parseFloat(json.duration_milliseconds, 10);
+        reqs++;
+        if (!controls && reqs > 1 && options.collapseResults) {
+          if (!totalsControl) {
+            container.find('.profiler-result').hide();
+            totalsControl = $("<div class='profiler-result'><div class='profiler-button profiler-totals'></div></div>");
+            totalsControl.appendTo(container);
+            totalsControl.click(function(){
+              totalsControl.parent().find('.profiler-result').show();
+              totalsControl.hide();
+              options.collapseResults = false;
+            });
+            totalsControl.find('.profiler-button').show();
+          }
+          var reqsHtml = reqs > 1 ? ("<span class='profiler-reqs'>" + reqs + "</span>") : "";
+          totalsControl.find('.profiler-button').html("<span class='profiler-number'>" +
+                    totalTime.toFixed(1) + "</span> <span class='profiler-unit'>ms</span>" +
+                    reqsHtml);
+          result.hide();
+        }
         if (controls)
             result.insertBefore(controls);
         else
@@ -480,7 +513,7 @@ var MiniProfiler = (function () {
             PageRequestManager.add_endRequest(function (sender, args) {
                 if (args) {
                     var response = args.get_response();
-                    if (response.get_responseAvailable() && response._xmlHttpRequest != null) {
+                    if (response.get_responseAvailable() && response._xmlHttpRequest !== null) {
                         var stringIds = args.get_response().getResponseHeader('X-MiniProfiler-Ids');
                         if (stringIds) {
                             var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
@@ -557,14 +590,14 @@ var MiniProfiler = (function () {
                     }
                   }
-                  if (this.miniprofiler.prev_onreadystatechange != null)
+                  if (this.miniprofiler.prev_onreadystatechange !== null)
                     return this.miniprofiler.prev_onreadystatechange.apply(this, arguments);
                 };
               }
             }
             return _send.apply(this, arguments);
-          }
+          };
         }
         // some elements want to be hidden on certain doc events
@@ -594,11 +627,12 @@ var MiniProfiler = (function () {
                     var maxTraces = parseInt(script.getAttribute('data-max-traces'), 10);
                 }
-                if (script.getAttribute('data-trivial') === 'true') var trivial = true;
-                if (script.getAttribute('data-children') == 'true') var children = true;
-                if (script.getAttribute('data-controls') == 'true') var controls = true;
-                if (script.getAttribute('data-authorized') == 'true') var authorized = true;
-                if (script.getAttribute('data-start-hidden') == 'true') var startHidden = true;
+                var collapseResults = script.getAttribute('data-collapse-results') === 'true';
+                var trivial = script.getAttribute('data-trivial') === 'true';
+                var children = script.getAttribute('data-children') === 'true';
+                var controls = script.getAttribute('data-controls') === 'true';
+                var authorized = script.getAttribute('data-authorized') === 'true';
+                var startHidden = script.getAttribute('data-start-hidden') === 'true';
                 return {
                     ids: ids,
@@ -612,7 +646,8 @@ var MiniProfiler = (function () {
                     currentId: currentId,
                     authorized: authorized,
                     toggleShortcut: toggleShortcut,
-                    startHidden: startHidden
+                    startHidden: startHidden,
+                    collapseResults: collapseResults
                 };
             })();
@@ -842,7 +877,7 @@ var MiniProfiler = (function () {
             var processTimes = function (elem, parent) {
                 var duration = { start: elem.start_milliseconds, finish: (elem.start_milliseconds + elem.duration_milliseconds) };
                 elem.richTiming = [duration];
-                if (parent != null) {
+                if (parent !== null) {
                     elem.parent = parent;
                     elem.parent.richTiming = removeDuration(elem.parent.richTiming, duration);
                 }
@@ -877,7 +912,7 @@ var MiniProfiler = (function () {
             var determineGap = function (gap, node, match) {
                 var overlap = determineOverlap(gap, node);
-                if (match == null || overlap > match.duration) {
+                if (match === null || overlap > match.duration) {
                     match = { name: node.name, duration: overlap };
                 }
                 else if (match.name == node.name) {

data/lib/html/includes.less CHANGED

@@ -247,7 +247,7 @@
 }
 // ajaxed-in results will be appended to this
-.profiler-results
+.profiler-results
 {
     z-index:@zindex + 3;
     position:fixed;
@@ -258,7 +258,7 @@
     &.profiler-left {
         left:0px;
-        &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
+        &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
             -webkit-border-bottom-right-radius: @radius;
             -moz-border-radius-bottomright: @radius;
             border-bottom-right-radius: @radius;
@@ -272,7 +272,7 @@
     &.profiler-right {
         right:0px;
-        &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
+        &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
             -webkit-border-bottom-left-radius: @radius;
             -moz-border-radius-bottomleft: @radius;
             border-bottom-left-radius: @radius;
@@ -306,6 +306,20 @@
         }
     }
+    .profiler-totals {
+      .profiler-reqs {
+        font-family: @codeFonts;
+        font-size: 10px;
+        margin-left: 6px;
+        &:before {
+          font-family: @codeFonts;
+          content: "×";
+          margin-right: 1px;
+        }
+      }
+    }
     .profiler-controls {
         display: block;
         font-size:12px;

data/lib/html/profile_handler.js CHANGED

	@@ -1 +1 @@
1	- <script async type="text/javascript" id="mini-profiler" src="{path}includes.js?v={version}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-position="{position}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}"></script>
1	+ <script async type="text/javascript" id="mini-profiler" src="{path}includes.js?v={version}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-position="{position}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}" data-collapse-results="{collapseResults}"></script>

data/lib/mini_profiler/asset_version.rb CHANGED

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    ASSET_VERSION = 'e0e50f551fa464f9d95c2e082bb2d45b'.freeze
+    ASSET_VERSION = '16af8af9ec9b135097ff8209e717f825'.freeze
   end
 end

data/lib/mini_profiler/config.rb CHANGED

@@ -18,7 +18,7 @@ module Rack
       :flamegraph_sample_rate, :logger, :position, :pre_authorize_cb,
       :skip_paths, :skip_schema_queries, :start_hidden, :storage,
       :storage_failure, :storage_instance, :storage_options, :toggle_shortcut,
-      :user_provider
+      :user_provider, :collapse_results
     # Deprecated options
     attr_accessor :use_existing_jquery
@@ -48,6 +48,7 @@ module Rack
           end
           @enabled = true
           @disable_env_dump = false
+          @collapse_results = true
           self
         }
       end

data/lib/mini_profiler/gc_profiler.rb CHANGED

@@ -6,18 +6,15 @@ class Rack::MiniProfiler::GCProfiler
   end
   def object_space_stats
-    stats = {}
-    ids = {}
+    stats = Hash.new(0).compare_by_identity
+    ids = Hash.new.compare_by_identity
     @ignore << stats.__id__
     @ignore << ids.__id__
-    i=0
     ObjectSpace.each_object { |o|
       begin
-        i = stats[o.class] || 0
-        i += 1
-        stats[o.class] = i
+        stats[o.class] += 1
         ids[o.__id__] = o if Integer === o.__id__
       rescue NoMethodError
         # protect against BasicObject
@@ -38,12 +35,12 @@ class Rack::MiniProfiler::GCProfiler
   end
   def diff_object_stats(before, after)
-    diff = {}
+    diff = {}.compare_by_identity
     after.each do |k,v|
-      diff[k] = v - (before[k] || 0)
+      diff[k] = v - before[k]
     end
     before.each do |k,v|
-      diff[k] = 0 - v unless after[k]
+      diff[k] = 0 - v unless after.has_key?(k)
     end
     diff
@@ -97,11 +94,6 @@ class Rack::MiniProfiler::GCProfiler
     # for memsize_of
     require 'objspace'
-    body = [];
-    stat_before,stat_after,diff,string_analysis,
-      new_objects, memory_allocated, stat, memory_before, objects_before = nil
     # clean up before
     GC.start
     stat          = GC.stat
@@ -118,13 +110,17 @@ class Rack::MiniProfiler::GCProfiler
     new_objects, memory_allocated = analyze_growth(stat_before[:ids], stat_after[:ids])
     objects_before, memory_before = analyze_initial_state(stat_before[:ids])
+    body = []
     body << "
 Overview
-------------------------------------
-Initial state: object count - #{objects_before} , memory allocated outside heap (bytes) #{memory_before}
+--------
+Initial state: object count: #{objects_before}
+Memory allocated outside heap (bytes): #{memory_before}
-GC Stats: #{stat.map{|k,v| "#{k} : #{v}" }.join(", ")}
+GC Stats:
+--------
+#{stat.map{|k,v| "#{k} : #{v}" }.sort!.join("\n")}
 New bytes allocated outside of Ruby heaps: #{memory_allocated}
 New objects: #{new_objects}
@@ -132,16 +128,16 @@ New objects: #{new_objects}
     body << "
 ObjectSpace delta caused by request:
---------------------------------------------\n"
-    diff.to_a.reject{|k,v| v == 0}.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
-      body << "#{k} : #{v}\n" if v != 0
+-----------------------------------\n"
+    diff.to_a.delete_if{|_k, v| v == 0}.sort_by! { |_k, v| v }.reverse_each do |k,v|
+      body << "#{k} : #{v}\n"
     end
     body << "\n
 ObjectSpace stats:
 -----------------\n"
-    stat_after[:stats].to_a.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
+    stat_after[:stats].to_a.sort_by!{ |_k, v| v }.reverse_each do |k,v|
       body << "#{k} : #{v}\n"
     end
@@ -150,7 +146,7 @@ ObjectSpace stats:
 String stats:
 ------------\n"
-    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
+    string_analysis.to_a.sort_by!{ |_k, v| -v }.take(1000).each do |string,count|
       body << "#{count} : #{string}\n"
     end

data/lib/mini_profiler/profiler.rb CHANGED

@@ -17,6 +17,10 @@ module Rack
         @config ||= Config.default
       end
+      def resources_root
+        @resources_root ||= ::File.expand_path("../../html", __FILE__)
+      end
       def share_template
         @share_template ||= ::File.read(::File.expand_path("../html/share.html", ::File.dirname(__FILE__)))
       end
@@ -37,10 +41,11 @@ module Rack
       def create_current(env={}, options={})
         # profiling the request
-        self.current               = Context.new
-        self.current.inject_js     = config.auto_inject && (!env['HTTP_X_REQUESTED_WITH'].eql? 'XMLHttpRequest')
-        self.current.page_struct   = TimerStruct::Page.new(env)
-        self.current.current_timer = current.page_struct[:root]
+        context               = Context.new
+        context.inject_js     = config.auto_inject && (!env['HTTP_X_REQUESTED_WITH'].eql? 'XMLHttpRequest')
+        context.page_struct   = TimerStruct::Page.new(env)
+        context.current_timer = context.page_struct[:root]
+        self.current          = context
       end
       def authorize_request
@@ -92,24 +97,26 @@ module Rack
         @storage.set_viewed(user(env), id)
       end
-      result_json = page_struct.to_json
       # If we're an XMLHttpRequest, serve up the contents as JSON
       if request.xhr?
+        result_json = page_struct.to_json
         [200, { 'Content-Type' => 'application/json'}, [result_json]]
       else
         # Otherwise give the HTML back
-        html = MiniProfiler.share_template.dup
-        html.gsub!(/\{path\}/, "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}")
-        html.gsub!(/\{version\}/, MiniProfiler::ASSET_VERSION)
-        html.gsub!(/\{json\}/, result_json)
-        html.gsub!(/\{includes\}/, get_profile_script(env))
-        html.gsub!(/\{name\}/, page_struct[:name])
-        html.gsub!(/\{duration\}/, "%.1f" % page_struct.duration_ms)
+        html = generate_html(page_struct, env)
         [200, {'Content-Type' => 'text/html'}, [html]]
       end
+    end
+    def generate_html(page_struct, env, result_json = page_struct.to_json)
+        html = MiniProfiler.share_template.dup
+        html.sub!('{path}', "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}")
+        html.sub!('{version}', MiniProfiler::ASSET_VERSION)
+        html.sub!('{json}', result_json)
+        html.sub!('{includes}', get_profile_script(env))
+        html.sub!('{name}', page_struct[:name])
+        html.sub!('{duration}', page_struct.duration_ms.round(1).to_s)
+        html
     end
     def serve_html(env)
@@ -117,21 +124,11 @@ module Rack
       return serve_results(env) if file_name.eql?('results')
-      full_path = ::File.expand_path("../html/#{file_name}", ::File.dirname(__FILE__))
-      return [404, {}, ["Not found"]] unless ::File.exists? full_path
-      f      = Rack::File.new nil
-      f.path = full_path
-      begin
-        f.cache_control = "max-age:86400"
-        f.serving env
-      rescue
-        # old versions of rack have a different api
-        status, headers, body = f.serving
-        headers.merge! 'Cache-Control' => "max-age:86400"
-        [status, headers, body]
-      end
+      resources_env = env.dup
+      resources_env['PATH_INFO'] = file_name
+      rack_file = Rack::File.new(MiniProfiler.resources_root, {'Cache-Control' => 'max-age:86400'})
+      rack_file.call(resources_env)
     end
@@ -197,11 +194,13 @@ module Rack
         client_settings.disable_profiling = false
       end
+      # profile gc
       if query_string =~ /pp=profile-gc/
         current.measure = false if current
         return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
       end
+      # profile memory
       if query_string =~ /pp=profile-memory/
         query_params = Rack::Utils.parse_nested_query(query_string)
         options = {
@@ -291,7 +290,7 @@ module Rack
       if (config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
         # 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 && status < 300 && ((Time.now - start) > 0.1)
+        if status.to_i >= 200 && status.to_i < 300 && ((Time.now - start) > 0.1)
           client_settings.discard_cookie!(headers)
         end
         skip_it = true
@@ -389,39 +388,17 @@ module Rack
     end
     def inject(fragment, script)
-      if fragment.match(/<\/body>/i)
-        # explicit </body>
-        regex = /<\/body>/i
-        close_tag = '</body>'
-      elsif fragment.match(/<\/html>/i)
-        # implicit </body>
-        regex = /<\/html>/i
-        close_tag = '</html>'
-      else
-        # implicit </body> and </html>. Don't do anything.
-        return fragment
-      end
-      matches = fragment.scan(regex).length
-      index = 1
-      fragment.gsub(regex) do
-        # though malformed there is an edge case where /body exists earlier in the html, work around
-        if index < matches
-          index += 1
-          close_tag
-        else
-          # if for whatever crazy reason we dont get a utf string,
-          #   just force the encoding, no utf in the mp scripts anyway
-          if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
-            (script + close_tag).force_encoding(fragment.encoding)
-          else
-            script + close_tag
-          end
+      # find explicit or implicit body
+      index = fragment.rindex(/<\/body>/i) || fragment.rindex(/<\/html>/i)
+      if index
+        # if for whatever crazy reason we dont get a utf string,
+        #   just force the encoding, no utf in the mp scripts anyway
+        if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
+          script = script.force_encoding(fragment.encoding)
         end
+        fragment.insert(index, script)
+      else
+        fragment
       end
     end
@@ -594,7 +571,13 @@ Append the following to your query string:
     # * you have disabled auto append behaviour throught :auto_inject => false flag
     # * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
     def get_profile_script(env)
-      path = if env["action_controller.instance"]
+      path = if ENV["PASSENGER_BASE_URI"] then
+        # added because the SCRIPT_NAME workaround below then
+        # breaks running under a prefix as permitted by Passenger.
+        "#{ENV['PASSENGER_BASE_URI']}#{@config.base_url_path}"
+      elsif env["action_controller.instance"]
+        # Rails engines break SCRIPT_NAME; the following appears to discard SCRIPT_NAME
+        # since url_for appears documented to return any String argument unmodified
         env["action_controller.instance"].url_for("#{@config.base_url_path}")
       else
         "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
@@ -610,7 +593,8 @@ Append the following to your query string:
        :showControls    => false,
        :authorized      => true,
        :toggleShortcut  => @config.toggle_shortcut,
-       :startHidden     => @config.start_hidden
+       :startHidden     => @config.start_hidden,
+       :collapseResults => @config.collapse_results
       }
       if current && current.page_struct

data/lib/mini_profiler/profiling_methods.rb CHANGED

@@ -3,9 +3,9 @@ module Rack
     module ProfilingMethods
       def record_sql(query, elapsed_ms)
-        return unless current
+        return unless current && current.current_timer
         c = current
-        c.current_timer.add_sql(query, elapsed_ms, c.page_struct, c.skip_backtrace, c.full_backtrace) if (c && c.current_timer)
+        c.current_timer.add_sql(query, elapsed_ms, c.page_struct, c.skip_backtrace, c.full_backtrace)
       end
       def start_step(name)
@@ -26,10 +26,9 @@ module Rack
       def step(name, opts = nil)
         if current
           parent_timer          = current.current_timer
-          result                = nil
           current.current_timer = current_timer = current.current_timer.add_child(name)
           begin
-            result = yield if block_given?
+            yield if block_given?
           ensure
             current_timer.record_time
             current.current_timer = parent_timer
@@ -87,34 +86,37 @@ module Rack
               end
           end
-          result = nil
           parent_timer = Rack::MiniProfiler.current.current_timer
           if type == :counter
             start = Time.now
             begin
-              result = self.send without_profiling, *args, &orig
+              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
+              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
+      def profile_singleton_method(klass, method, type = :profile, &blk)
+        profile_method(singleton_class(klass), method, type, &blk)
+      end
+      def unprofile_singleton_method(klass, method)
+        unprofile_method(singleton_class(klass), method)
+      end
       # Add a custom timing. These are displayed similar to SQL/query time in
       # columns expanding to the right.
       #
@@ -140,6 +142,10 @@ module Rack
       private
+      def singleton_class(klass)
+        class << klass; self; end
+      end
       def clean_method_name(method)
         method.to_s.gsub(/[\?\!]/, "")
       end

data/lib/mini_profiler/storage/file_store.rb CHANGED

@@ -44,6 +44,8 @@ module Rack
         @path = args[:path]
         @expires_in_seconds = args[:expires_in] || EXPIRES_IN_SECONDS
         raise ArgumentError.new :path unless @path
+        FileUtils.mkdir_p(@path) unless ::File.exists?(@path)
         @timer_struct_cache = FileCache.new(@path, "mp_timers")
         @timer_struct_lock  = Mutex.new
         @user_view_cache    = FileCache.new(@path, "mp_views")

data/lib/mini_profiler/timer_struct/page.rb CHANGED

@@ -40,10 +40,18 @@ module Rack
           self[:root] = TimerStruct::Request.createRoot(name, self)
         end
+        def name
+          @attributes[:name]
+        end
         def duration_ms
           @attributes[:root][:duration_milliseconds]
         end
+        def duration_ms_in_sql
+          @attributes[:duration_milliseconds_in_sql]
+        end
         def root
           @attributes[:root]
         end

data/lib/mini_profiler/timer_struct/request.rb CHANGED

@@ -44,10 +44,18 @@ module Rack
           @page              = page
         end
+        def name
+          @attributes[:name]
+        end
         def duration_ms
           self[:duration_milliseconds]
         end
+        def duration_ms_in_sql
+          @attributes[:duration_milliseconds_in_sql]
+        end
         def start_ms
           self[:start_milliseconds]
         end

data/lib/mini_profiler/timer_struct/sql.rb CHANGED

@@ -17,11 +17,11 @@ module Rack
                     (
                       (
                         Rack::MiniProfiler.config.backtrace_includes.nil? or
-                        Rack::MiniProfiler.config.backtrace_includes.all?{|regex| ln =~ regex}
+                        Rack::MiniProfiler.config.backtrace_includes.any?{|regex| ln =~ regex}
                       ) and
                       (
                         Rack::MiniProfiler.config.backtrace_ignores.nil? or
-                        Rack::MiniProfiler.config.backtrace_ignores.all?{|regex| !(ln =~ regex)}
+                        Rack::MiniProfiler.config.backtrace_ignores.none?{|regex| ln =~ regex}
                       )
                     )
                 stack_trace << ln << "\n"

data/lib/mini_profiler/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.9.8'
+    VERSION = '0.9.9'
   end
 end

data/lib/mini_profiler_rails/railtie.rb CHANGED

@@ -4,9 +4,9 @@ module Rack::MiniProfilerRails
   # call direct if needed to do a defer init
   def self.initialize!(app)
     raise "MiniProfilerRails initialized twice. Set `require: false' for rack-mini-profiler in your Gemfile" if @already_initialized
     c = Rack::MiniProfiler.config
     # By default, only show the MiniProfiler in development mode.
@@ -24,7 +24,9 @@ module Rack::MiniProfilerRails
     c.skip_paths ||= []
-    c.skip_paths << app.config.assets.prefix if serves_static_assets?(app)
+    if serves_static_assets?(app)
+      c.skip_paths << app.config.assets.prefix
+    end
     if Rails.env.development?
       c.skip_schema_queries = true
@@ -41,7 +43,6 @@ module Rack::MiniProfilerRails
     # The file store is just so much less flaky
     base_path = Rails.application.config.paths['tmp'].first rescue "#{Rails.root}/tmp"
     tmp       = base_path + '/miniprofiler'
-    FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
     c.storage_options = {:path => tmp}
     c.storage = Rack::MiniProfiler::FileStore
@@ -61,17 +62,23 @@ module Rack::MiniProfilerRails
     ActiveSupport.on_load(:action_view) do
       ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
     end
     @already_initialized = true
   end
   def self.serves_static_assets?(app)
-    return false if !app.respond_to?(:assets)
-    # Rails 4.2 deprecates serve_static_assets in favor of serve_static_files
-    if app.config.respond_to?(:serve_static_files)
-      app.config.serve_static_files
+    config = app.config
+    if !config.respond_to?(:assets) || !config.assets.respond_to?(:prefix)
+      return false
+    end
+    if ::Rails.version >= "5.0.0"
+      ::Rails.configuration.public_file_server.enabled
+    elsif ::Rails.version >= "4.2.0"
+      ::Rails.configuration.serve_static_files
     else
-      app.config.serve_static_assets
+      ::Rails.configuration.serve_static_assets
     end
   end

data/lib/patches/db/activerecord.rb CHANGED

@@ -21,6 +21,8 @@ module Rack
         rval             = log_without_miniprofiler(*args, &block)
         # Don't log schema queries if the option is set
+#        return rval unless sql =~ /\"vms\"/
+#        return rval unless sql =~ /\"(vms|ext_management_systems)\"/
         return rval if Rack::MiniProfiler.config.skip_schema_queries and name =~ /SCHEMA/
         elapsed_time = SqlPatches.elapsed_time(start)

data/lib/patches/db/mongo.rb CHANGED

@@ -8,5 +8,9 @@ class Mongo::Server::Connection
     end
     return result
   end
-  alias_method_chain :dispatch, :timing
+  # TODO: change to Module#prepend as soon as Ruby 1.9.3 support is dropped
+  alias_method :dispatch_without_timing, :dispatch
+  alias_method :dispatch, :dispatch_with_timing
 end

data/lib/patches/db/neo4j.rb ADDED

@@ -0,0 +1,14 @@
+class Neo4j::Core::Query
+  alias_method :response_without_miniprofiler, :response
+  def response
+    return @response if @response
+    start = Time.now
+    rval = response_without_miniprofiler
+    elapsed_time = SqlPatches.elapsed_time(start)
+    Rack::MiniProfiler.record_sql(to_cypher, elapsed_time)
+    rval
+  end
+  alias_method :response_with_miniprofiler, :response
+end

data/lib/patches/db/riak.rb ADDED

@@ -0,0 +1,103 @@
+# riak-client 2.2.2 patches
+class Riak::Multiget
+  class <<self
+    alias_method :get_all_without_profiling, :get_all
+    def get_all(client, fetch_list)
+      return get_all_without_profiling(client, fetch_list) unless SqlPatches.should_measure?
+      start        = Time.now
+      result       = get_all_without_profiling(client, fetch_list)
+      elapsed_time = SqlPatches.elapsed_time(start)
+      record       = ::Rack::MiniProfiler.record_sql("get_all size=#{fetch_list.size}", elapsed_time)
+      result
+    end
+  end
+end
+class Riak::Client
+  alias_method :buckets_without_profiling, :buckets
+  def buckets(options={}, &blk)
+    profile("buckets #{options}") { buckets_without_profiling(options, &blk) }
+  end
+  alias_method :client_id_without_profiling, :client_id
+  def client_id
+    profile("client_id") { client_id_without_profiling }
+  end
+  alias_method :delete_object_without_profiling, :delete_object
+  def delete_object(bucket, key, options={})
+    profile("delete_object bucket=#{bucket.name} key=#{key} options=#{options}") { delete_object_without_profiling(bucket, key, options) }
+  end
+  alias_method :get_bucket_props_without_profiling, :get_bucket_props
+  def get_bucket_props(bucket, options={})
+    profile("get_bucket_props bucket=#{bucket.name} options=#{options}") { get_bucket_props_without_profiling(bucket, options) }
+  end
+  alias_method :get_index_without_profiling, :get_index
+  def get_index(bucket, index, query, options={})
+    profile("get_index bucket=#{bucket.name} index=#{index} query=#{query} options=#{options}") { get_index_without_profiling(bucket, index, query, options) }
+  end
+  alias_method :get_preflist_without_profiling, :get_preflist
+  def get_preflist(bucket, key, type=nil, options={})
+    profile("get_preflist bucket=#{bucket.name} key=#{key} type=#{type} options=#{options}") { get_preflist_without_profiling(bucket, key, type, options) }
+  end
+  alias_method :get_object_without_profiling, :get_object
+  def get_object(bucket, key, options={})
+    profile("get_object bucket=#{bucket.name} key=#{key} options=#{options}") { get_object_without_profiling(bucket, key, options) }
+  end
+  alias_method :list_keys_without_profiling, :list_keys
+  def list_keys(bucket, options={}, &block)
+    profile("list_keys bucket=#{bucket.name} options=#{options}") { list_keys_without_profiling(bucket, options, &block) }
+  end
+  alias_method :mapred_without_profiling, :mapred
+  def mapred(mr, &block)
+    profile("mapred") { mapred_without_profiling(mr, &block) }
+  end
+  alias_method :ping_without_profiling, :ping
+  def ping
+    profile("ping") { ping_without_profiling }
+  end
+  alias_method :reload_object_without_profiling, :reload_object
+  def reload_object(object, options={})
+    profile("reload_object bucket=#{object.bucket.name} key=#{object.key} vclock=#{object.vclock} options=#{options}") { reload_object_without_profiling(object, options) }
+  end
+  alias_method :set_bucket_props_without_profiling, :set_bucket_props
+  def set_bucket_props(bucket, properties, type=nil)
+    profile("set_bucket_props bucket=#{bucket.name} type=#{type}") { set_bucket_props_without_profiling(bucket, properties, type) }
+  end
+  alias_method :clear_bucket_props_without_profiling, :clear_bucket_props
+  def clear_bucket_props(bucket, options={})
+    profile("clear_bucket_props bucket=#{bucket.name} options=#{options}") { clear_bucket_props_without_profiling(bucket, options) }
+  end
+  alias_method :store_object_without_profiling, :store_object
+  def store_object(object, options={})
+    profile("store_object bucket=#{object.bucket.name} key=#{object.key} vclock=#{object.vclock} options=#{options}") { store_object_without_profiling(object, options) }
+  end
+  private
+  def profile(request, &blk)
+    return yield unless SqlPatches.should_measure?
+    start        = Time.now
+    result       = yield
+    elapsed_time = SqlPatches.elapsed_time(start)
+    record       = ::Rack::MiniProfiler.record_sql(request, elapsed_time)
+    result
+  end
+end

data/lib/patches/sql_patches.rb CHANGED

@@ -46,10 +46,12 @@ end
 require 'patches/db/mysql2'           if defined?(Mysql2::Client) && SqlPatches.class_exists?("Mysql2::Client")
 require 'patches/db/pg'               if defined?(PG::Result) && SqlPatches.class_exists?("PG::Result")
 require 'patches/db/oracle_enhanced'  if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) && SqlPatches.class_exists?("ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter") && SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
-require 'patches/db/mongo'            if defined?(Mongo) &&!SqlPatches.patched? && SqlPatches.module_exists?("Mongo")
+require 'patches/db/mongo'            if defined?(Mongo) && SqlPatches.module_exists?("Mongo")
 require 'patches/db/moped'            if defined?(Moped::Node) && SqlPatches.class_exists?("Moped::Node")
 require 'patches/db/plucky'           if defined?(Plucky::Query) && SqlPatches.class_exists?("Plucky::Query")
 require 'patches/db/rsolr'            if defined?(RSolr::Connection) && SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0"
 require 'patches/db/sequel'           if defined?(Sequel::Database) && !SqlPatches.patched? && SqlPatches.class_exists?("Sequel::Database")
 require 'patches/db/activerecord'     if defined?(ActiveRecord) &&!SqlPatches.patched? && SqlPatches.module_exists?("ActiveRecord")
 require 'patches/db/nobrainer'        if defined?(NoBrainer) && SqlPatches.module_exists?("NoBrainer")
+require 'patches/db/riak'             if defined?(Riak) && SqlPatches.module_exists?("Riak")
+require 'patches/db/neo4j'            if defined?(Neo4j::Core) && SqlPatches.class_exists?("Neo4j::Core::Query")

data/rack-mini-profiler.gemspec CHANGED

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "README.md",
     "CHANGELOG.md"
   ]
-  s.add_runtime_dependency 'rack', '>= 1.1.3'
+  s.add_runtime_dependency 'rack', '>= 1.2.0'
   if RUBY_VERSION < "1.9"
     s.add_runtime_dependency 'json', '>= 1.6'
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -226,10 +226,12 @@ files:
 - lib/patches/db/mongo.rb
 - lib/patches/db/moped.rb
 - lib/patches/db/mysql2.rb
+- lib/patches/db/neo4j.rb
 - lib/patches/db/nobrainer.rb
 - lib/patches/db/oracle_enhanced.rb
 - lib/patches/db/pg.rb
 - lib/patches/db/plucky.rb
+- lib/patches/db/riak.rb
 - lib/patches/db/rsolr.rb
 - lib/patches/db/sequel.rb
 - lib/patches/net_patches.rb
@@ -256,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.