rack-mini-profiler 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7544df4d22f5f615b146fb0d63f18098ffd702ac9dec966d8040187f2e8302b9
-  data.tar.gz: 7c39c41a96205c8c7fbd69765ab5f1e0a3a3a37950055fc58d0f27f4a0591e0f
+  metadata.gz: bced31d81d2044a03b4c98ccd43359253866115a7cdec13897155df6df2cf58b
+  data.tar.gz: ef8fe2fa2f9ab20c6d8d2fe9138e693ce9891ad40d4af37d7e4cad86b1edc233
 SHA512:
-  metadata.gz: 6e3f5f9a51fc5395dda4a7e793903f998513499d850aeb291fe036171a78617d11c3d8cd6fef57d1144359aa4992055ad54ba878075896c3d0280c426a84e3be
-  data.tar.gz: c4e353c8442db93f29d11d04e2724e6c3f8dacaaf082210acbbb7d47655ffc3a6b5297079750e305fe9f1cd3e7efb1d806aef0ec68bbc1a8e40a0f958de0ec52
+  metadata.gz: e8d03dadee75d6e1bccff74b9b8359fdc6b4c574652874b0f6c70e873c8ce7c131a25114051f5001bc906add142c4660786b7d8efff2242702b9b4327fdce6b6
+  data.tar.gz: 5399488dbf48cb7c270a8095f3555965015eccf2abb0aeeeb2190dec604a4748e7ad43ea5ca3d295d8238e4369fbdc95a6322661e6b5274dc665e2ad6ed9298e

data/CHANGELOG.md

@@ -1,11 +1,18 @@
 # CHANGELOG
 
