rack-mini-profiler 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f34392424f5776e5e0e9f2b4a4cdce94a25386d
-  data.tar.gz: 075b0768179f69aaddb7c9d70b26dbabd78852d7
+  metadata.gz: b2d3cb66046f8ae5f6a4c61b944374e4176db06c
+  data.tar.gz: be9fd719a26021fed90ec17851cddf5b510aed0c
 SHA512:
-  metadata.gz: 4b062c51034ab8fd8fa0fc9a534288773e8400cd26914e40a1146b55cba41bbfe490ae1882b4dbc7dd12bc60e744a6eaf93a44401a203396e7074a7df6313dba
-  data.tar.gz: 8a382e89bd7e61cab7af6b6e156c1f6769676233cf17ab8b1683b3a43ca1d85d2032eb8c6d53feec7a2ab7942fe8966087fa39b97c0c69d3413a5c35bf99ff86
+  metadata.gz: 728b47de4b3ed3694646d449e8b9722d86a7485b49fb24a360721575c4e1a7ded56ddf2c5ba1d830ae297f4e2c8e87a17f4b3f260b9b05c30438e2f14d9c1df8
+  data.tar.gz: 26e3da128c7f2850f766af2aa1bfbdf6378f8663dde418e8245af070c0915a3eba6d9a3b68c8bdee70215388016fcab3dd76b040f21cf29877b99592eb67d275

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.10.6 2017-10-30
+
+- [FEATURE] Support for vertical positions (top/bottom)
+- [FEATURE] Suppress profiler results in print media @Mike Dillon
+- [FIX] toggle shortcut not working @lukesilva
+- [FEATURE] install generator @yhirano
+- [FEATURE] store initial cache control headers in X-MiniProfiler-Original-Cache-Control @mrasu
+
 ## 0.10.5 2017-05-22
 
 - [FIX] revert PG bind sniffing until it is properly tested

data/README.md

@@ -4,6 +4,17 @@
 
 Middleware that displays speed badge for every html page. Designed to work both in production and in development.
 
+# URGENT HELP NEEDED!!!
+
+Well, not exactly mega urgent, but nice to see you are reading this.
+
+There are 2 very simple changes I would like to see ASAP
+
+1. Stop using Time.now EVERYWHERE in rack-mini-profiler and replace with `Process.clock_gettime(Process::CLOCK_MONOTONIC)`
+2. I would like to see `# frozen_string_literal: true` on every file we ship
+
+If you pick up either of these, be sure to amend the README in your PR AND add a Changelog. 
+
 #### Features
 
 * Database profiling - Currently supports Mysql2, Postgres, Oracle (oracle_enhanced ~> 1.5.0) and Mongoid3 (with fallback support to ActiveRecord)
@@ -63,15 +74,10 @@ gem 'rack-mini-profiler', require: false
 Note the `require: false` part - if omitted, it will cause the Railtie for the mini-profiler to
 be loaded outright, and an attempt to re-initialize it manually will raise an exception.
 
-Then put initialize code in file like `config/initializers/rack_profiler.rb`
-
-```ruby
-if Rails.env == 'development'
-  require 'rack-mini-profiler'
+Then run the generator which will set up rack-mini-profiler in development:
 
-  # initialization is skipped so trigger it
-  Rack::MiniProfilerRails.initialize!(Rails.application)
-end
+```bash
+bundle exec rails g rack_profiler:install
 ```
 
 #### Rack Builder
@@ -168,7 +174,7 @@ There are two additional `pp` options that can be used to analyze memory which d
 
 ## Access control in non-development environments
 
-rack-mini-profiler is designed with production profiling in mind. To enable that just run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
+rack-mini-profiler is designed with production profiling in mind. To enable that run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
 
 ```ruby
   # inside your ApplicationController
