rack-mini-profiler 2.0.2 → 2.2.0

data/lib/mini_profiler/timer_struct/sql.rb

@@ -38,12 +38,12 @@ module Rack
           start_millis = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i - page[:started]) - duration_ms
           super(
             execute_type: 3, # TODO
-            formatted_command_string: ERB::Util.html_escape(query),
+            formatted_command_string: query ? ERB::Util.html_escape(query) : nil,
             stack_trace_snippet: stack_trace,
             start_milliseconds: start_millis,
             duration_milliseconds: duration_ms,
             first_fetch_duration_milliseconds: duration_ms,
-            parameters: trim_binds(params),
+            parameters: query ? trim_binds(params) : nil,
             parent_timing_id: nil,
             is_duplicate: false
           )

data/lib/mini_profiler/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class MiniProfiler
-    VERSION = '2.0.2'
+    VERSION = '2.2.0'
   end
 end

data/lib/mini_profiler_rails/railtie.rb

@@ -30,6 +30,8 @@ module Rack::MiniProfilerRails
 
     if serves_static_assets?(app)
       c.skip_paths << app.config.assets.prefix
+      wp_assets_path = get_webpacker_assets_path()
+      c.skip_paths << wp_assets_path if wp_assets_path
     end
 
     unless Rails.env.development? || Rails.env.test?
@@ -116,6 +118,17 @@ module Rack::MiniProfilerRails
     @already_initialized = true
   end
 
+  def self.create_engine
+    return if defined?(Rack::MiniProfilerRails::Engine)
+    klass = Class.new(::Rails::Engine) do
+      engine_name 'rack-mini-profiler'
+      config.assets.paths << File.expand_path('../../html', __FILE__)
+      config.assets.precompile << 'rack-mini-profiler.js'
+      config.assets.precompile << 'rack-mini-profiler.css'
+    end
+    Rack::MiniProfilerRails.const_set("Engine", klass)
+  end
+
   def self.subscribe(event, &blk)
     if ActiveSupport::Notifications.respond_to?(:monotonic_subscribe)
       ActiveSupport::Notifications.monotonic_subscribe(event) { |*args| blk.call(*args) }

data/lib/mini_profiler_rails/railtie_methods.rb

@@ -51,5 +51,11 @@ module Rack::MiniProfilerRailsMethods
     child[start] + child[duration] <= node[start] + node[duration]
   end
 
+  def get_webpacker_assets_path
+    if defined?(Webpacker) && Webpacker.config.config_path.exist?
+      Webpacker.config.public_output_path.to_s.gsub(Webpacker.config.public_path.to_s, "")
+    end
+  end
+
   extend self
 end

data/lib/patches/net_patches.rb

@@ -2,15 +2,25 @@
 
 if (defined?(Net) && defined?(Net::HTTP))
 
-  Net::HTTP.class_eval do
-    def request_with_mini_profiler(*args, &block)
-      request = args[0]
-      Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
-        request_without_mini_profiler(*args, &block)
+  if defined?(Rack::MINI_PROFILER_PREPEND_NET_HTTP_PATCH)
+    module NetHTTPWithMiniProfiler
+      def request(request, *args, &block)
+        Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
+          super
+        end
       end
     end
-    alias request_without_mini_profiler request
-    alias request request_with_mini_profiler
+    Net::HTTP.prepend(NetHTTPWithMiniProfiler)
+  else
+    Net::HTTP.class_eval do
+      def request_with_mini_profiler(*args, &block)
+        request = args[0]
+        Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
+          request_without_mini_profiler(*args, &block)
+        end
+      end
+      alias request_without_mini_profiler request
+      alias request request_with_mini_profiler
+    end
   end
-
 end

data/lib/prepend_net_http_patch.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Rack
+  MINI_PROFILER_PREPEND_NET_HTTP_PATCH = true
+end

data/lib/rack-mini-profiler.rb

@@ -26,6 +26,7 @@ require 'mini_profiler/profiling_methods'
 require 'mini_profiler/context'
 require 'mini_profiler/client_settings'
 require 'mini_profiler/gc_profiler'
+require 'mini_profiler/snapshots_transporter'
 require 'mini_profiler/profiler'
 require 'patches/sql_patches'
 require 'patches/net_patches'

data/rack-mini-profiler.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "CHANGELOG.md"
   ]
   s.add_runtime_dependency 'rack', '>= 1.2.0'
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.metadata = {
     'source_code_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler',
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '< 11'
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'activerecord', '~> 3.0'
   s.add_development_dependency 'dalli'
   s.add_development_dependency 'rspec', '~> 3.6.0'
   s.add_development_dependency 'redis'
@@ -41,6 +40,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'rubocop-discourse'
   s.add_development_dependency 'listen'
+  s.add_development_dependency 'webpacker', '~> 5.1'
+  s.add_development_dependency 'rails', '~> 5.1'
+  s.add_development_dependency 'webmock', '3.9.1'
 
   s.require_paths = ["lib"]
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Sam Saffron
 - Robin Ward
 - Aleks Totic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -54,20 +54,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +194,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.1
 description: Profiling toolkit for Rack applications with Rails integration. Client
   Side profiling, DB profiling and Server profiling.
 email: sam.saffron@gmail.com
@@ -230,6 +258,8 @@ files:
 - lib/html/includes.tmpl
 - lib/html/pretty-print.js
 - lib/html/profile_handler.js
+- lib/html/rack-mini-profiler.css
+- lib/html/rack-mini-profiler.js
 - lib/html/share.html
 - lib/html/vendor.js
 - lib/mini_profiler/asset_version.rb
@@ -239,6 +269,7 @@ files:
 - lib/mini_profiler/gc_profiler.rb
 - lib/mini_profiler/profiler.rb
 - lib/mini_profiler/profiling_methods.rb
+- lib/mini_profiler/snapshots_transporter.rb
 - lib/mini_profiler/storage/abstract_store.rb
 - lib/mini_profiler/storage/file_store.rb
 - lib/mini_profiler/storage/memcache_store.rb
@@ -267,6 +298,7 @@ files:
 - lib/patches/db/sequel.rb
 - lib/patches/net_patches.rb
 - lib/patches/sql_patches.rb
+- lib/prepend_net_http_patch.rb
 - lib/rack-mini-profiler.rb
 - rack-mini-profiler.gemspec
 homepage: https://miniprofiler.com
@@ -275,7 +307,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/MiniProfiler/rack-mini-profiler
   changelog_uri: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -283,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -291,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.
 test_files: []