rack-mini-profiler 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 569f89edd8e16a6577ec6e22ca4a889026678d288d9282114b8fdeaedc6be2bf
-  data.tar.gz: 7ec71935c344ff9113d3b4b9dc70dfaf3430fa30796075391d7d65bc008cb390
+  metadata.gz: bc0d1c8641a30fc59950236e1761ac6a0f1c07cdbc73c5192e256c7bfd84a6af
+  data.tar.gz: 20d8e78c618c96da12676078fff49bb2bf71014e6c8ace339d1fcdc4cd73e8a4
 SHA512:
-  metadata.gz: dcb3c67be45ee1b7dc7516f7ddef1f4f9b6fc1513db927009aac3ef11c504caa6d9b11f3d9a8b28028c7f35f2e6e450cdc0a6b124939d1901679129a758d4499
-  data.tar.gz: 28b0c19d557485c1abf1e636bebe911e42c8f3706de174021af6e543c0c52c4a6fa0ecdef39518acb58d18d5284147c4b57c950186a8b630e9bd2e69acbc72c9
+  metadata.gz: 534f1a6ea263d6e9aaea85e14d0aa09ac893081ad350530c8122c241f1cb0f3397cd7fdf1ca5a65e96bca92384e0b38a6ebbcec8b9e94a4cafb4565198cbd743
+  data.tar.gz: 9114e796825cbaa2b88b71c5bfb0a2b5aa0ea6453a4bf4364d6666d37b42fbcdf12991b0df95ceffaefca47907b9d5c36932ada2c77b4d4120889b4f093b2c23

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.3.1 - 2024-02-15
+- [FEATURE] Support dynamic `config.content_security_policy_nonce` [#609](https://github.com/MiniProfiler/rack-mini-profiler/pull/609)
+- [FEATURE] Add flamgraph path to response header: [#601](https://github.com/MiniProfiler/rack-mini-profiler/pull/601)
+
 ## 3.3.0 - 2023-12-07
 - [FEATURE] Use `?pp=flamegraph?ignore_gc=true` or `config.flamegraph_ignore_gc` to ignore gc in flamegraphs. [#599](https://github.com/MiniProfiler/rack-mini-profiler/pull/599)
 

data/README.md

@@ -180,7 +180,7 @@ To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-
 
 Then, to view the flamegraph as a direct HTML response from your request, just visit any page in your app with `?pp=flamegraph` appended to the URL, or add the header `X-Rack-Mini-Profiler` to the request with the value `flamegraph`.
 
-Conversely, if you want your regular response instead (which is specially useful for JSON and/or XHR requests), just append the `?pp=async-flamegraph` parameter to your request/fetch URL; the request will then return as normal, and the flamegraph data will be stored for later *async* viewing, both for this request and for all subsequent requests made by this page (based on the `REFERER` header). For viewing these async flamegraphs, use the 'flamegraph' link that will appear inside the MiniProfiler UI for these requests.
+Conversely, if you want your regular response instead (which is specially useful for JSON and/or XHR requests), just append the `?pp=async-flamegraph` parameter to your request/fetch URL; the request will then return as normal, and the flamegraph data will be stored for later *async* viewing, both for this request and for all subsequent requests made by this page (based on the `REFERER` header). For viewing these async flamegraphs, use the 'flamegraph' link that will appear inside the MiniProfiler UI for these requests or path returned in the `X-MiniProfiler-Flamegraph-Path` header.
 
 Note: Mini Profiler will not record SQL timings for a request if it asks for a flamegraph. The rationale behind this is to keep
 Mini Profiler's methods that are responsible for generating the timings data out of the flamegraph.
@@ -448,7 +448,7 @@ snapshots_transport_destination_url | `nil`
 snapshots_transport_auth_key        | `nil`                                                   | `POST` requests made by the snapshots transporter to the destination URL will have a `Mini-Profiler-Transport-Auth` header with the value of this config. Make sure you use a secure and random key for this config.
 snapshots_redact_sql_queries        | `true`                                                  | When this is true, SQL queries will be redacted from sampling snapshots, but the backtrace and duration of each SQL query will be saved with the snapshot to keep debugging performance issues possible.
 snapshots_transport_gzip_requests   | `false`                                                 | Make the snapshots transporter gzip the requests it makes to `snapshots_transport_destination_url`.
-content_security_policy_nonce       | Rails: Current nonce<br>Rack: nil                       | Set the content security policy nonce to use when inserting MiniProfiler's script block.
+content_security_policy_nonce       | Rails: Current nonce<br>Rack: nil                       | Set the content security policy nonce to use when inserting MiniProfiler's script block. Can be set to a static string, or a Proc which receives `env` and `response_headers` as arguments and returns the nonce.
 enable_hotwire_turbo_drive_support  | `false`                                                 | Enable support for Hotwire TurboDrive page transitions.
 profile_parameter                   | `'pp'`                                                  | The query parameter used to interact with this gem.
 
@@ -466,7 +466,7 @@ If you are using Heroku Redis, you may need to add the following to your `config
 
 ```ruby
 if Rails.env.production?
-  Rack::MiniProfiler.config.storage_options = { 
+  Rack::MiniProfiler.config.storage_options = {
     url: ENV["REDIS_URL"],
     ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
   }

data/lib/html/includes.css

@@ -105,7 +105,8 @@
   .profiler-result .profiler-unit {
     font-family: Consolas, monospace, serif; }
   .profiler-result .profiler-number {
-    color: #111; }
+    color: #111;
+    display: inline-block; }
   .profiler-result .profiler-info {
     text-align: right; }
     .profiler-result .profiler-info .profiler-name {
@@ -235,6 +236,19 @@
 .profiler-results {
   z-index: 2147483643;
   position: fixed; }
+  .profiler-results.profiler-left .profiler-button {
+    text-align: left; }
+  .profiler-results.profiler-right .profiler-button {
+    text-align: right; }
+  .profiler-results .profiler-button > .profiler-duration-milliseconds {
+    min-width: 70px; }
+  .profiler-results .profiler-button > .profiler-sql-count {
+    min-width: 55px; }
+  .profiler-results .profiler-button > .profiler-name {
+    min-width: 190px;
+    margin-left: 3px; }
+  .profiler-results .profiler-button > .profiler-number {
+    text-align: right; }
   .profiler-results.profiler-top {
     top: 0px; }
     .profiler-results.profiler-top.profiler-left {
@@ -285,8 +299,10 @@
       background-color: maroon; }
       .profiler-results .profiler-button.profiler-button-active .profiler-number,
       .profiler-results .profiler-button.profiler-button-active .profiler-nuclear,
+      .profiler-results .profiler-button.profiler-button-active .profiler-name,
       .profiler-results .profiler-controls.profiler-button-active .profiler-number,
-      .profiler-results .profiler-controls.profiler-button-active .profiler-nuclear {
+      .profiler-results .profiler-controls.profiler-button-active .profiler-nuclear,
+      .profiler-results .profiler-controls.profiler-button-active .profiler-name {
         color: #fff;
         font-weight: bold; }
       .profiler-results .profiler-button.profiler-button-active .profiler-unit,

data/lib/html/includes.js

@@ -220,7 +220,7 @@ var _MiniProfiler = (function() {
     totalSqlCount += parseInt(json.sql_count);
     reqs++;
 
-    if (!controls && reqs > 1 && options.collapseResults && !expandedResults) {
+    if (!controls && options.collapseResults && !expandedResults) {
       if (!totalsControl) {
         toArray(container.querySelectorAll(".profiler-result")).forEach(
           function(el) {

data/lib/html/includes.scss

@@ -103,6 +103,7 @@ $zindex: 2147483640; // near 32bit max 2147483647
 
   .profiler-number {
     color: $numberColor;
+    display: inline-block;
   }
 
   .profiler-info {
@@ -317,6 +318,34 @@ $zindex: 2147483640; // near 32bit max 2147483647
 
   $radius: 10px;
 
+  &.profiler-left {
+    .profiler-button {
+      text-align: left;
+    }
+  }
+
+  &.profiler-right {
+    .profiler-button {
+      text-align: right;
+    }
+  }
+
+  .profiler-button {
+    > .profiler-duration-milliseconds {
+      min-width: 70px;
+    }
+    > .profiler-sql-count {
+      min-width: 55px;
+    }
+    > .profiler-name {
+      min-width: 190px;
+      margin-left: 3px;
+    }
+    > .profiler-number {
+      text-align: right;
+    }
+  }
+
   &.profiler-top {
     top: 0px;
 
@@ -399,7 +428,8 @@ $zindex: 2147483640; // near 32bit max 2147483647
       background-color: maroon;
 
       .profiler-number,
-      .profiler-nuclear {
+      .profiler-nuclear,
+      .profiler-name {
         color: #fff;
         font-weight: bold;
       }

data/lib/html/includes.tmpl

@@ -2,14 +2,21 @@
   <div class="profiler-result">
     <div class="profiler-button {{? it.has_duplicate_sql_timings}}profiler-warning{{?}}">
     {{? it.has_duplicate_sql_timings}}<span class="profiler-nuclear">!</span>{{?}}
-      <span class="profiler-number">
+      <span class="profiler-number profiler-duration-milliseconds">
         {{= MiniProfiler.formatDuration(it.duration_milliseconds)}} <span class="profiler-unit">ms</span>
       </span>
       {{? MiniProfiler.showTotalSqlCount()}}
-        <span class="profiler-number">
+        <span class="profiler-number profiler-sql-count">
           {{= it.sql_count}} <span class="profiler-unit">sql</span>
         </span>
       {{?}}
+      <span class="profiler-name">
+        {{? it.name.length >= 30 }}
+          {{= it.name.substring(0,15) + "..." + it.name.slice(-15) }}
+        {{??}}
+          {{= it.name}}
+        {{?}}
+      </span>
     </div>
 
     <div class="profiler-popup">

data/lib/html/vendor.js

@@ -7,7 +7,7 @@
 MiniProfiler.templates = {};
 MiniProfiler.templates["profilerTemplate"] = function anonymous(it
 ) {
-var out=' <div class="profiler-result"> <div class="profiler-button ';if(it.has_duplicate_sql_timings){out+='profiler-warning';}out+='"> ';if(it.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' <span class="profiler-number"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' </div> <div class="profiler-popup"> <div class="profiler-info"> <span class="profiler-name"> '+( it.name)+' <span class="profiler-overall-duration">('+( MiniProfiler.formatDuration(it.duration_milliseconds))+' ms)</span> </span> <span class="profiler-server-time">'+( it.machine_name)+' on '+( MiniProfiler.renderDate(it.started_formatted))+'</span> </div> <div class="profiler-output"> <table class="profiler-timings"> <thead> <tr> <th>event</th> <th>duration (ms)</th> <th class="profiler-duration-with-children">with children (ms)</th> <th class="time-from-start">from start (ms)</th> ';if(it.has_sql_timings){out+=' <th colspan="2">query time (ms)</th> ';}out+=' ';var arr1=it.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' <th colspan="2">'+( value.toLowerCase() )+' (ms)</th> ';} } out+=' </tr> </thead> <tbody> '+( MiniProfiler.templates.timingTemplate({timing: it.root, page: it}) )+' </tbody> <tfoot> <tr> <td colspan="3"> ';if(!it.client_timings){out+=' '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' ';}out+=' <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a> <a class="profiler-snapshots-page-link" title="Go to snapshots page" href="'+( MiniProfiler.options.path )+'snapshots">snapshots</a> </td> ';if(it.has_sql_timings){out+=' <td colspan="2" class="profiler-number profiler-percent-in-sql" title="'+( MiniProfiler.getSqlTimingsCount(it.root) )+' queries spent '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in sql</span> </td> ';}out+=' ';var arr2=it.custom_timing_names;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="'+( it.custom_timing_stats[value].count )+' '+( value.toLowerCase() )+' invocations spent '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in '+( value.toLowerCase() )+'</span> </td> ';} } out+=' </tr> </tfoot> </table> ';if(it.client_timings){out+=' <table class="profiler-timings profiler-client-timings"> <thead> <tr> <th>client event</th> <th>duration (ms)</th> <th>from start (ms)</th> </tr> </thead> <tbody> ';var arr3=MiniProfiler.getClientTimings(it.client_timings);if(arr3){var value,i3=-1,l3=arr3.length-1;while(i3<l3){value=arr3[i3+=1];out+=' <tr class="';if(value.isTrivial){out+='profiler-trivial';}out+='"> <td class="profiler-label">'+( value.name )+'</td> <td class="profiler-duration"> ';if(value.duration >= 0){out+=' <span class="profiler-unit"></span>'+( MiniProfiler.formatDuration(value.duration) )+' ';}out+=' </td> <td class="profiler-duration time-from-start"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(value.start) )+' </td> </tr> ';} } out+=' </tbody> <tfoot> <td colspan="3"> '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' </td> </tfoot> </table> ';}out+=' ';if(it.custom_fields && Object.keys(it.custom_fields).length > 0){out+=' <p class="custom-fields-title">Snapshot custom fields</p> <table class="profiler-timings"> <tbody> ';var arr4=Object.keys(it.custom_fields);if(arr4){var key,i4=-1,l4=arr4.length-1;while(i4<l4){key=arr4[i4+=1];out+=' <tr> <td class="profiler-label">'+( key )+'</td> <td class="profiler-label">'+( it.custom_fields[key] )+'</td> </tr> ';} } out+=' </tbody> </table> ';}out+=' </div> </div> ';if(it.has_sql_timings){out+=' <div class="profiler-queries"> <table> <thead> <tr> <th class="ta-right">step<br />time from start<br />query type<br />duration</th> <th class="ta-left">call stack<br />query</th> </tr> </thead> <tbody> ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(index<l5){value=arr5[index+=1];out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.prevGap}) )+' '+( MiniProfiler.templates.sqlTimingTemplate({i: index, s: value}) )+' ';if(value.nextGap){out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.nextGap}) )+' ';}out+=' ';} } out+=' </tbody> </table> <p class="profiler-trivial-gap-container"> <a class="profiler-toggle-trivial-gaps">show trivial gaps</a> </p> </div> ';}out+=' </div>';return out;
+var out=' <div class="profiler-result"> <div class="profiler-button ';if(it.has_duplicate_sql_timings){out+='profiler-warning';}out+='"> ';if(it.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' <span class="profiler-number profiler-duration-milliseconds"> '+( MiniProfiler.formatDuration(it.duration_milliseconds))+' <span class="profiler-unit">ms</span> </span> ';if(MiniProfiler.showTotalSqlCount()){out+=' <span class="profiler-number profiler-sql-count"> '+( it.sql_count)+' <span class="profiler-unit">sql</span> </span> ';}out+=' <span class="profiler-name"> ';if(it.name.length >= 30){out+=' '+( it.name.substring(0,15) + "..." + it.name.slice(-15) )+' ';}else{out+=' '+( it.name)+' ';}out+=' </span> </div> <div class="profiler-popup"> <div class="profiler-info"> <span class="profiler-name"> '+( it.name)+' <span class="profiler-overall-duration">('+( MiniProfiler.formatDuration(it.duration_milliseconds))+' ms)</span> </span> <span class="profiler-server-time">'+( it.machine_name)+' on '+( MiniProfiler.renderDate(it.started_formatted))+'</span> </div> <div class="profiler-output"> <table class="profiler-timings"> <thead> <tr> <th>event</th> <th>duration (ms)</th> <th class="profiler-duration-with-children">with children (ms)</th> <th class="time-from-start">from start (ms)</th> ';if(it.has_sql_timings){out+=' <th colspan="2">query time (ms)</th> ';}out+=' ';var arr1=it.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' <th colspan="2">'+( value.toLowerCase() )+' (ms)</th> ';} } out+=' </tr> </thead> <tbody> '+( MiniProfiler.templates.timingTemplate({timing: it.root, page: it}) )+' </tbody> <tfoot> <tr> <td colspan="3"> ';if(!it.client_timings){out+=' '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' ';}out+=' <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a> <a class="profiler-snapshots-page-link" title="Go to snapshots page" href="'+( MiniProfiler.options.path )+'snapshots">snapshots</a> </td> ';if(it.has_sql_timings){out+=' <td colspan="2" class="profiler-number profiler-percent-in-sql" title="'+( MiniProfiler.getSqlTimingsCount(it.root) )+' queries spent '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.duration_milliseconds_in_sql / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in sql</span> </td> ';}out+=' ';var arr2=it.custom_timing_names;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="'+( it.custom_timing_stats[value].count )+' '+( value.toLowerCase() )+' invocations spent '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration) )+' ms of total request time"> '+( MiniProfiler.formatDuration(it.custom_timing_stats[value].duration / it.duration_milliseconds * 100) )+' <span class="profiler-unit">% in '+( value.toLowerCase() )+'</span> </td> ';} } out+=' </tr> </tfoot> </table> ';if(it.client_timings){out+=' <table class="profiler-timings profiler-client-timings"> <thead> <tr> <th>client event</th> <th>duration (ms)</th> <th>from start (ms)</th> </tr> </thead> <tbody> ';var arr3=MiniProfiler.getClientTimings(it.client_timings);if(arr3){var value,i3=-1,l3=arr3.length-1;while(i3<l3){value=arr3[i3+=1];out+=' <tr class="';if(value.isTrivial){out+='profiler-trivial';}out+='"> <td class="profiler-label">'+( value.name )+'</td> <td class="profiler-duration"> ';if(value.duration >= 0){out+=' <span class="profiler-unit"></span>'+( MiniProfiler.formatDuration(value.duration) )+' ';}out+=' </td> <td class="profiler-duration time-from-start"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(value.start) )+' </td> </tr> ';} } out+=' </tbody> <tfoot> <td colspan="3"> '+( MiniProfiler.templates.linksTemplate({timing: it.root, page: it}) )+' </td> </tfoot> </table> ';}out+=' ';if(it.custom_fields && Object.keys(it.custom_fields).length > 0){out+=' <p class="custom-fields-title">Snapshot custom fields</p> <table class="profiler-timings"> <tbody> ';var arr4=Object.keys(it.custom_fields);if(arr4){var key,i4=-1,l4=arr4.length-1;while(i4<l4){key=arr4[i4+=1];out+=' <tr> <td class="profiler-label">'+( key )+'</td> <td class="profiler-label">'+( it.custom_fields[key] )+'</td> </tr> ';} } out+=' </tbody> </table> ';}out+=' </div> </div> ';if(it.has_sql_timings){out+=' <div class="profiler-queries"> <table> <thead> <tr> <th class="ta-right">step<br />time from start<br />query type<br />duration</th> <th class="ta-left">call stack<br />query</th> </tr> </thead> <tbody> ';var arr5=MiniProfiler.getSqlTimings(it.root);if(arr5){var value,index=-1,l5=arr5.length-1;while(index<l5){value=arr5[index+=1];out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.prevGap}) )+' '+( MiniProfiler.templates.sqlTimingTemplate({i: index, s: value}) )+' ';if(value.nextGap){out+=' '+( MiniProfiler.templates.sqlGapTemplate({g: value.nextGap}) )+' ';}out+=' ';} } out+=' </tbody> </table> <p class="profiler-trivial-gap-container"> <a class="profiler-toggle-trivial-gaps">show trivial gaps</a> </p> </div> ';}out+=' </div>';return out;
 }
 MiniProfiler.templates["linksTemplate"] = function anonymous(it
 ) {

data/lib/mini_profiler/actions.rb

@@ -55,7 +55,12 @@ module Rack
         resources_env = env.dup
         resources_env['PATH_INFO'] = file_name
 
-        rack_file = Rack::File.new(resources_root, 'Cache-Control' => "max-age=#{cache_control_value}")
+        if Gem::Version.new(Rack.release) >= Gem::Version.new("2.1.0")
+          rack_file = Rack::Files.new(resources_root, 'Cache-Control' => "max-age=#{cache_control_value}")
+        else
+          rack_file = Rack::File.new(resources_root, 'Cache-Control' => "max-age=#{cache_control_value}")
+        end
+
         rack_file.call(resources_env)
       end
 

data/lib/mini_profiler/asset_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rack
   class MiniProfiler
-    ASSET_VERSION = 'c336b1303a50b21f5222bc23262ca7bf'
+    ASSET_VERSION = '116e2a6fd81c286e004e2a0afb03baa1'
   end
 end

data/lib/mini_profiler/config.rb

@@ -97,7 +97,9 @@ module Rack
 
       # redefined - since the accessor defines it first
       undef :authorization_mode=
+      # rubocop:disable Lint/DuplicateMethods
       def authorization_mode=(mode)
+        # rubocop:enable Lint/DuplicateMethods
         if mode == :whitelist
           warn "[DEPRECATION] `:whitelist` authorization mode is deprecated. Please use `:allow_authorized` instead."
 

data/lib/mini_profiler/snapshots_transporter.rb

@@ -9,9 +9,11 @@ class ::Rack::MiniProfiler::SnapshotsTransporter
     def transported_snapshots_count
       @@transported_snapshots_count
     end
+
     def successful_http_requests_count
       @@successful_http_requests_count
     end
+
     def failed_http_requests_count
       @@failed_http_requests_count
     end

data/lib/mini_profiler/storage/file_store.rb

@@ -91,8 +91,6 @@ module Rack
         end
 
         at_exit { t[:should_exit] = true }
-
-        t
       end
 
       def save(page_struct)

data/lib/mini_profiler/timer_struct/base.rb

@@ -22,7 +22,6 @@ module Rack
 
         def []=(name, val)
           attributes[name] = val
-          self
         end
 
         def to_json(*a)

data/lib/mini_profiler/timer_struct/page.rb

@@ -59,13 +59,12 @@ module Rack
 
         def initialize(env)
           timer_id     = MiniProfiler.generate_id
-          page_name    = env['PATH_INFO']
           started_at   = (Time.now.to_f * 1000).to_i
           started      = (Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i
           machine_name = env['SERVER_NAME']
           super(
             id: timer_id,
-            name: page_name,
+            name: page_name(env),
             started: started,
             started_at: started_at,
             machine_name: machine_name,
@@ -93,7 +92,7 @@ module Rack
           )
           self[:request_method] = env['REQUEST_METHOD']
           self[:request_path] = env['PATH_INFO']
-          name = "#{env['REQUEST_METHOD']} http://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{env['SCRIPT_NAME']}#{env['PATH_INFO']}"
+          name = "#{env['REQUEST_METHOD']} http://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{env['SCRIPT_NAME']}#{page_name(env)}"
           self[:root] = TimerStruct::Request.createRoot(name, self)
         end
 
@@ -101,6 +100,14 @@ module Rack
           @attributes[:name]
         end
 
+        def page_name(env)
+          if env['QUERY_STRING'] && env['QUERY_STRING'] != ""
+            env['PATH_INFO'] + "?" + env['QUERY_STRING']
+          else
+            env['PATH_INFO']
+          end
+        end
+
         def duration_ms
           @attributes[:root][:duration_milliseconds]
         end

data/lib/mini_profiler/version.rb

@@ -2,7 +2,7 @@
 
 module Rack
   class MiniProfiler
-    VERSION = '3.3.0'
-    SOURCE_CODE_URI = 'https://github.com/MiniProfiler/rack-mini-profiler'
+    VERSION = "3.3.1"
+    SOURCE_CODE_URI = "https://github.com/MiniProfiler/rack-mini-profiler"
   end
 end

data/lib/mini_profiler/views.rb

@@ -28,7 +28,7 @@ module Rack
       # Use it when:
       # * 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)
+      def get_profile_script(env, response_headers = {})
         path = public_base_path(env)
         version = MiniProfiler::ASSET_VERSION
         if @config.assets_url
@@ -39,7 +39,12 @@ module Rack
         url = "#{path}includes.js?v=#{version}" if !url
         css_url = "#{path}includes.css?v=#{version}" if !css_url
 
-        content_security_policy_nonce = @config.content_security_policy_nonce ||
+        configured_nonce = @config.content_security_policy_nonce
+        if configured_nonce && !configured_nonce.is_a?(String)
+          configured_nonce = configured_nonce.call(env, response_headers)
+        end
+
+        content_security_policy_nonce = configured_nonce ||
                                         env["action_dispatch.content_security_policy_nonce"] ||
                                         env["secure_headers_content_security_policy_nonce"]
 
@@ -77,7 +82,7 @@ module Rack
         script = ::File.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
         # replace the variables
         settings.each do |k, v|
-          regex = Regexp.new("\\{#{k.to_s}\\}")
+          regex = Regexp.new("\\{#{k}\\}")
           script.gsub!(regex, v.to_s)
         end
 

data/lib/mini_profiler.rb

@@ -436,11 +436,12 @@ module Rack
       # inject header
       if headers.is_a? Hash
         headers['X-MiniProfiler-Ids'] = ids_comma_separated(env)
+        headers['X-MiniProfiler-Flamegraph-Path'] = flamegraph_path(env) if current.page_struct[:has_flamegraph]
       end
 
       if current.inject_js && content_type =~ /text\/html/
         response = Rack::Response.new([], status, headers)
-        script   = self.get_profile_script(env)
+        script   = self.get_profile_script(env, headers)
 
         if String === body
           response.write inject(body, script)
@@ -605,6 +606,10 @@ module Rack
       ids(env).join(",")
     end
 
+    def flamegraph_path(env)
+      @config.base_url_path + 'flamegraph?id=' + current.page_struct[:id]
+    end
+
     # cancels automatic injection of profile script for the current page
     def cancel_auto_inject(env)
       current.inject_js = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.