rack-mini-profiler 1.0.1 → 2.3.2

data/lib/patches/db/mongo.rb

@@ -8,7 +8,7 @@ class Mongo::Server::Connection
     result, _record = SqlPatches.record_sql(args[0][0].payload.inspect) do
       dispatch_without_timing(*args, &blk)
     end
-    return result
+    result
   end
 
   # TODO: change to Module#prepend as soon as Ruby 1.9.3 support is dropped

data/lib/patches/db/moped.rb

@@ -9,6 +9,6 @@ class Moped::Node
     result, _record = SqlPatches.record_sql(args[0].log_inspect) do
       process_without_profiling(*args, &blk)
     end
-    return result
+    result
   end
 end

data/lib/patches/db/mysql2.rb

@@ -1,30 +1,7 @@
 # frozen_string_literal: true
 
-# The best kind of instrumentation is in the actual db provider, however we don't want to double instrument
-
-class Mysql2::Result
-  alias_method :each_without_profiling, :each
-  def each(*args, &blk)
-    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
-
-    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    result       = each_without_profiling(*args, &blk)
-    elapsed_time = SqlPatches.elapsed_time(start)
-
-    @miniprofiler_sql_id.report_reader_duration(elapsed_time)
-    result
-  end
-end
-
-class Mysql2::Client
-  alias_method :query_without_profiling, :query
-  def query(*args, &blk)
-    return query_without_profiling(*args, &blk) unless SqlPatches.should_measure?
-
-    result, record = SqlPatches.record_sql(args[0]) do
-      query_without_profiling(*args, &blk)
-    end
-    result.instance_variable_set("@miniprofiler_sql_id", record) if result
-    result
-  end
+if defined?(Rack::MINI_PROFILER_PREPEND_MYSQL2_PATCH)
+  require "patches/db/mysql2/prepend"
+else
+  require "patches/db/mysql2/alias_method"
 end

data/lib/patches/db/mysql2/alias_method.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# The best kind of instrumentation is in the actual db provider, however we don't want to double instrument
+
+class Mysql2::Result
+  alias_method :each_without_profiling, :each
+  def each(*args, &blk)
+    return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
+
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    result       = each_without_profiling(*args, &blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+
+    @miniprofiler_sql_id.report_reader_duration(elapsed_time)
+    result
+  end
+end
+
+class Mysql2::Client
+  alias_method :query_without_profiling, :query
+  def query(*args, &blk)
+    return query_without_profiling(*args, &blk) unless SqlPatches.should_measure?
+
+    result, record = SqlPatches.record_sql(args[0]) do
+      query_without_profiling(*args, &blk)
+    end
+    result.instance_variable_set("@miniprofiler_sql_id", record) if result
+    result
+  end
+end

data/lib/patches/db/mysql2/prepend.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Mysql2::Result
+  module MiniProfiler
+    def each(*args, &blk)
+      return super unless defined?(@miniprofiler_sql_id)
+
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result       = super
+      elapsed_time = SqlPatches.elapsed_time(start)
+
+      @miniprofiler_sql_id.report_reader_duration(elapsed_time)
+      result
+    end
+  end
+
+  prepend MiniProfiler
+end
+
+class Mysql2::Client
+  module MiniProfiler
+    def query(*args, &blk)
+      return super unless SqlPatches.should_measure?
+
+      result, record = SqlPatches.record_sql(args[0]) do
+        super
+      end
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
+      result
+    end
+  end
+
+  prepend MiniProfiler
+end

data/lib/patches/db/plucky.rb

@@ -9,19 +9,19 @@ class Plucky::Query
   alias_method :remove_without_profiling, :remove
 
   def find_each(*args, &blk)
-    return profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
+    profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
   end
 
   def find_one(*args, &blk)
-    return profile_database_operation(__callee__, filtered_inspect(args[0]), *args, &blk)
+    profile_database_operation(__callee__, filtered_inspect(args[0]), *args, &blk)
   end
 
   def count(*args, &blk)
-    return profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
+    profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
   end
 
   def remove(*args, &blk)
-    return profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
+    profile_database_operation(__callee__, filtered_inspect(), *args, &blk)
   end
 
   private

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/patches/sql_patches.rb

@@ -11,7 +11,7 @@ class SqlPatches
     start  = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result = yield
     record = ::Rack::MiniProfiler.record_sql(statement, elapsed_time(start), parameters)
-    return result, record
+    [result, record]
   end
 
   def self.should_measure?
@@ -23,18 +23,26 @@ class SqlPatches
     ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time).to_f * 1000).round(1)
   end
 
+  def self.patch_rails?
+    ::Rack::MiniProfiler.patch_rails?
+  end
+
   def self.sql_patches
     patches = []
 
     patches << 'mysql2' if defined?(Mysql2::Client) && Mysql2::Client.class == Class
     patches << 'pg' if defined?(PG::Result) && PG::Result.class == Class
     patches << 'oracle_enhanced' if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) && ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class == Class &&
-                                    SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+                                    SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) &&
+                                    patch_rails?
     # if the adapters were directly patched, don't patch again
