rack-mini-profiler 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ece809a3861e0508dd92e06d0fa272bf483de9d
-  data.tar.gz: 2edb42b798d5aa568008c715a56b5f521c8dac4f
+SHA256:
+  metadata.gz: e7c0f5a071d07b17ed627b9c25ca3fa6a60f9670178e990fa8d84e7f826c05ff
+  data.tar.gz: 94c852d1876cf526cf1f771bb609d6f6993f5d1827da16861128351b59ee0f83
 SHA512:
-  metadata.gz: 6f6f0f8477e82af1183ccf3cc38236b2cdc39c3e32801ae276bc1657649b3641fafd336b2b7ac683bf1cab74426f4cf409eaa6bac4b7be39650f53e8a3d3d5d7
-  data.tar.gz: 50eec3c2f3599412395699db1f850b6633b604022e059dfbe30c753d2b4fc782611c63a274b2a1e61e6c00a2a4cb01f4ed460ac4340bac1d2b8e0d6e640fb77f
+  metadata.gz: f53c37831ae521bfc0f79dc375595f76165499b76ca60191f5ba88cf811f68abe2c787e548010c68fd209b0b156e06ba6f54b40d10dd24b1297622aefeb80c58
+  data.tar.gz: 471f7506b95eefc6e9f182a88baa8ef9bd8f613557619d3c34ce7f4d1831026f48ba61da7160dcb3ae7adca4dbf5d33766bbba48880a84633ee7692a2ae9ad1f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.0.1 2018-12-10
+
+- [FIX] add support for exec_params instrumentation in PG, this method as of PG 1.1.0 no longer
+ routes calls to exec / async_exec
+- [FIX] add missing started_at on requests
+- [UX] amend colors so we pass lighthouse
+- [FEATURE] fetch API support
+- [FIX] getEntriesByName is missing in iOS, workaround
+- [FEATURE] drop support for Ruby 2.2.0 we require 2.3.0 and up (EOL Ruby no longer supported)
+
 ## 1.0.0 2017-03-29
 
 - [BREAKING CHANGE] Ruby version 2.2.0 or later is required

data/README.md

@@ -30,7 +30,7 @@ If you feel like taking on any of this start an issue and update us on your prog
 
 ## Installation
 
-Install/add to Gemfile in Ruby 2.2+
+Install/add to Gemfile in Ruby 2.3+
 
 ```ruby
 gem 'rack-mini-profiler'
@@ -321,6 +321,7 @@ base_url_path|`'/mini-profiler-resources/'`|Path for assets; added as a prefix w
 collapse_results|`true`|If multiple timing results exist in a single page, collapse them till clicked.
 max_traces_to_show|20|Maximum number of mini profiler timing blocks to show on one page
 html_container|`body`|The HTML container (as a jQuery selector) to inject the mini_profiler UI into
+show_total_sql_count|`false`|Displays the total number of SQL executions.
 
 ### Custom middleware ordering (required if using `Rack::Deflate` with Rails)
 

data/lib/html/includes.css

@@ -35,11 +35,11 @@
     overflow: hidden;
     text-overflow: ellipsis; }
   .profiler-result .profiler-unit {
-    color: #aaa; }
+    color: #767676; }
   .profiler-result .profiler-trivial {
     display: none; }
     .profiler-result .profiler-trivial td, .profiler-result .profiler-trivial td * {
-      color: #aaa !important; }
+      color: #767676 !important; }
   .profiler-result pre, .profiler-result code, .profiler-result .profiler-number, .profiler-result .profiler-unit {
     font-family: Consolas, monospace, serif; }
   .profiler-result .profiler-number {
@@ -52,7 +52,7 @@
       white-space: nowrap; }
   .profiler-result .profiler-timings th {
     background-color: #fff;
-    color: #aaa;
+    color: #767676;
     text-align: right; }
   .profiler-result .profiler-timings th, .profiler-result .profiler-timings td {
     white-space: nowrap; }
@@ -228,7 +228,7 @@
     cursor: default;
     text-align: center; }
     .profiler-results .profiler-controls span {
-      border-right: 1px solid #aaa;
+      border-right: 1px solid #767676;
       padding-right: 5px;
       margin-right: 5px;
       cursor: pointer; }
@@ -306,7 +306,7 @@
     display: none; }
   .profiler-result-full .profiler-result .profiler-popup .profiler-info {
     font-size: 25px;
-    border-bottom: 1px solid #aaa;
+    border-bottom: 1px solid #767676;
     padding-bottom: 3px;
     margin-bottom: 25px; }
     .profiler-result-full .profiler-result .profiler-popup .profiler-info .profiler-overall-duration {

data/lib/html/includes.js

@@ -11,7 +11,8 @@ var MiniProfiler = (function () {
         totalsControl,
         reqs = 0,
         expandedResults = false,
-        totalTime = 0;
+        totalTime = 0,
+        totalSqlCount = 0
         ;
 
     var hasLocalStorage = function (keyPrefix) {
@@ -146,6 +147,7 @@ var MiniProfiler = (function () {
         var result = renderTemplate(json);
 
         totalTime += parseFloat(json.duration_milliseconds, 10);
+        totalSqlCount += parseInt(json.sql_count);
         reqs++;
 
         if (!controls && reqs > 1 && options.collapseResults && !expandedResults) {
@@ -164,8 +166,10 @@ var MiniProfiler = (function () {
           }
 
           var reqsHtml = reqs > 1 ? ("<span class='profiler-reqs'>" + reqs + "</span>") : "";
+          var sqlHtml = options.showTotalSqlCount && totalSqlCount > 0 ? (" / <span class='profiler-number'>" + totalSqlCount + "</span> <span class='profiler-unit'>sql</span>") : "";
           totalsControl.find('.profiler-button').html("<span class='profiler-number'>" +
                     totalTime.toFixed(1) + "</span> <span class='profiler-unit'>ms</span>" +
+                    sqlHtml +
                     reqsHtml);
 
           result.hide();
@@ -592,6 +596,31 @@ var MiniProfiler = (function () {
           };
         }
 
+        // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
+        if(typeof(window.fetch) === 'function' && window.fetch.__patchedByMiniProfiler === undefined) {
+          var __originalFetch = window.fetch;
+
+          window.fetch = function(input,init) {
+            return new Promise(function(resolve,reject) {
+              __originalFetch(input,init).then(function(response) {
+                // look for x-mini-profile-ids
+                var entries = response.headers.entries();
+                for (var i = 0; i < entries.length; i++) {
+                  var pair = entries[i];
+                  if(pair[0] && (pair[0].toLowerCase() == 'x-miniprofiler-ids')) {
+                  var ids = JSON.parse(pair[1]);
+                    fetchResults(ids);
+                  }
+                }
+                resolve(response);
+              }).catch(function(error) {
+                reject(error);
+              });
+            });
+          }
+          window.fetch.__patchedByMiniProfiler = true;
+        }
+
         // some elements want to be hidden on certain doc events
         bindDocumentEvents();
     };
@@ -624,6 +653,7 @@ var MiniProfiler = (function () {
                 var trivial = script.getAttribute('data-trivial') === 'true';
                 var children = script.getAttribute('data-children') === 'true';
                 var controls = script.getAttribute('data-controls') === 'true';
+                var totalSqlCount = script.getAttribute('data-total-sql-count') === 'true';
                 var authorized = script.getAttribute('data-authorized') === 'true';
                 var startHidden = script.getAttribute('data-start-hidden') === 'true' || sessionStorage['rack-mini-profiler-start-hidden'] === 'true';
                 var htmlContainer = script.getAttribute('data-html-container');
@@ -638,6 +668,7 @@ var MiniProfiler = (function () {
                     showChildrenTime: children,
                     maxTracesToShow: maxTraces,
                     showControls: controls,
+                    showTotalSqlCount: totalSqlCount,
                     currentId: currentId,
                     authorized: authorized,
                     toggleShortcut: toggleShortcut,
@@ -817,9 +848,9 @@ var MiniProfiler = (function () {
 
 
             // Use the Paint Timing API for render performance.
-            if (window.performance) {
+            if (window.performance && window.performance.getEntriesByName) {
               var firstPaint = window.performance.getEntriesByName("first-paint");
-              
+
               if(firstPaint !== undefined && firstPaint.length >= 1){
                 list.push(
                   {
@@ -1011,6 +1042,10 @@ var MiniProfiler = (function () {
 
         formatDuration: function (duration) {
             return (duration || 0).toFixed(1);
+        },
+
+        showTotalSqlCount: function () {
+            return options.showTotalSqlCount
         }
     };
 })();

data/lib/html/includes.scss

@@ -8,7 +8,7 @@ $anchorColor: #0077CC;
 $buttonBorderColor: #888;
 $numberColor: #111;
 $textColor: #555;
-$mutedColor: #aaa;
+$mutedColor: #767676;
 $normalFonts: Helvetica, Arial, sans-serif;
 $codeFonts: Consolas, monospace, serif;
 $zindex:2147483640; // near 32bit max 2147483647

data/lib/html/includes.tmpl

@@ -7,6 +7,11 @@
       <span class="profiler-number">
         ${MiniProfiler.formatDuration(duration_milliseconds)} <span class="profiler-unit">ms</span>
       </span>
+      {{if MiniProfiler.showTotalSqlCount()}}
+      <span class="profiler-number">
+        ${sql_count} <span class="profiler-unit">sql</span>
+      </span>
+      {{/if}}
     </div>
 
     <div class="profiler-popup">

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-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>
+<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-total-sql-count="{showTotalSqlCount}" 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 = '251162ee7dc30da30d5370581c664510'.freeze
+    ASSET_VERSION = '355f78011d9b95de14a5b1014b088681'.freeze
   end
 end

data/lib/mini_profiler/client_settings.rb

@@ -13,10 +13,9 @@ module Rack
       attr_accessor :disable_profiling
       attr_accessor :backtrace_level
 
-
       def initialize(env, store, start)
-        request = ::Rack::Request.new(env)
-        @cookie = request.cookies[COOKIE_NAME]
+        @request = ::Rack::Request.new(env)
+        @cookie = @request.cookies[COOKIE_NAME]
         @store = store
         @start = start
         @backtrace_level = nil
@@ -25,8 +24,8 @@ module Rack
         @allowed_tokens, @orig_auth_tokens = nil
 
         if @cookie
-          @cookie.split(",").map{|pair| pair.split("=")}.each do |k,v|
-            @orig_disable_profiling = @disable_profiling = (v=='t') if k == "dp"
+          @cookie.split(",").map { |pair| pair.split("=") }.each do |k, v|
+            @orig_disable_profiling = @disable_profiling = (v == 't') if k == "dp"
             @backtrace_level = v.to_i if k == "bt"
             @orig_auth_tokens = v.to_s.split("|") if k == "a"
           end
@@ -41,7 +40,7 @@ module Rack
       end
 
       def handle_cookie(result)
-        status,headers,_body = result
+        status, headers, _body = result
 
         if (MiniProfiler.config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
           # this is non-obvious, don't kill the profiling cookie on errors or short requests
@@ -70,19 +69,20 @@ module Rack
             @cookie.nil? ||
             tokens_changed
 
-          settings = {"p" =>  "t" }
+          settings = { "p" => "t" }
           settings["dp"] = "t"                  if @disable_profiling
           settings["bt"] = @backtrace_level     if @backtrace_level
           settings["a"] = @allowed_tokens.join("|") if @allowed_tokens && MiniProfiler.request_authorized?
-
-          settings_string = settings.map{|k,v| "#{k}=#{v}"}.join(",")
-          Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, :value => settings_string, :path => '/')
+          settings_string = settings.map { |k, v| "#{k}=#{v}" }.join(",")
+          cookie = { value: settings_string, path: '/', httponly: true }
+          cookie[:secure] = true if @request.ssl?
+          Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, cookie)
         end
       end
 
       def discard_cookie!(headers)
         if @cookie
-          Rack::Utils.delete_cookie_header!(headers, COOKIE_NAME, :path => '/')
+          Rack::Utils.delete_cookie_header!(headers, COOKIE_NAME, path: '/')
         end
       end
 
@@ -99,7 +99,6 @@ module Rack
         valid_cookie
       end
 
-
       def disable_profiling?
         @disable_profiling
       end

data/lib/mini_profiler/config.rb

@@ -19,12 +19,12 @@ module Rack
           @base_url_path    = "/mini-profiler-resources/".dup
           @disable_caching  = true
           # called prior to rack chain, to ensure we are allowed to profile
-          @pre_authorize_cb = lambda {|env| true}
+          @pre_authorize_cb = lambda { |env| true }
 
           # called after rack chain, to ensure we are REALLY allowed to profile
           @skip_schema_queries    = false
           @storage                = MiniProfiler::MemoryStore
-          @user_provider          = Proc.new{|env| Rack::Request.new(env).ip}
+          @user_provider          = Proc.new { |env| Rack::Request.new(env).ip }
           @authorization_mode     = :allow_all
           @backtrace_threshold_ms = 0
           @flamegraph_sample_rate = 0.5
@@ -39,16 +39,17 @@ module Rack
           @skip_sql_param_names = /password/ # skips parameters with the name password by default
 
           # ui parameters
-          @autorized           = true
-          @collapse_results    = true
-          @max_traces_to_show  = 20
-          @show_children       = false
-          @show_controls       = false
-          @show_trivial        = false
-          @start_hidden        = false
-          @toggle_shortcut     = 'Alt+P'
-          @html_container      = 'body'
-          @position            = "top-left"
+          @autorized            = true
+          @collapse_results     = true
+          @max_traces_to_show   = 20
+          @show_children        = false
+          @show_controls        = false
+          @show_trivial         = false
+          @show_total_sql_count = false
+          @start_hidden         = false
+          @toggle_shortcut      = 'Alt+P'
+          @html_container       = 'body'
+          @position             = "top-left"
 
           self
         }
@@ -64,8 +65,8 @@ module Rack
 
       # ui accessors
       attr_accessor :collapse_results, :max_traces_to_show, :position,
-        :show_children, :show_controls, :show_trivial, :start_hidden,
-        :toggle_shortcut, :html_container
+        :show_children, :show_controls, :show_trivial, :show_total_sql_count,
+        :start_hidden, :toggle_shortcut, :html_container
 
       # Deprecated options
       attr_accessor :use_existing_jquery
@@ -78,13 +79,12 @@ module Rack
         position.include?('right') ? 'right' : 'left'
       end
 
-
       def merge!(config)
         if config
           if Hash === config
-            config.each{|k,v| instance_variable_set "@#{k}",v}
+            config.each { |k, v| instance_variable_set "@#{k}", v }
           else
-            self.class.attributes.each{ |k|
+            self.class.attributes.each { |k|
               v = config.send k
               instance_variable_set "@#{k}", v if v
             }

data/lib/mini_profiler/context.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class Rack::MiniProfiler::Context
-  attr_accessor :inject_js,:current_timer,:page_struct,:skip_backtrace,
-                :full_backtrace,:discard, :mpt_init, :measure
+  attr_accessor :inject_js, :current_timer, :page_struct, :skip_backtrace,
+                :full_backtrace, :discard, :mpt_init, :measure
 
   def initialize(opts = {})
     opts["measure"] = true unless opts.key? "measure"
-    opts.each do |k,v|
+    opts.each do |k, v|
       self.instance_variable_set('@' + k, v)
     end
   end

data/lib/mini_profiler/gc_profiler.rb

@@ -30,7 +30,7 @@ class Rack::MiniProfiler::GCProfiler
       end
     end
 
-    result = {:stats => stats, :ids => ids}
+    result = { stats: stats, ids: ids }
     @ignore << result.__id__
 
     result
@@ -38,10 +38,10 @@ class Rack::MiniProfiler::GCProfiler
 
   def diff_object_stats(before, after)
     diff = {}.compare_by_identity
-    after.each do |k,v|
+    after.each do |k, v|
       diff[k] = v - before[k]
     end
-    before.each do |k,v|
+    before.each do |k, v|
       diff[k] = 0 - v unless after.has_key?(k)
     end
 
@@ -50,7 +50,7 @@ class Rack::MiniProfiler::GCProfiler
 
   def analyze_strings(ids_before, ids_after)
     result = {}
-    ids_after.each do |id,_|
+    ids_after.each do |id, _|
       obj = ObjectSpace._id2ref(id)
       if String === obj && !ids_before.include?(obj.object_id)
         result[obj] ||= 0
@@ -64,8 +64,8 @@ class Rack::MiniProfiler::GCProfiler
     new_objects = 0
     memory_allocated = 0
 
-    ids_after.each do |id,_|
-      if !ids_before.include?(id) && obj=ObjectSpace._id2ref(id)
+    ids_after.each do |id, _|
+      if !ids_before.include?(id) && obj = ObjectSpace._id2ref(id)
         # this is going to be version specific (may change in 2.1)
         size = ObjectSpace.memsize_of(obj)
         memory_allocated += size
@@ -80,15 +80,15 @@ class Rack::MiniProfiler::GCProfiler
     memory_allocated = 0
     objects = 0
 
-    ids_before.each do |id,_|
-      if obj=ObjectSpace._id2ref(id)
+    ids_before.each do |id, _|
+      if obj = ObjectSpace._id2ref(id)
         # this is going to be version specific (may change in 2.1)
         memory_allocated += ObjectSpace.memsize_of(obj)
         objects += 1
       end
     end
 
-    [objects,memory_allocated]
+    [objects, memory_allocated]
   end
 
   def profile_gc(app, env)
@@ -107,7 +107,7 @@ class Rack::MiniProfiler::GCProfiler
     # so we don't blow out on memory
     prev_gc_state ? GC.disable : GC.enable
 
-    diff                          = diff_object_stats(stat_before[:stats],stat_after[:stats])
+    diff                          = diff_object_stats(stat_before[:stats], stat_after[:stats])
     string_analysis               = analyze_strings(stat_before[:ids], stat_after[:ids])
     new_objects, memory_allocated = analyze_growth(stat_before[:ids], stat_after[:ids])
     objects_before, memory_before = analyze_initial_state(stat_before[:ids])
@@ -122,7 +122,7 @@ Memory allocated outside heap (bytes): #{memory_before}
 
 GC Stats:
 --------
-#{stat.map{|k,v| "#{k} : #{v}" }.sort!.join("\n")}
+#{stat.map { |k, v| "#{k} : #{v}" }.sort!.join("\n")}
 
 New bytes allocated outside of Ruby heaps: #{memory_allocated}
 New objects: #{new_objects}
@@ -131,7 +131,7 @@ New objects: #{new_objects}
     body << "
 ObjectSpace delta caused by request:
 -----------------------------------\n"
-    diff.to_a.delete_if{|_k, v| v == 0}.sort_by! { |_k, v| v }.reverse_each do |k,v|
+    diff.to_a.delete_if { |_k, v| v == 0 }.sort_by! { |_k, v| v }.reverse_each do |k, v|
       body << "#{k} : #{v}\n"
     end
 
@@ -139,20 +139,19 @@ ObjectSpace delta caused by request:
 ObjectSpace stats:
 -----------------\n"
 
-    stat_after[:stats].to_a.sort_by!{ |_k, v| v }.reverse_each do |k,v|
+    stat_after[:stats].to_a.sort_by! { |_k, v| v }.reverse_each do |k, v|
       body << "#{k} : #{v}\n"
     end
 
-
     body << "\n
 String stats:
 ------------\n"
 
-    string_analysis.to_a.sort_by!{ |_k, v| -v }.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
 
-    return [200, {'Content-Type' => 'text/plain'}, body]
+    return [200, { 'Content-Type' => 'text/plain' }, body]
   ensure
     prev_gc_state ? GC.disable : GC.enable
   end