rack-mini-profiler 0.10.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a128037529807d7766b5879fbe52bb08e166b4
-  data.tar.gz: 0b50933b899ed619bea7c18e08f8448795d4634d
+  metadata.gz: 3ece809a3861e0508dd92e06d0fa272bf483de9d
+  data.tar.gz: 2edb42b798d5aa568008c715a56b5f521c8dac4f
 SHA512:
-  metadata.gz: 7a18aa291f92f0ca6f33f56285eaca6dccfd07eb02b33470a6af05af23fb3f941c72588d0c35d4342fd2c34567c74e0f301de01d82be54b4c19d2433c7c2ccf7
-  data.tar.gz: d7c07474c0bdb2df7e76129d0cc604f2622974a1080e3a41bdcc70b6556408fcb16ae7f31ab0dd46c32354ffce52eb53c30947cb0cd9d29a88c88394dce907ea
+  metadata.gz: 6f6f0f8477e82af1183ccf3cc38236b2cdc39c3e32801ae276bc1657649b3641fafd336b2b7ac683bf1cab74426f4cf409eaa6bac4b7be39650f53e8a3d3d5d7
+  data.tar.gz: 50eec3c2f3599412395699db1f850b6633b604022e059dfbe30c753d2b4fc782611c63a274b2a1e61e6c00a2a4cb01f4ed460ac4340bac1d2b8e0d6e640fb77f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.0.0 2017-03-29
+
+- [BREAKING CHANGE] Ruby version 2.2.0 or later is required
+- [FEATURE] use new web performance API to avoid warning @MikeRogers0
+- [FEATURE] store hidden pref regarding showing mini profiler in session @MikeRogers0
+- [FIX] correct jQuery 3.0 deprecations @TiSer
+- [FIX] JS in IFRAME @naiyt
+
+## 0.10.8 2017-12-01
+
+- [FEATURE] Add `# frozen_string_literal: true` to all `lib/**/*.rb` files
+
 ## 0.10.7 2017-11-24
 
 - [FEATURE] Replace Time.now with Process.clock_gettime(Process::CLOCK_MONOTONIC)

data/README.md

@@ -4,14 +4,6 @@
 
 Middleware that displays speed badge for every html page. Designed to work both in production and in development.
 
-# URGENT HELP NEEDED!!!
-
-Well, not exactly mega urgent, but nice to see you are reading this.
-
-There is one very simple change I would like to see ASAP: I would like to see `# frozen_string_literal: true` on every file we ship
-
-If you pick up this task, be sure to amend the README in your PR AND add a Changelog. 
-
 #### Features
 
 * Database profiling - Currently supports Mysql2, Postgres, Oracle (oracle_enhanced ~> 1.5.0) and Mongoid3 (with fallback support to ActiveRecord)
@@ -38,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
+Install/add to Gemfile in Ruby 2.2+
 
 ```ruby
 gem 'rack-mini-profiler'
@@ -48,13 +40,12 @@ NOTE: Be sure to require rack_mini_profiler below the `pg` and `mysql` gems in y
 
 You can also include optional libraries to enable additional features.
 ```ruby
-# For memory profiling (requires Ruby MRI 2.1+)
+# For memory profiling
 gem 'memory_profiler'
 
-# For call-stack profiling flamegraphs (requires Ruby MRI 2.0.0+)
+# For call-stack profiling flamegraphs
 gem 'flamegraph'
-gem 'stackprof'     # For Ruby MRI 2.1+
-gem 'fast_stack'    # For Ruby MRI 2.0
+gem 'stackprof'
 ```
 
 #### Rails
@@ -144,13 +135,10 @@ To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-
 * add the [**flamegraph**](https://github.com/SamSaffron/flamegraph) gem to your Gemfile
 * visit a page in your app with `?pp=flamegraph`
 
-Flamegraph generation is supported in Ruby MRI 2.0+
-
 ### Memory Profiling
 
 Memory allocations can be measured (using the [memory_profiler](https://github.com/SamSaffron/memory_profiler) gem)
 which will show allocations broken down by gem, file location, and class and will also highlight `String` allocations.
-(Requires Ruby MRI 2.1.0+)
 
 Add `?pp=profile-memory` to the URL of any request while Rack::MiniProfiler is enabled to generate the report.
 
@@ -166,8 +154,8 @@ Example: `?pp=profile-memory&memory_profiler_allow_files=active_record|app`
 
 There are two additional `pp` options that can be used to analyze memory which do not require the `memory_profiler` gem
 
-* Use `?pp=profile-gc` to report on Garbage Collection statistics (requires Ruby MRI 1.9.3+)
-* Use `?pp=analyze-memory` to report on ObjectSpace statistics (requires Ruby 2.0.0+)
+* Use `?pp=profile-gc` to report on Garbage Collection statistics
+* Use `?pp=analyze-memory` to report on ObjectSpace statistics
 
 ## Access control in non-development environments
 
@@ -326,7 +314,7 @@ backtrace_includes|Rails: `[/^\/?(app|config|lib|test)/]`<br>Rack: `[]`|Regexes
 backtrace_remove|rails: `Rails.root`<br>Rack: `nil`|A string or regex to remove part of each line in the backtrace.
 toggle_shortcut|Alt+P|Keyboard shortcut to toggle the mini_profiler's visibility. See [jquery.hotkeys](https://github.com/jeresig/jquery.hotkeys).
 start_hidden|`false`|`false` to make mini_profiler visible on page load.
-backtrace_threshold_ms|`0`|Minimum SQL query elapsed time before a backtrace is recorded. Backtrace recording can take a couple of milliseconds on rubies earlier than 2.0, impacting performance for very small queries.
+backtrace_threshold_ms|`0`|Minimum SQL query elapsed time before a backtrace is recorded.
 flamegraph_sample_rate|`0.5`|How often to capture stack traces for flamegraphs in milliseconds.
 disable_env_dump|`false`|`true` disables `?pp=env`, which prevents sending ENV vars over HTTP.
 base_url_path|`'/mini-profiler-resources/'`|Path for assets; added as a prefix when naming assets and sought when responding to requests.

data/lib/generators/rack_profiler/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RackProfiler
   module Generators
     class InstallGenerator < ::Rails::Generators::Base

data/lib/generators/rack_profiler/templates/rack_profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if Rails.env.development?
   require "rack-mini-profiler"
 

data/lib/html/includes.js

@@ -108,18 +108,6 @@ var MiniProfiler = (function () {
                         copy.navigation.redirectCount = clientPerformance.navigation.redirectCount;
                     }
                     clientPerformance = copy;
-
-                    // hack to add chrome timings
-                    if (window.chrome && window.chrome.loadTimes) {
-                      var chromeTimes = window.chrome.loadTimes();
-                      if (chromeTimes.firstPaintTime) {
-                        clientPerformance.timing["First Paint Time"] = Math.round(chromeTimes.firstPaintTime * 1000);
-                      }
-                      if (chromeTimes.firstPaintTime) {
-                        clientPerformance.timing["First Paint After Load Time"] = Math.round(chromeTimes.firstPaintAfterLoadTime * 1000);
-                      }
-
-                    }
                 }
             } else if (ajaxStartTime !== null && clientProbes && clientProbes.length > 0) {
                 clientPerformance = { timing: { navigationStart: ajaxStartTime.getTime() } };
@@ -166,7 +154,7 @@ var MiniProfiler = (function () {
 
             totalsControl = $("<div class='profiler-result'><div class='profiler-button profiler-totals'></div></div>");
             totalsControl.appendTo(container);
-            totalsControl.click(function(){
+            totalsControl.on('click', function(){
               totalsControl.parent().find('.profiler-result').show();
               totalsControl.hide();
               expandedResults = true;
@@ -192,13 +180,13 @@ var MiniProfiler = (function () {
             popup = result.find('.profiler-popup');
 
         // button will appear in corner with the total profiling duration - click to show details
-        button.click(function () { buttonClick(button, popup); });
+        button.on('click', function () { buttonClick(button, popup); });
 
         // small duration steps and the column with aggregate durations are hidden by default; allow toggling
         toggleHidden(popup);
 
         // lightbox in the queries
-        popup.find('.profiler-queries-show').click(function () { queriesShow($(this), result); });
+        popup.find('.profiler-queries-show').on('click', function () { queriesShow($(this), result); });
 
         // limit count
         if (container.find('.profiler-result').length > options.maxTracesToShow)
@@ -222,7 +210,7 @@ var MiniProfiler = (function () {
             popupPreventHorizontalScroll(popup);
         };
 
-        childrenTime.add(trivial).add(trivialGaps).click(function () {
+        childrenTime.add(trivial).add(trivialGaps).on('click', function () {
             toggleIt(this);
         });
 
@@ -266,7 +254,7 @@ var MiniProfiler = (function () {
     var popupSetDimensions = function (button, popup) {
         var px = button.position().top - 1, // position next to the button we clicked
             windowHeight = $(window).height(),
-            maxHeight = windowHeight - top - 40; // make sure the popup doesn't extend below the fold
+            maxHeight = windowHeight - 40; // make sure the popup doesn't extend below the fold
 
         popup
             .css(options.renderVerticalPosition, px)
@@ -402,6 +390,7 @@ var MiniProfiler = (function () {
         });
         $(document).on('keydown.mini-profiler', null, options.toggleShortcut, function(e) {
             $('.profiler-results').toggle();
+            sessionStorage['rack-mini-profiler-start-hidden'] = $('.profiler-results').is(':hidden');
         });
 
         if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
@@ -430,7 +419,7 @@ var MiniProfiler = (function () {
             prettyPrint();
 
             // since queries are already shown, just highlight and scroll when clicking a "1 sql" link
-            popup.find('.profiler-queries-show').click(function () {
+            popup.find('.profiler-queries-show').on('click', function () {
                 queriesScrollIntoView($(this), $('.profiler-queries'), $(document));
             });
         });
@@ -440,7 +429,7 @@ var MiniProfiler = (function () {
         if (options.showControls) {
             controls = $('<div class="profiler-controls"><span class="profiler-min-max">m</span><span class="profiler-clear">c</span></div>').appendTo(container);
 
-            $('.profiler-controls .profiler-min-max').click(function () {
+            $('.profiler-controls .profiler-min-max').on('click', function () {
                 container.toggleClass('profiler-min');
             });
 
@@ -455,7 +444,7 @@ var MiniProfiler = (function () {
                 }
             });
 
-            $('.profiler-controls .profiler-clear').click(function () {
+            $('.profiler-controls .profiler-clear').on('click', function () {
                 container.find('.profiler-result').remove();
             });
         }
@@ -636,7 +625,7 @@ var MiniProfiler = (function () {
                 var children = script.getAttribute('data-children') === 'true';
                 var controls = script.getAttribute('data-controls') === 'true';
                 var authorized = script.getAttribute('data-authorized') === 'true';
-                var startHidden = script.getAttribute('data-start-hidden') === 'true';
+                var startHidden = script.getAttribute('data-start-hidden') === 'true' || sessionStorage['rack-mini-profiler-start-hidden'] === 'true';
                 var htmlContainer = script.getAttribute('data-html-container');
 
                 return {
@@ -815,7 +804,7 @@ var MiniProfiler = (function () {
 
             for (var i = 0; i < clientTimings.timings.length; i++) {
                 t = clientTimings.timings[i];
-                var trivial = t.Name != "Dom Complete" && t.Name != "Response" && t.Name != "First Paint Time";
+                var trivial = t.Name != "Dom Complete" && t.Name != "Response"
                 trivial = t.Duration < 2 ? trivial : false;
                 list.push(
                 {
@@ -826,6 +815,22 @@ var MiniProfiler = (function () {
                 });
             }
 
+
+            // Use the Paint Timing API for render performance.
+            if (window.performance) {
+              var firstPaint = window.performance.getEntriesByName("first-paint");
+              
+              if(firstPaint !== undefined && firstPaint.length >= 1){
+                list.push(
+                  {
+                    isTrivial: false,
+                    name: "First Paint Time",
+                    duration: firstPaint[0].duration,
+                    start: firstPaint[0].startTime
+                  });
+              }
+            }
+
             list.sort(function (a, b) { return a.start - b.start; });
             return list;
         },

data/lib/mini_profiler/asset_version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '812af6927f7534f73488ece21dc89b62'.freeze
+    ASSET_VERSION = '251162ee7dc30da30d5370581c664510'.freeze
   end
 end

data/lib/mini_profiler/client_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class ClientSettings
@@ -17,6 +19,8 @@ module Rack
         @cookie = request.cookies[COOKIE_NAME]
         @store = store
         @start = start
+        @backtrace_level = nil
+        @orig_disable_profiling = @disable_profiling = nil
 
         @allowed_tokens, @orig_auth_tokens = nil
 

data/lib/mini_profiler/config.rb

@@ -1,37 +1,22 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class Config
+      def self.attr_accessor(*vars)
+        @attributes ||= []
+        @attributes.concat vars
+        super(*vars)
+      end
 
-    def self.attr_accessor(*vars)
-      @attributes ||= []
-      @attributes.concat vars
-      super(*vars)
-    end
-
-    def self.attributes
-      @attributes
-    end
-
-    attr_accessor :authorization_mode, :auto_inject, :backtrace_ignores,
-      :backtrace_includes, :backtrace_remove, :backtrace_threshold_ms,
-      :base_url_path, :disable_caching, :disable_env_dump, :enabled,
-      :flamegraph_sample_rate, :logger, :pre_authorize_cb, :skip_paths,
-      :skip_schema_queries, :storage, :storage_failure, :storage_instance,
-      :storage_options, :user_provider
-    attr_accessor :skip_sql_param_names, :suppress_encoding, :max_sql_param_length
-
-    # ui accessors
-    attr_accessor :collapse_results, :max_traces_to_show, :position, :vertical_position, :horizontal_position,
-      :show_children, :show_controls, :show_trivial, :start_hidden,
-      :toggle_shortcut, :html_container
-
-    # Deprecated options
-    attr_accessor :use_existing_jquery
+      def self.attributes
+        @attributes
+      end
 
       def self.default
         new.instance_eval {
           @auto_inject      = true # automatically inject on every html page
-          @base_url_path    = "/mini-profiler-resources/"
+          @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}
@@ -54,20 +39,46 @@ 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'
+          @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"
 
           self
         }
       end
 
+      attr_accessor :authorization_mode, :auto_inject, :backtrace_ignores,
+        :backtrace_includes, :backtrace_remove, :backtrace_threshold_ms,
+        :base_url_path, :disable_caching, :disable_env_dump, :enabled,
+        :flamegraph_sample_rate, :logger, :pre_authorize_cb, :skip_paths,
+        :skip_schema_queries, :storage, :storage_failure, :storage_instance,
+        :storage_options, :user_provider
+      attr_accessor :skip_sql_param_names, :suppress_encoding, :max_sql_param_length
+
+      # ui accessors
+      attr_accessor :collapse_results, :max_traces_to_show, :position,
+        :show_children, :show_controls, :show_trivial, :start_hidden,
+        :toggle_shortcut, :html_container
+
+      # Deprecated options
+      attr_accessor :use_existing_jquery
+
+      def vertical_position
+        position.include?('bottom') ? 'bottom' : 'top'
+      end
+
+      def horizontal_position
+        position.include?('right') ? 'right' : 'left'
+      end
+
+
       def merge!(config)
         if config
           if Hash === config
@@ -79,14 +90,8 @@ module Rack
             }
           end
         end
-        set_positions!
       end
 
-      def set_positions!
-        position = (self.position && self.position.match("-")) ? self.position.split("-") : ["top", "left"]
-        self.vertical_position = position.first
-        self.horizontal_position = position.last
-      end
     end
   end
 end

data/lib/mini_profiler/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rack::MiniProfiler::Context
   attr_accessor :inject_js,:current_timer,:page_struct,:skip_backtrace,
                 :full_backtrace,:discard, :mpt_init, :measure

data/lib/mini_profiler/gc_profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rack::MiniProfiler::GCProfiler
 
   def initialize

data/lib/mini_profiler/profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class << self
@@ -109,12 +111,13 @@ module Rack
     end
 
     def generate_html(page_struct, env, result_json = page_struct.to_json)
-      path = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
-      version = MiniProfiler::ASSET_VERSION
-      json = result_json
-      includes = get_profile_script(env)
-      name = page_struct[:name]
-      duration = page_struct.duration_ms.round(1).to_s
+      # double-assigning to suppress "assigned but unused variable" warnings
+      path = path = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
+      version = version = MiniProfiler::ASSET_VERSION
+      json = json = result_json
+      includes = includes = get_profile_script(env)
+      name = name = page_struct[:name]
+      duration = duration = page_struct.duration_ms.round(1).to_s
 
       MiniProfiler.share_template.result(binding)
     end
@@ -406,13 +409,13 @@ module Rack
     end
 
     def dump_exceptions(exceptions)
-      body = "Exceptions raised during request\n\n"
+      body = "Exceptions raised during request\n\n".dup
       if exceptions.empty?
         body << "No exceptions raised"
       else
         body << "Exceptions: (#{exceptions.size} total)\n"
-        exceptions.group_by(&:class).each do |klass, exceptions|
-          body << "  #{klass.name} (#{exceptions.size})\n"
+        exceptions.group_by(&:class).each do |klass, exceptions_per_class|
+          body << "  #{klass.name} (#{exceptions_per_class.size})\n"
         end
 
         body << "\nBacktraces\n"
@@ -424,7 +427,7 @@ module Rack
     end
 
     def dump_env(env)
-      body = "Rack Environment\n---------------\n"
+      body = "Rack Environment\n---------------\n".dup
       env.each do |k,v|
         body << "#{k}: #{v}\n"
       end
@@ -475,7 +478,7 @@ module Rack
         str
       end
 
-      body = "ObjectSpace stats:\n\n"
+      body = "ObjectSpace stats:\n\n".dup
 
       counts = ObjectSpace.count_objects
       total_strings = counts[:T_STRING]

data/lib/mini_profiler/profiling_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module ProfilingMethods

data/lib/mini_profiler/storage/abstract_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class AbstractStore

data/lib/mini_profiler/storage/file_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class FileStore < AbstractStore
@@ -16,7 +18,7 @@ module Rack
           begin
             data = ::File.open(path(key),"rb") {|f| f.read}
             return Marshal.load data
-          rescue => e
+          rescue
             return nil
           end
         end

data/lib/mini_profiler/storage/memcache_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class MemcacheStore < AbstractStore

data/lib/mini_profiler/storage/memory_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class MemoryStore < AbstractStore
@@ -50,7 +52,7 @@ module Rack
         args ||= {}
         @expires_in_seconds = args.fetch(:expires_in) { EXPIRES_IN_SECONDS }
 
-        @token1, @token2, @cycle_tokens_at = nil
+        @token1, @token2, @cycle_at = nil
 
         initialize_locks
         initialize_cleanup_thread(args)
@@ -68,7 +70,7 @@ module Rack
       def initialize_cleanup_thread(args={})
         cleanup_interval = args.fetch(:cleanup_interval) { CLEANUP_INTERVAL }
         cleanup_cycle    = args.fetch(:cleanup_cycle)    { CLEANUP_CYCLE }
-        t = CacheCleanupThread.new(cleanup_interval, cleanup_cycle, self) do |t|
+        t = CacheCleanupThread.new(cleanup_interval, cleanup_cycle, self) do
           until Thread.current[:should_exit] do
             CacheCleanupThread.current.sleepy_run
           end

data/lib/mini_profiler/storage/redis_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     class RedisStore < AbstractStore

data/lib/mini_profiler/timer_struct/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module TimerStruct

data/lib/mini_profiler/timer_struct/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module TimerStruct
@@ -15,7 +17,7 @@ module Rack
 
         # used by Railtie to instrument asset_tag for JS / CSS
         def self.instrument(name, orig)
-          probe = "<script>mPt.probe('#{name}')</script>"
+          probe = "<script>mPt.probe('#{name}')</script>".dup
           wrapped = probe
           wrapped << orig
           wrapped << probe

data/lib/mini_profiler/timer_struct/custom.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module TimerStruct

data/lib/mini_profiler/timer_struct/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module TimerStruct
@@ -11,12 +13,14 @@ module Rack
         def initialize(env)
           timer_id     = MiniProfiler.generate_id
           page_name    = env['PATH_INFO']
-          started_at   = (Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i
+          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,
-            :started                                 => started_at,
+            :started                                 => started,
+            :started_at                              => started_at,
             :machine_name                            => machine_name,
             :level                                   => 0,
             :user                                    => "unknown user",
@@ -66,7 +70,7 @@ module Rack
 
         def extra_json
           {
-            :started               => '/Date(%d)/' % @attributes[:started],
+            :started               => '/Date(%d)/' % @attributes.delete(:started_at),
             :duration_milliseconds => @attributes[:root][:duration_milliseconds],
             :custom_timing_names   => @attributes[:custom_timing_stats].keys.sort
           }

data/lib/mini_profiler/timer_struct/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
     module TimerStruct

data/lib/mini_profiler/timer_struct/sql.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Rack
   class MiniProfiler
 
@@ -10,7 +11,7 @@ module Rack
           stack_trace = nil
           unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
             # Allow us to filter the stack trace
-            stack_trace = String.new
+            stack_trace = "".dup
              # Clean up the stack trace if there are options to do so
             Kernel.caller.each do |ln|
               ln.gsub!(Rack::MiniProfiler.config.backtrace_remove, '') if Rack::MiniProfiler.config.backtrace_remove and !full_backtrace

data/lib/mini_profiler/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Rack
   class MiniProfiler
-    VERSION = '0.10.7'
+    VERSION = '1.0.0'
   end
 end

data/lib/mini_profiler_rails/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Rack::MiniProfilerRails
@@ -5,7 +7,7 @@ module Rack::MiniProfilerRails
   # call direct if needed to do a defer init
   def self.initialize!(app)
 
-    raise "MiniProfilerRails initialized twice. Set `require: false' for rack-mini-profiler in your Gemfile" if @already_initialized
+    raise "MiniProfilerRails initialized twice. Set `require: false' for rack-mini-profiler in your Gemfile" if defined?(@already_initialized) && @already_initialized
 
     c = Rack::MiniProfiler.config
 

data/lib/patches/db/activerecord.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## based off https://github.com/newrelic/rpm/blob/master/lib/new_relic/agent/instrumentation/active_record.rb
 ## fallback for alls sorts of weird dbs
 module Rack

data/lib/patches/db/mongo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Mongo/Mongoid 5 patches
 class Mongo::Server::Connection
   def dispatch_with_timing(*args, &blk)

data/lib/patches/db/moped.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Mongoid 3 patches
 class Moped::Node
   alias_method :process_without_profiling, :process

data/lib/patches/db/mysql2.rb

@@ -1,3 +1,5 @@
+# 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

data/lib/patches/db/neo4j.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Neo4j::Core::Query
   alias_method :response_without_miniprofiler, :response
 

data/lib/patches/db/nobrainer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rack::MiniProfiler::NoBrainerProfiler
 
   def on_query(env)
@@ -6,7 +8,7 @@ class Rack::MiniProfiler::NoBrainerProfiler
                         !env[:criteria].where_indexed? &&
                         !env[:criteria].model.try(:perf_warnings_disabled)
 
-      query = ""
+      query = "".dup
 
       # per-model/query database overrides
       query << "[#{env[:options][:db]}] " if env[:options][:db]

data/lib/patches/db/oracle_enhanced.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveRecord::Result
   alias_method :each_without_profiling, :each
   def each(&blk)

data/lib/patches/db/pg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # PG patches, keep in mind exec and async_exec have a exec{|r| } semantics that is yet to be implemented
 class PG::Result
   alias_method :each_without_profiling, :each

data/lib/patches/db/plucky.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # mongo_mapper patches
 # TODO: Include overrides for distinct, update, cursor, and create
 class Plucky::Query

data/lib/patches/db/riak.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # riak-client 2.2.2 patches
 class Riak::Multiget
   class <<self

data/lib/patches/db/rsolr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RSolr::Connection
   alias_method :execute_without_profiling, :execute
   def execute_with_profiling(client, request_context)
@@ -7,7 +9,7 @@ class RSolr::Connection
     result       = execute_without_profiling(client, request_context)
     elapsed_time = SqlPatches.elapsed_time(start)
 
-    data = "#{request_context[:method].upcase} #{request_context[:uri]}"
+    data = "#{request_context[:method].upcase} #{request_context[:uri]}".dup
     if request_context[:method] == :post and request_context[:data]
       if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
         # it's xml, unescaping isn't needed

data/lib/patches/db/sequel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sequel
   class Database
     alias_method :log_duration_original, :log_duration

data/lib/patches/net_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if (defined?(Net) && defined?(Net::HTTP))
 
   Net::HTTP.class_eval do

data/lib/patches/sql_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SqlPatches
   def self.correct_version?(required_version, klass)
     Gem::Dependency.new('', required_version).match?('', klass::VERSION)

data/lib/rack-mini-profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'timeout'
 require 'thread'
@@ -25,8 +27,6 @@ require 'mini_profiler/context'
 require 'mini_profiler/client_settings'
 require 'mini_profiler/gc_profiler'
 require 'mini_profiler/profiler'
-# TODO
-# require 'mini_profiler/gc_profiler_ruby_head' if Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION)
 
 require 'patches/sql_patches'
 require 'patches/net_patches'

data/rack-mini-profiler.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "CHANGELOG.md"
   ]
   s.add_runtime_dependency 'rack', '>= 1.2.0'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.2.0'
 
   s.metadata = {
     'source_code_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="