-    return patches unless patches.empty?
+    if !patches.empty?
+      Rack::MiniProfiler.subscribe_sql_active_record = false
+      return patches
+    end
     patches << 'sequel' if defined?(Sequel::Database) && Sequel::Database.class == Class
-    patches << 'activerecord' if defined?(ActiveRecord) && ActiveRecord.class == Module
-
+    patches << 'activerecord' if defined?(ActiveRecord) && ActiveRecord.class == Module && patch_rails?
+    Rack::MiniProfiler.subscribe_sql_active_record = patches.empty? && !patch_rails?
     patches
   end
 

data/lib/prepend_mysql2_patch.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Rack
+  MINI_PROFILER_PREPEND_MYSQL2_PATCH = true
+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,8 +26,8 @@ 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mini_profiler/version'
@@ -9,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors = ["Sam Saffron", "Robin Ward", "Aleks Totic"]
   s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."
   s.email = "sam.saffron@gmail.com"
-  s.homepage = "http://miniprofiler.com"
+  s.homepage = "https://miniprofiler.com"
   s.license = "MIT"
   s.files = [
     'rack-mini-profiler.gemspec',
@@ -19,22 +21,29 @@ 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',
     'changelog_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md'
   }
 
-  s.add_development_dependency 'rake', '< 11'
+  s.add_development_dependency 'rake'
   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'
-  s.add_development_dependency 'sass'
-  s.add_development_dependency 'flamegraph'
+  s.add_development_dependency 'sassc'
+  s.add_development_dependency 'stackprof'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'mini_racer'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'rubocop-discourse'
+  s.add_development_dependency 'listen'
+  s.add_development_dependency 'webpacker'
+  s.add_development_dependency 'rails', '~> 6.0'
+  s.add_development_dependency 'webmock', '3.9.1'
+  s.add_development_dependency 'rubyzip'
 
   s.require_paths = ["lib"]
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Sam Saffron
 - Robin Ward
 - Aleks Totic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,16 +30,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -55,21 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,21 +97,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: stackprof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,7 +139,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: flamegraph
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,7 +153,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !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
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,20 +261,36 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - README.md
+- lib/enable_rails_patches.rb
 - lib/generators/rack_profiler/USAGE
 - lib/generators/rack_profiler/install_generator.rb
 - lib/generators/rack_profiler/templates/rack_profiler.rb
+- lib/html/dot.1.1.2.min.js
 - lib/html/includes.css
 - lib/html/includes.js
 - lib/html/includes.scss
 - lib/html/includes.tmpl
-- lib/html/jquery.1.7.1.js
-- lib/html/jquery.tmpl.js
-- lib/html/list.css
-- lib/html/list.js
-- lib/html/list.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/speedscope/LICENSE
+- lib/html/speedscope/README.md
+- lib/html/speedscope/demangle-cpp.1768f4cc.js
+- lib/html/speedscope/favicon-16x16.f74b3187.png
+- lib/html/speedscope/favicon-32x32.bc503437.png
+- lib/html/speedscope/file-format-schema.json
+- lib/html/speedscope/fonts/source-code-pro-regular.css
+- lib/html/speedscope/fonts/source-code-pro-v13-regular.woff
+- lib/html/speedscope/fonts/source-code-pro-v13-regular.woff2
+- lib/html/speedscope/import.cf0fa83f.js
+- lib/html/speedscope/index.html
+- lib/html/speedscope/release.txt
+- lib/html/speedscope/reset.8c46b7a1.css
+- lib/html/speedscope/source-map.438fa06b.js
+- lib/html/speedscope/speedscope.44364064.js
+- lib/html/vendor.js
 - lib/mini_profiler/asset_version.rb
 - lib/mini_profiler/client_settings.rb
 - lib/mini_profiler/config.rb
@@ -184,6 +298,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
@@ -197,10 +312,13 @@ files:
 - lib/mini_profiler/timer_struct/sql.rb
 - lib/mini_profiler/version.rb
 - lib/mini_profiler_rails/railtie.rb
+- lib/mini_profiler_rails/railtie_methods.rb
 - lib/patches/db/activerecord.rb
 - lib/patches/db/mongo.rb
 - lib/patches/db/moped.rb
 - lib/patches/db/mysql2.rb
+- lib/patches/db/mysql2/alias_method.rb
+- lib/patches/db/mysql2/prepend.rb
 - lib/patches/db/neo4j.rb
 - lib/patches/db/nobrainer.rb
 - lib/patches/db/oracle_enhanced.rb
@@ -211,15 +329,17 @@ files:
 - lib/patches/db/sequel.rb
 - lib/patches/net_patches.rb
 - lib/patches/sql_patches.rb
+- lib/prepend_mysql2_patch.rb
+- lib/prepend_net_http_patch.rb
 - lib/rack-mini-profiler.rb
 - rack-mini-profiler.gemspec
-homepage: http://miniprofiler.com
+homepage: https://miniprofiler.com
 licenses:
 - MIT
 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
@@ -227,16 +347,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.
 test_files: []