@@ -180,17 +186,19 @@ rack-mini-profiler is designed with production profiling in mind. To enable that
   end
 ```
 
+> If your production application is running on more than one server (or more than one dyno) you will need to configure rack mini profiler's storage to use Redis or Memcache. See [storage](#storage) for information on changing the storage backend.
+
 Note:
 
-Out-of-the-box we will initialize the autorization_mode to :whitelist in production. However, in some cases we may not be able to do it:
+Out-of-the-box we will initialize the `authorization_mode` to `:whitelist` in production. However, in some cases we may not be able to do it:
 
 - If you are running in development or test we will not enable whitelist mode
-- If you use `require: false` on rack_mini_profiler we are unlikely to be able to run the railstie
-- If ou are running outside of rails we will not run the railstie
+- If you use `require: false` on rack_mini_profiler we are unlikely to be able to run the railtie
+- If you are running outside of rails we will not run the railtie
 
 In those cases use:
 
-```
+```ruby
 Rack::MiniProfiler.config.authorization_mode = :whitelist
 ```
 
@@ -201,6 +209,7 @@ For example in a Rails app, this should be done in an initializer:
 **config/initializers/mini_profiler.rb**
 
 ### Caching behavior
+
 To fix some nasty bugs with rack-mini-profiler showing the wrong data, the middleware
 will remove headers relating to caching (Date & Etag on responses, If-Modified-Since & If-None-Match on requests).
 This probably won't ever break your application, but it can cause some unexpected behavior. For
@@ -292,7 +301,7 @@ This method will remove profiling information that was related to previous page
 You need to inject the following in your SPA to load MiniProfiler's speed badge ([extra details surrounding this script](https://github.com/MiniProfiler/rack-mini-profiler/issues/139#issuecomment-192880706)):
 
 ```html
- <script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=12b4b45a3c42e6e15503d7a03810ff33" data-version="12b4b45a3c42e6e15503d7a03810ff33" data-path="/mini-profiler-resources/" data-current-id="redo66j4g1077kto8uh3" data-ids="redo66j4g1077kto8uh3" data-position="left" data-trivial="false" data-children="false" data-max-traces="10" data-controls="false" data-authorized="true" data-toggle-shortcut="Alt+P" data-start-hidden="false" data-collapse-results="true"></script>
+ <script async type="text/javascript" id="mini-profiler" src="/mini-profiler-resources/includes.js?v=12b4b45a3c42e6e15503d7a03810ff33" data-version="12b4b45a3c42e6e15503d7a03810ff33" data-path="/mini-profiler-resources/" data-current-id="redo66j4g1077kto8uh3" data-ids="redo66j4g1077kto8uh3" data-horizontal-position="left" data-vertical-position="top" data-trivial="false" data-children="false" data-max-traces="10" data-controls="false" data-authorized="true" data-toggle-shortcut="Alt+P" data-start-hidden="false" data-collapse-results="true"></script>
 ```
 
 _Note:_ The GUID (`data-version` and the `?v=` parameter on the `src`) will change with each release of `rack_mini_profiler`. The MiniProfiler's speed badge will continue to work, although you will have to change the GUID to expire the script to fetch the most recent version.
@@ -303,7 +312,7 @@ You can set configuration options using the configuration accessor on `Rack::Min
 For example:
 
 ```ruby
-Rack::MiniProfiler.config.position = 'right'
+Rack::MiniProfiler.config.position = 'bottom-right'
 Rack::MiniProfiler.config.start_hidden = true
 ```
 The available configuration options are:
@@ -311,7 +320,7 @@ The available configuration options are:
 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'`.
+position|`'top-left'`|Display mini_profiler on `'top-right'`, `'top-left'`, `'bottom-right'` or `'bottom-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.

data/lib/generators/rack_profiler/USAGE

@@ -0,0 +1,2 @@
+description:
+    Enable rack-mini-profiler in development for your application.

data/lib/generators/rack_profiler/install_generator.rb

@@ -0,0 +1,11 @@
+module RackProfiler
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      def create_initializer_file
+        copy_file "rack_profiler.rb", "config/initializers/rack_profiler.rb"
+      end
+    end
+  end
+end

data/lib/generators/rack_profiler/templates/rack_profiler.rb

@@ -0,0 +1,6 @@
+if Rails.env.development?
+  require "rack-mini-profiler"
+
+  # initialization is skipped so trigger it
+  Rack::MiniProfilerRails.initialize!(Rails.application)
+end

data/lib/html/includes.css

@@ -160,24 +160,43 @@
 
 .profiler-results {
   z-index: 2147483643;
-  position: fixed;
-  top: 0px; }
-  .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;
-      -moz-border-radius-bottomright: 10px;
-      border-bottom-right-radius: 10px; }
-    .profiler-results.profiler-left .profiler-button, .profiler-results.profiler-left .profiler-controls {
-      border-right: 1px solid #888; }
-  .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;
-      -moz-border-radius-bottomleft: 10px;
-      border-bottom-left-radius: 10px; }
-    .profiler-results.profiler-right .profiler-button, .profiler-results.profiler-right .profiler-controls {
-      border-left: 1px solid #888; }
+  position: fixed; }
+  .profiler-results.profiler-top {
+    top: 0px; }
+    .profiler-results.profiler-top.profiler-left {
+      left: 0px; }
+      .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-results.profiler-top.profiler-left .profiler-controls {
+        -webkit-border-bottom-right-radius: 10px;
+        -moz-border-radius-bottomright: 10px;
+        border-bottom-right-radius: 10px; }
+      .profiler-results.profiler-top.profiler-left .profiler-button, .profiler-results.profiler-top.profiler-left .profiler-controls {
+        border-right: 1px solid #888; }
+    .profiler-results.profiler-top.profiler-right {
+      right: 0px; }
+      .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-results.profiler-top.profiler-right .profiler-controls {
+        -webkit-border-bottom-left-radius: 10px;
+        -moz-border-radius-bottomleft: 10px;
+        border-bottom-left-radius: 10px; }
+      .profiler-results.profiler-top.profiler-right .profiler-button, .profiler-results.profiler-top.profiler-right .profiler-controls {
+        border-left: 1px solid #888; }
+  .profiler-results.profiler-bottom {
+    bottom: 0px; }
+    .profiler-results.profiler-bottom.profiler-left {
+      left: 0px; }
+      .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-result:first-child .profiler-button, .profiler-results.profiler-bottom.profiler-left .profiler-controls {
+        -webkit-border-top-right-radius: 10px;
+        -moz-border-radius-topright: 10px;
+        border-top-right-radius: 10px; }
+      .profiler-results.profiler-bottom.profiler-left .profiler-button, .profiler-results.profiler-bottom.profiler-left .profiler-controls {
+        border-right: 1px solid #888; }
+    .profiler-results.profiler-bottom.profiler-right {
+      right: 0px; }
+      .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-result:first-child .profiler-button, .profiler-results.profiler-bottom.profiler-right .profiler-controls {
+        -webkit-border-bottom-top-radius: 10px;
+        -moz-border-radius-topleft: 10px;
+        border-top-left-radius: 10px; }
+      .profiler-results.profiler-bottom.profiler-right .profiler-button, .profiler-results.profiler-bottom.profiler-right .profiler-controls {
+        border-left: 1px solid #888; }
   .profiler-results .profiler-button, .profiler-results .profiler-controls {
     display: none;
     z-index: 2147483640;
@@ -266,6 +285,9 @@
     margin: 0px; }
   .profiler-results .profiler-more-actions {
     float: left; }
+  @media print {
+    .profiler-results {
+      display: none; } }
 
 .profiler-queries-bg {
   z-index: 2147483642;

data/lib/html/includes.js

@@ -264,13 +264,14 @@ var MiniProfiler = (function () {
     };
 
     var popupSetDimensions = function (button, popup) {
-        var top = button.position().top - 1, // position next to the button we clicked
+        var px = button.position().top - 1, // position next to the button we clicked
             windowHeight = $(window).height(),
             maxHeight = windowHeight - top - 40; // make sure the popup doesn't extend below the fold
 
         popup
-            .css({ 'top': top, 'max-height': maxHeight })
-            .css(options.renderPosition, button.outerWidth() - 3); // move left or right, based on config
+            .css(options.renderVerticalPosition, px)
+            .css('max-height', maxHeight)
+            .css(options.renderHorizontalPosition, button.outerWidth() - 3); // move left or right, based on config
     };
 
     var popupPreventHorizontalScroll = function (popup) {
@@ -298,7 +299,7 @@ var MiniProfiler = (function () {
         $('<div class="profiler-queries-bg"/>').appendTo('body').css({ 'height': $(document).height() }).show();
 
         // center the queries and ensure long content is scrolled
-        queries.css({ 'top': px, 'max-height': height, 'width': width }).css(options.renderPosition, px)
+        queries.css(options.renderVerticalPosition, px).css({'max-height': height, 'width': width }).css(options.renderHorizontalPosition, px)
             .find('table').css({ 'width': width });
 
         // have to show everything before we can get a position for the first query
@@ -399,7 +400,7 @@ var MiniProfiler = (function () {
                 popupHide(button, popup);
             }
         });
-        $(document).on('keydown.mini-profiler', options.toggleShortcut, function(e) {
+        $(document).on('keydown.mini-profiler', null, options.toggleShortcut, function(e) {
             $('.profiler-results').toggle();
         });
 
@@ -468,9 +469,10 @@ var MiniProfiler = (function () {
         if (options.authorized) {
             // all fetched profilings will go in here
             container = $('<div class="profiler-results"/>').appendTo(options.htmlContainer);
-            
+
             // MiniProfiler.RenderIncludes() sets which corner to render in - default is upper left
-            container.addClass("profiler-" + options.renderPosition);
+            container.addClass("profiler-" + options.renderHorizontalPosition);
+            container.addClass("profiler-" + options.renderVerticalPosition);
 
             //initialize the controls
             initControls(container);
@@ -620,7 +622,8 @@ var MiniProfiler = (function () {
                 var ids = script.getAttribute('data-ids');
                 if (ids)  ids = ids.split(',');
 
-                var position = script.getAttribute('data-position');
+                var horizontal_position = script.getAttribute('data-horizontal-position');
+                var vertical_position = script.getAttribute('data-vertical-position');
 
                 var toggleShortcut = script.getAttribute('data-toggle-shortcut');
 
@@ -640,7 +643,8 @@ var MiniProfiler = (function () {
                     ids: ids,
                     path: path,
                     version: version,
-                    renderPosition: position,
+                    renderHorizontalPosition: horizontal_position,
+                    renderVerticalPosition: vertical_position,
                     showTrivial: trivial,
                     showChildrenTime: children,
                     maxTracesToShow: maxTraces,
@@ -990,16 +994,16 @@ var MiniProfiler = (function () {
         fetchResultsExposed: function (ids) {
             return fetchResults(ids);
         },
-        
+
         formatParameters: function (parameters) {
             if (parameters != null) {
-                return parameters.map(function(item, index){ return "["+item[0]+", "+ item[1] +"]";}).join(', ');           
+                return parameters.map(function(item, index){ return "["+item[0]+", "+ item[1] +"]";}).join(', ');
             }
             else {
-                return ''; 
+                return '';
             }
         },
-        
+
         formatDuration: function (duration) {
             return (duration || 0).toFixed(1);
         }

data/lib/html/includes.scss

@@ -47,7 +47,7 @@ $zindex:2147483640; // near 32bit max 2147483647
 }
 
 // styles shared between popup view and full view
-.profiler-result 
+.profiler-result
 {
 
     .profiler-toggle-duration-with-children
@@ -252,36 +252,71 @@ $zindex:2147483640; // near 32bit max 2147483647
 {
     z-index:$zindex + 3;
     position:fixed;
-    top:0px;
 
     $radius:10px;
 
-    &.profiler-left {
-        left:0px;
+    &.profiler-top {
+      top:0px;
+      
+      &.profiler-left {
+          left:0px;
+
+          &.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;
+          }
+
+          .profiler-button, .profiler-controls {
+              border-right: 1px solid $buttonBorderColor;
+          }
+      }
 
-        &.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;
-        }
+      &.profiler-right {
+          right:0px;
 
-        .profiler-button, .profiler-controls {
-            border-right: 1px solid $buttonBorderColor;
-        }
+          &.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;
+          }
+
+          .profiler-button, .profiler-controls {
+              border-left: 1px solid $buttonBorderColor;
+          }
+      }
     }
 
-    &.profiler-right {
-        right:0px;
+    &.profiler-bottom {
+      bottom:0px;
 
-        &.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;
-        }
+      &.profiler-left {
+          left:0px;
 
-        .profiler-button, .profiler-controls {
-            border-left: 1px solid $buttonBorderColor;
-        }
+          &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:first-child .profiler-button, .profiler-controls {
+              -webkit-border-top-right-radius: $radius;
+              -moz-border-radius-topright: $radius;
+              border-top-right-radius: $radius;
+          }
+
+          .profiler-button, .profiler-controls {
+              border-right: 1px solid $buttonBorderColor;
+          }
+      }
+
+      &.profiler-right {
+          right:0px;
+
+          &.profiler-no-controls .profiler-totals, &.profiler-no-controls .profiler-result:first-child .profiler-button, .profiler-controls {
+              -webkit-border-bottom-top-radius: $radius;
+              -moz-border-radius-topleft: $radius;
+              border-top-left-radius: $radius;
+          }
+
+          .profiler-button, .profiler-controls {
+              border-left: 1px solid $buttonBorderColor;
+          }
+      }
     }
 
     .profiler-button, .profiler-controls {
@@ -417,6 +452,9 @@ $zindex:2147483640; // near 32bit max 2147483647
 
     .profiler-more-actions { float: left; }
 
+    @media print {
+      display: none;
+    }
 }
 
 // popup results' queries will be displayed in front of this

data/lib/html/profile_handler.js

@@ -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}" data-collapse-results="{collapseResults}" data-html-container="{htmlContainer}"></script>
+<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-horizontal-position="{horizontalPosition}" data-vertical-position="{verticalPosition}" 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}" data-html-container="{htmlContainer}"></script>

data/lib/mini_profiler/asset_version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '8f332564e7761fb3795939d6582f992a'.freeze
+    ASSET_VERSION = '812af6927f7534f73488ece21dc89b62'.freeze
   end
 end

data/lib/mini_profiler/config.rb

@@ -21,7 +21,7 @@ module Rack
     attr_accessor :skip_sql_param_names, :suppress_encoding, :max_sql_param_length
 
     # ui accessors
-    attr_accessor :collapse_results, :max_traces_to_show, :position,
+    attr_accessor :collapse_results, :max_traces_to_show, :position, :vertical_position, :horizontal_position,
       :show_children, :show_controls, :show_trivial, :start_hidden,
       :toggle_shortcut, :html_container
 
@@ -57,7 +57,6 @@ module Rack
           @autorized          = true
           @collapse_results   = true
           @max_traces_to_show = 20
-          @position           = 'left'  # Where it is displayed
           @show_children      = false
           @show_controls      = false
           @show_trivial       = false
@@ -70,17 +69,24 @@ module Rack
       end
 
       def merge!(config)
-        return unless config
-        if Hash === config
-          config.each{|k,v| instance_variable_set "@#{k}",v}
-        else
-          self.class.attributes.each{ |k|
-            v = config.send k
-            instance_variable_set "@#{k}", v if v
-          }
+        if config
+          if Hash === config
+            config.each{|k,v| instance_variable_set "@#{k}",v}
+          else
+            self.class.attributes.each{ |k|
+              v = config.send k
+              instance_variable_set "@#{k}", v if v
+            }
+          end
         end
+        set_positions!
       end
 
+      def set_positions!
+        position = (self.position && self.position.match("-")) ? self.position.split("-") : ["top", "left"]
+        self.vertical_position = position.first
+        self.horizontal_position = position.last
+      end
     end
   end
 end

data/lib/mini_profiler/profiler.rb

@@ -366,6 +366,7 @@ module Rack
         headers.delete('Date')
       end
 
+      headers['X-MiniProfiler-Original-Cache-Control'] = headers['Cache-Control']
       headers['Cache-Control'] = "#{"no-store, " if config.disable_caching}must-revalidate, private, max-age=0"
 
       # inject header
@@ -587,18 +588,19 @@ Append the following to your query string:
       path = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
 
       settings = {
-       :path            => path,
-       :version         => MiniProfiler::ASSET_VERSION,
-       :position        => @config.position,
-       :showTrivial     => @config.show_trivial,
-       :showChildren    => @config.show_children,
-       :maxTracesToShow => @config.max_traces_to_show,
-       :showControls    => @config.show_controls,
-       :authorized      => true,
-       :toggleShortcut  => @config.toggle_shortcut,
-       :startHidden     => @config.start_hidden,
-       :collapseResults => @config.collapse_results,
-       :htmlContainer   => @config.html_container
+       :path               => path,
+       :version            => MiniProfiler::ASSET_VERSION,
+       :verticalPosition   => @config.vertical_position,
+       :horizontalPosition => @config.horizontal_position,
+       :showTrivial        => @config.show_trivial,
+       :showChildren       => @config.show_children,
+       :maxTracesToShow    => @config.max_traces_to_show,
+       :showControls       => @config.show_controls,
+       :authorized         => true,
+       :toggleShortcut     => @config.toggle_shortcut,
+       :startHidden        => @config.start_hidden,
+       :collapseResults    => @config.collapse_results,
+       :htmlContainer      => @config.html_container
       }
 
       if current && current.page_struct

data/lib/mini_profiler/storage/redis_store.rb

@@ -62,8 +62,9 @@ module Rack
       end
 
       def diagnostics(user)
+        client = (redis.respond_to? :_client) ? redis._client : redis.client
 "Redis prefix: #{@prefix}
-Redis location: #{redis.client.host}:#{redis.client.port} db: #{redis.client.db}
+Redis location: #{client.host}:#{client.port} db: #{client.db}
 unviewed_ids: #{get_unviewed_ids(user)}
 "
       end

data/lib/mini_profiler/timer_struct/sql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rack
   class MiniProfiler
 
@@ -9,7 +10,7 @@ module Rack
           stack_trace = nil
           unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
             # Allow us to filter the stack trace
-            stack_trace = ""
+            stack_trace = String.new
              # Clean up the stack trace if there are options to do so
             Kernel.caller.each do |ln|
               ln.gsub!(Rack::MiniProfiler.config.backtrace_remove, '') if Rack::MiniProfiler.config.backtrace_remove and !full_backtrace

data/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.10.5'
+    VERSION = '0.10.6'
   end
 end

data/lib/mini_profiler_rails/railtie.rb

@@ -37,11 +37,14 @@ module Rack::MiniProfilerRails
     end
 
     # 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'
+    # If the user has not changed from the default memory store then switch to the file store, otherwise keep what the user set
+    if c.storage == Rack::MiniProfiler::MemoryStore && c.storage_options.nil?
+      base_path = Rails.application.config.paths['tmp'].first rescue "#{Rails.root}/tmp"
+      tmp       = base_path + '/miniprofiler'
 
-    c.storage_options = {:path => tmp}
-    c.storage = Rack::MiniProfiler::FileStore
+      c.storage_options = {:path => tmp}
+      c.storage = Rack::MiniProfiler::FileStore
+    end
 
     # Quiet the SQL stack traces
     c.backtrace_remove = Rails.root.to_s + "/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -149,6 +149,9 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - README.md
+- lib/generators/rack_profiler/USAGE
+- lib/generators/rack_profiler/install_generator.rb
+- lib/generators/rack_profiler/templates/rack_profiler.rb
 - lib/html/includes.css
 - lib/html/includes.js
 - lib/html/includes.scss
@@ -216,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.