+## 3.1.1 - 2023-08-01
+
+- [FIX] Include configured base path in speedscope iframe URL [#587](https://github.com/MiniProfiler/rack-mini-profiler/pull/587)
+- [FIX] Race condition starting CacheCleanupThread [#586](https://github.com/MiniProfiler/rack-mini-profiler/pull/586)
+- [FEATURE] Add controller name to description [#567](https://github.com/MiniProfiler/rack-mini-profiler/pull/567)
+- [FIX] 'more' link w/HTTPS [#574](https://github.com/MiniProfiler/rack-mini-profiler/pull/574)
+
 ## 3.1.0 - 2023-04-11
 
 - [FEATURE] The query parameter that RMP uses (by default, pp) is now configurable [#553](https://github.com/MiniProfiler/rack-mini-profiler/pull/553)
 - [FEATURE] You can now opt-out of the Net::HTTP patch by using RACK_MINI_PROFILER_PATCH_NET_HTTP="false"
 - [FIX] Error responses now include header values from the app, and stackprof not installed message now has correct content [#547](https://github.com/MiniProfiler/rack-mini-profiler/pull/547)
-- [FIX] RMP pages now have more valid HTML, with title elements [#562](https://github.com/MiniProfiler/rack-mini-profiler/pull/562)
+- [FIX] RMP pages now have more valid HTML, with title elements [#552](https://github.com/MiniProfiler/rack-mini-profiler/pull/552)
 - [BREAKING CHANGE] Ruby 2.4 and Ruby 2.5 are no longer supported.
 - [FIX] Now works with apps that don't otherwise require erb [#531](https://github.com/MiniProfiler/rack-mini-profiler/pull/531)
 - [DOCS] Added Heroku Redis instructions

data/lib/html/includes.js

@@ -1240,11 +1240,8 @@ var _MiniProfiler = (function() {
       return options.path + "flamegraph?id=" + id;
     },
     moreUrl: function moreUrl(requestName) {
-      var requestParts = requestName.split(" ");
-      var linkSrc =
-        requestParts[0] == "GET" ? requestParts[1] : window.location.href;
-      var linkSuffix = linkSrc.indexOf("?") > 0 ? "&pp=help" : "?pp=help";
-      return linkSrc + linkSuffix;
+      var linkSuffix = requestName.indexOf("?") > 0 ? "&pp=help" : "?pp=help";
+      return requestName + linkSuffix;
     },
     getClientTimings: function getClientTimings(clientTimings) {
       var list = [];

data/lib/html/includes.tmpl

@@ -141,7 +141,7 @@
 
 <script id="linksTemplate" type="text/x-dot-tmpl">
   <a href="{{= MiniProfiler.shareUrl(it.page.id) }}" class="profiler-share-profiler-results" target="_blank">share</a>
-  <a href="{{= MiniProfiler.moreUrl(it.timing.name) }}" class="profiler-more-actions">more</a>
+  <a href="{{= MiniProfiler.moreUrl(it.page.name) }}" class="profiler-more-actions">more</a>
   {{? it.page.has_flamegraph}}
     <a href="{{= MiniProfiler.flamegraphUrl(it.page.id) }}" class="profiler-show-flamegraph" target="_blank">flamegraph</a>
   {{?}}

data/lib/html/vendor.js

@@ -11,7 +11,7 @@ var out=' <div class="profiler-result"> <div class="profiler-button ';if(it.has_
 }
 MiniProfiler.templates["linksTemplate"] = function anonymous(it
 ) {
-var out=' <a href="'+( MiniProfiler.shareUrl(it.page.id) )+'" class="profiler-share-profiler-results" target="_blank">share</a> <a href="'+( MiniProfiler.moreUrl(it.timing.name) )+'" class="profiler-more-actions">more</a> ';if(it.page.has_flamegraph){out+=' <a href="'+( MiniProfiler.flamegraphUrl(it.page.id) )+'" class="profiler-show-flamegraph" target="_blank">flamegraph</a> ';}out+=' ';if(it.custom_link){out+=' <a href="'+( it.custom_link )+'" class="profiler-custom-link" target="_blank">'+( it.custom_link_name )+'</a> ';}out+=' ';if(it.page.has_trivial_timings){out+=' <a class="profiler-toggle-trivial" data-show-on-load="'+( it.page.has_all_trivial_timings )+'" title="toggles any rows with &lt; '+( it.page.trivial_duration_threshold_milliseconds )+' ms"> show trivial </a> ';}return out;
+var out=' <a href="'+( MiniProfiler.shareUrl(it.page.id) )+'" class="profiler-share-profiler-results" target="_blank">share</a> <a href="'+( MiniProfiler.moreUrl(it.page.name) )+'" class="profiler-more-actions">more</a> ';if(it.page.has_flamegraph){out+=' <a href="'+( MiniProfiler.flamegraphUrl(it.page.id) )+'" class="profiler-show-flamegraph" target="_blank">flamegraph</a> ';}out+=' ';if(it.custom_link){out+=' <a href="'+( it.custom_link )+'" class="profiler-custom-link" target="_blank">'+( it.custom_link_name )+'</a> ';}out+=' ';if(it.page.has_trivial_timings){out+=' <a class="profiler-toggle-trivial" data-show-on-load="'+( it.page.has_all_trivial_timings )+'" title="toggles any rows with &lt; '+( it.page.trivial_duration_threshold_milliseconds )+' ms"> show trivial </a> ';}return out;
 }
 MiniProfiler.templates["timingTemplate"] = function anonymous(it
 ) {

data/lib/mini_profiler/asset_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '35a79b300ab5afa978cb59af0b05e059'
+    ASSET_VERSION = '90a68676a0c0d704b4438ca3f27d46c4'
   end
 end

data/lib/mini_profiler/storage/memory_store.rb

@@ -10,11 +10,11 @@ module Rack
       class CacheCleanupThread < Thread
 
         def initialize(interval, cycle, store)
-          super
           @store       = store
           @interval    = interval
           @cycle       = cycle
           @cycle_count = 1
+          super
         end
 
         def should_cleanup?
@@ -78,7 +78,7 @@ module Rack
         cleanup_cycle    = args.fetch(:cleanup_cycle)    { CLEANUP_CYCLE }
         t = CacheCleanupThread.new(cleanup_interval, cleanup_cycle, self) do
           until Thread.current[:should_exit] do
-            t.sleepy_run
+            Thread.current.sleepy_run
           end
         end
         at_exit { t[:should_exit] = true }

data/lib/mini_profiler/version.rb

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

data/lib/mini_profiler.rb

@@ -462,7 +462,7 @@ module Rack
 
       if flamegraph && query_string =~ /#{@config.profile_parameter}=flamegraph/
         body.close if body.respond_to? :close
-        return client_settings.handle_cookie(self.flamegraph(flamegraph, path))
+        return client_settings.handle_cookie(self.flamegraph(flamegraph, path, env))
       elsif flamegraph # async-flamegraph
         page_struct[:has_flamegraph] = true
         page_struct[:flamegraph] = flamegraph
@@ -705,8 +705,9 @@ module Rack
       [200, headers, [html]]
     end
 
-    def flamegraph(graph, path)
+    def flamegraph(graph, path, env)
       headers = { 'Content-Type' => 'text/html' }
+      iframe_src = "#{public_base_path(env)}speedscope/index.html"
       html = <<~HTML
         <!DOCTYPE html>
         <html>
@@ -726,7 +727,7 @@ module Rack
               var iframe = document.createElement('IFRAME');
               iframe.setAttribute('id', 'speedscope-iframe');
               document.body.appendChild(iframe);
-              var iframeUrl = '#{@config.base_url_path}speedscope/index.html#profileURL=' + objUrl + '&title=' + 'Flamegraph for #{CGI.escape(path)}';
+              var iframeUrl = '#{iframe_src}#profileURL=' + objUrl + '&title=' + 'Flamegraph for #{CGI.escape(path)}';
               iframe.setAttribute('src', iframeUrl);
             </script>
           </body>
@@ -755,7 +756,7 @@ module Rack
     # * 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 = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
+      path = public_base_path(env)
       version = MiniProfiler::ASSET_VERSION
       if @config.assets_url
         url = @config.assets_url.call('rack-mini-profiler.js', version, env)
@@ -887,7 +888,7 @@ module Rack
         return [404, {}, ["No flamegraph available for #{ERB::Util.html_escape(id)}"]]
       end
 
-      self.flamegraph(page_struct[:flamegraph], page_struct[:request_path])
+      self.flamegraph(page_struct[:flamegraph], page_struct[:request_path], env)
     end
 
     def rails_route_from_path(path, method)
@@ -945,5 +946,9 @@ module Rack
       self.current = nil
       results
     end
+
+    def public_base_path(env)
+      "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
+    end
   end
 end

data/lib/mini_profiler_rails/railtie.rb

@@ -75,7 +75,8 @@ module Rack::MiniProfilerRails
         next if !should_measure?
 
         current = Rack::MiniProfiler.current
-        description = "Executing action: #{payload[:action]}"
+        controller_name = payload[:controller].sub(/Controller\z/, '').downcase
+        description = "Executing: #{controller_name}##{payload[:action]}"
         Thread.current[get_key(payload)] = current.current_timer
         Rack::MiniProfiler.current.current_timer = current.current_timer.add_child(description)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack