rack-mini-profiler 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915cfa4f71cab960c3f73128fa213cce013f0b65
-  data.tar.gz: 3465e843ef28ed50178f1f76255de96b474903f6
+  metadata.gz: 661dc965f1499d7a00baa35f5699e91e1552ff68
+  data.tar.gz: 7bbccf4b17154aab14f7bd2012afcf2dac0efe25
 SHA512:
-  metadata.gz: 7c232ba029fb050b15d6b4cdb08b9dc3a6079ed723c06beb7b99dcbc7b6d009822aa2686895661a8e57497a0c5e529a691bf7507c0a895639be9b0e0346ddf29
-  data.tar.gz: 45b90274fd6828441a1a4ca14017a6d3b1f1292b65c157dbd03964748b7fd648b39f06484b36d56fd0340b52498bd9c8b0242fe6063e6e23dd115d4b99c10040
+  metadata.gz: 903fe47823489fae4a2b18aff1cddca204130c1e41b2132c5db951007a5c1fe85b7b110f3264b8abc2f22c07d438071b81c93251bc31cbe26db725b868ca0a2a
+  data.tar.gz: 400bb2bf85475461de90d238eb95cbac925710f758f576c7371cb7b25ef0998bf39d637835520b42dd96fbbeb7cd53f36fe531f83e9e9c8c1cf36022795fcb8c

data/CHANGELOG.md

@@ -1,4 +1,33 @@
 # CHANGELOG
+
+## 0.9.8 - 2015-11-27 (Sam Saffron)
+
+- [FEATURE] disable_env_dump config setting (@mathias)
+- [FEATURE] set X-MiniProfiler-Ids for all 2XX reqs (@tymagu2)
+- [FEATURE] add support for NoBrainer (rethinkdb) profiling (@niv)
+- [FEATURE] add oracle enhanced adapter profiling (@rrooding)
+- [FEATURE] pp=profile-memory can now parse query params (@dgynn)
+
+
+## 0.9.7 - 2015-08-03 (Sam Saffron)
+
+- [FEATURE] remove confusing pp=profile-gc-time (Nate Berkopec)
+- [FEATURE] truncate strings in pp=analyze-memory (Nate Berkopec)
+- [FEATURE] rename pp=profile-gc-ruby-head to pp=profile-memory (Nate Berkopec)
+
+## 0.9.6 - 2015-07-08 (Sam Saffron)
+
+- [FIX] incorrect truncation in pp=analyze-memory
+
+## 0.9.5 - 2015-07-08 (Sam Saffron)
+
+- [FEATURE] improve pp=analyze-memory
+
+## 0.9.4 - 2015-07-08 (Sam Saffron)
+- [UX] added a link to "more" actions in profiler
+- [FEATURE] pp=help now displays links
+- [FEATURE] simple memory report with pp=analyze-memory
+
 ## 0.9.2 - 2014-06-26 (Sam Saffron)
 - [CHANGE] staging and other environments behave like production (Cedric Felizard)
 - [DOC] CHANGELOG reorg (Olivier Lacan)

data/README.md

@@ -6,7 +6,7 @@ Middleware that displays speed badge for every html page. Designed to work both
 
 #### Features
 
-* database profiling. Currently supports Mysql2, Postgres, and Mongoid3 (with fallback support to ActiveRecord)
+* database profiling. Currently supports Mysql2, Postgres, Oracle (oracle_enhanced ~> 1.5.0) and Mongoid3 (with fallback support to ActiveRecord)
 
 #### Learn more
 
@@ -23,7 +23,6 @@ We have decided to restructure our repository so there is a central UI repo and
 
 - Setting up a build that reuses https://github.com/MiniProfiler/ui
 - Migrating the internal data structures [per the spec](https://github.com/MiniProfiler/ui)
-- Cleaning up the [horrendous class structure that is using strings as keys and crazy non-objects](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/lib/mini_profiler/timer_struct/sql.rb#L36-L44)
 
 If you feel like taking on any of this start an issue and update us on your progress.
 
@@ -90,20 +89,21 @@ 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 MRI 2.0 and 2.1 only.
+Flamegraph generation is supported in MRI 2.0, 2.1, and 2.2 only.
 
 
-## Access control in production
+## Access control in non-development environments
 
 rack-mini-profiler is designed with production profiling in mind. To enable that just run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
 
 ```ruby
-# A hook in your ApplicationController
-def authorize
-  if current_user.is_admin?
-    Rack::MiniProfiler.authorize_request
+  # inside your ApplicationController
+
+  before_action do
+    if current_user && current_user.is_admin?
+      Rack::MiniProfiler.authorize_request
+    end
   end
-end
 ```
 
 ## Configuration
@@ -122,7 +122,7 @@ To disable this behavior, use the following config setting:
 
 ```ruby
 # Do not let rack-mini-profiler disable caching
-Rack::MiniProfiler.config.disable_caching = false # defaults to true 
+Rack::MiniProfiler.config.disable_caching = false # defaults to true
 ```
 
 ### Storage
@@ -183,11 +183,14 @@ The available configuration options are:
 * skip_paths - Specifies path list that can be skipped.
 * skip_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
 * auto_inject (default true) - when false the miniprofiler script is not injected in the page
-* backtrace_filter - a regex you can use to filter out unwanted lines from the backtraces
-* toggle_shortcut (default Alt+P) - a jquery.hotkeys.js-style keyboard shortcut, used to toggle the mini_profiler's visibility. See http://code.google.com/p/js-hotkeys/ for more info.
+* backtrace_ignores (default nil) - an array of regexes you can use to filter out unwanted lines from the backtraces
+* backtrace_includes (default nil, or [/^\/?(app|config|lib|test)/] in rails) - an array of regexes you can use to keep lines in the backtrace
+* backtrace_remove (default nil, or Rails.root in rails) - A string or regex to remove part of each line in the backtrace
+* toggle_shortcut (default Alt+P) - a jquery.hotkeys.js-style keyboard shortcut, used to toggle the mini_profiler's visibility. See https://github.com/jeresig/jquery.hotkeys for more info.
 * start_hidden (default false) - Whether or not you want the mini_profiler to be visible when loading a page
 * backtrace_threshold_ms (default zero) - 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.
 * flamegraph_sample_rate (default 0.5ms) - How often fast_stack should get stack trace info to generate flamegraphs
+* disable_env_dump (default false) - When enabled, disables the `?pp=env` which can be useful when you are concerned about not sending ENV vars out over HTTP.
 
 ### Custom middleware ordering (required if using `Rack::Deflate` with Rails)
 

data/lib/html/includes.css

@@ -395,6 +395,9 @@
   padding: 0px;
   margin: 0px;
 }
+.profiler-results .profiler-more-actions {
+  float: left;
+}
 .profiler-queries-bg {
   z-index: 2147483642;
   display: none;

data/lib/html/includes.js

@@ -663,7 +663,7 @@ var MiniProfiler = (function () {
                 // jquery.hotkeys.js
                 // https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
 
-                if (jQuery.hotkeys === undefined) {
+                if (MiniProfiler.jQuery.hotkeys === undefined) {
                     (function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
                     !0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
                     109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(MiniProfiler.jQuery);
@@ -748,6 +748,12 @@ var MiniProfiler = (function () {
             return options.path + 'results?id=' + id;
         },
 
+        moreUrl: function () {
+          var loc = window.location.href;
+          loc = loc.indexOf("?") > 0 ? loc + "&pp=help" : "?pp=help";
+          return loc;
+        },
+
         getClientTimings: function (clientTimings) {
             var list = [];
             var t;

data/lib/html/includes.less

@@ -399,6 +399,9 @@
         padding: 0px;
         margin: 0px;
     }
+
+    .profiler-more-actions { float: left; }
+
 }
 
 // popup results' queries will be displayed in front of this
@@ -413,6 +416,7 @@
     min-width:100%;
 }
 
+
 // used when viewing a shared, full page result
 .profiler-result-full {
     .profiler-result {
@@ -484,4 +488,5 @@
             }
         }
     }
+
 }

data/lib/html/includes.tmpl

@@ -123,6 +123,7 @@
 
 <script id="linksTemplate" type="text/x-jquery-tmpl">
   <a href="${MiniProfiler.shareUrl(id)}" class="profiler-share-profiler-results" target="_blank">share</a>
+  <a href="${MiniProfiler.moreUrl()}" class="profiler-more-actions">more</a>
   {{if custom_link}}
   <a href="${custom_link}" class="profiler-custom-link" target="_blank">${custom_link_name}</a>
   {{/if}}

data/lib/mini_profiler/asset_version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '9db1f8db18400644bd5c7449e5295620'.freeze
+    ASSET_VERSION = 'e0e50f551fa464f9d95c2e082bb2d45b'.freeze
   end
 end

data/lib/mini_profiler/config.rb

@@ -12,10 +12,13 @@ module Rack
       @attributes
     end
 
-    attr_accessor :authorization_mode, :auto_inject, :backtrace_ignores, :backtrace_includes, :backtrace_remove,
-      :backtrace_threshold_ms, :base_url_path, :disable_caching, :enabled, :flamegraph_sample_rate, :logger, :position,
-      :pre_authorize_cb, :skip_paths, :skip_schema_queries, :start_hidden, :storage, :storage_failure,
-      :storage_instance, :storage_options, :toggle_shortcut, :user_provider
+    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, :position, :pre_authorize_cb,
+      :skip_paths, :skip_schema_queries, :start_hidden, :storage,
+      :storage_failure, :storage_instance, :storage_options, :toggle_shortcut,
+      :user_provider
 
     # Deprecated options
     attr_accessor :use_existing_jquery
@@ -44,6 +47,7 @@ module Rack
             end
           end
           @enabled = true
+          @disable_env_dump = false
           self
         }
       end

data/lib/mini_profiler/gc_profiler.rb

@@ -92,26 +92,6 @@ class Rack::MiniProfiler::GCProfiler
     [objects,memory_allocated]
   end
 
-  def profile_gc_time(app, env)
-    body = []
-
-    begin
-      GC::Profiler.clear
-      prev_profiler_state = GC::Profiler.enabled?
-      prev_gc_state       = GC.enable
-      GC::Profiler.enable
-      b = app.call(env)[2]
-      b.close if b.respond_to? :close
-      body << "GC Profiler ran during this request, if it fired you will see the cost below:\n\n"
-      body << GC::Profiler.result
-    ensure
-      prev_gc_state ? GC.disable : GC.enable
-      GC::Profiler.disable unless prev_profiler_state
-    end
-
-    return [200, {'Content-Type' => 'text/plain'}, body]
-  end
-
   def profile_gc(app, env)
 
     # for memsize_of

data/lib/mini_profiler/profiler.rb

@@ -100,7 +100,7 @@ module Rack
 
         # Otherwise give the HTML back
         html = MiniProfiler.share_template.dup
-        html.gsub!(/\{path\}/, "#{env['SCRIPT_NAME']}#{@config.base_url_path}")
+        html.gsub!(/\{path\}/, "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}")
         html.gsub!(/\{version\}/, MiniProfiler::ASSET_VERSION)
         html.gsub!(/\{json\}/, result_json)
         html.gsub!(/\{includes\}/, get_profile_script(env))
@@ -157,8 +157,11 @@ module Rack
       query_string = env['QUERY_STRING']
       path         = env['PATH_INFO']
 
+      # Someone (e.g. Rails engine) could change the SCRIPT_NAME so we save it
+      env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME'] = env['SCRIPT_NAME']
+
       skip_it = (@config.pre_authorize_cb && !@config.pre_authorize_cb.call(env)) ||
-                (@config.skip_paths && @config.skip_paths.any?{ |p| path[0,p.length] == p}) ||
+                (@config.skip_paths && @config.skip_paths.any?{ |p| path.start_with?(p) }) ||
                 query_string =~ /pp=skip/
 
       has_profiling_cookie = client_settings.has_cookie?
@@ -196,20 +199,23 @@ module Rack
 
       if query_string =~ /pp=profile-gc/
         current.measure = false if current
-
-        if query_string =~ /pp=profile-gc-time/
-          return Rack::MiniProfiler::GCProfiler.new.profile_gc_time(@app, env)
-        elsif query_string =~ /pp=profile-gc-ruby-head/
-          result = StringIO.new
-          report = MemoryProfiler.report do
-            _,_,body = @app.call(env)
-            body.close if body.respond_to? :close
-          end
-          report.pretty_print(result)
-          return text_result(result.string)
-        else
-          return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
+        return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
+      end
+
+      if query_string =~ /pp=profile-memory/
+        query_params = Rack::Utils.parse_nested_query(query_string)
+        options = {
+          :ignore_files => query_params['memory_profiler_ignore_files'],
+          :allow_files => query_params['memory_profiler_allow_files'],
+        }
+        options[:top]= Integer(query_params['memory_profiler_top']) if query_params.key?('memory_profiler_top')
+        result = StringIO.new
+        report = MemoryProfiler.report(options) do
+          _,_,body = @app.call(env)
+          body.close if body.respond_to? :close
         end
+        report.pretty_print(result)
+        return text_result(result.string)
       end
 
       MiniProfiler.create_current(env, @config)
@@ -285,7 +291,7 @@ module Rack
       if (config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
         # this is non-obvious, don't kill the profiling cookie on errors or short requests
         # this ensures that stuff that never reaches the rails stack does not kill profiling
-        if status == 200 && ((Time.now - start) > 0.1)
+        if status >= 200 && status < 300 && ((Time.now - start) > 0.1)
           client_settings.discard_cookie!(headers)
         end
         skip_it = true
@@ -299,14 +305,19 @@ module Rack
         return dump_exceptions exceptions
       end
 
-      if query_string =~ /pp=env/
+      if query_string =~ /pp=env/ && !config.disable_env_dump
         body.close if body.respond_to? :close
         return dump_env env
       end
 
+      if query_string =~ /pp=analyze-memory/
+        body.close if body.respond_to? :close
+        return analyze_memory
+      end
+
       if query_string =~ /pp=help/
         body.close if body.respond_to? :close
-        return help(client_settings)
+        return help(client_settings, env)
       end
 
       page_struct = current.page_struct
@@ -325,7 +336,7 @@ module Rack
         @storage.save(page_struct)
 
         # inject headers, script
-        if headers['Content-Type'] && status == 200
+        if status >= 200 && status < 300
           client_settings.write!(headers)
           result = inject_profiler(env,status,headers,body)
           return result if result
@@ -446,30 +457,112 @@ module Rack
       text_result(body)
     end
 
+    def trim_strings(strings, max_size)
+      strings.sort!{|a,b| b[1] <=> a[1]}
+      i = 0
+      strings.delete_if{|_| (i+=1) > max_size}
+    end
+
+    def analyze_memory
+      require 'objspace'
+
+      utf8 = "utf-8"
+
+      GC.start
+
+      trunc = lambda do |str|
+        str = str.length > 200 ? str : str[0..200]
+
+        if str.encoding != Encoding::UTF_8
+          str = str.dup
+          str.force_encoding(utf8)
+
+          unless str.valid_encoding?
+            # work around bust string with a double conversion
+            str.encode!("utf-16","utf-8",:invalid => :replace)
+            str.encode!("utf-8","utf-16")
+          end
+        end
+
+        str
+      end
+
+      body = "ObjectSpace stats:\n\n"
+
+      counts = ObjectSpace.count_objects
+      total_strings = counts[:T_STRING]
+
+      body << counts
+        .sort{|a,b| b[1] <=> a[1]}
+        .map{|k,v| "#{k}: #{v}"}
+        .join("\n")
+
+      strings = []
+      string_counts = Hash.new(0)
+      sample_strings = []
+
+      max_size = 1000
+      sample_every = total_strings / max_size
+
+      i = 0
+      ObjectSpace.each_object(String) do |str|
+        i += 1
+        string_counts[str] += 1
+        strings << [trunc.call(str), str.length]
+        sample_strings << [trunc.call(str), str.length] if i % sample_every == 0
+        if strings.length > max_size * 2
+          trim_strings(strings, max_size)
+        end
+      end
+
+      trim_strings(strings, max_size)
+
+      body << "\n\n\n1000 Largest strings:\n\n"
+      body << strings.map{|s,len| "#{s[0..1000]}\n(len: #{len})\n\n"}.join("\n")
+
+      body << "\n\n\n1000 Sample strings:\n\n"
+      body << sample_strings.map{|s,len| "#{s[0..1000]}\n(len: #{len})\n\n"}.join("\n")
+
+      body << "\n\n\n1000 Most common strings:\n\n"
+      body << string_counts.sort{|a,b| b[1] <=> a[1]}[0..max_size].map{|s,len| "#{trunc.call(s)}\n(x #{len})\n\n"}.join("\n")
+
+      text_result(body)
+    end
+
     def text_result(body)
       headers = {'Content-Type' => 'text/plain'}
       [200, headers, [body]]
     end
 
-    def help(client_settings)
-      headers = {'Content-Type' => 'text/plain'}
-      body = "Append the following to your query string:
-
-  pp=help : display this screen
-  pp=env : display the rack environment
-  pp=skip : skip mini profiler for this request
-  pp=no-backtrace #{"(*) " if client_settings.backtrace_none?}: don't collect stack traces from all the SQL executed (sticky, use pp=normal-backtrace to enable)
-  pp=normal-backtrace #{"(*) " if client_settings.backtrace_default?}: collect stack traces from all the SQL executed and filter normally
-  pp=full-backtrace #{"(*) " if client_settings.backtrace_full?}: enable full backtraces for SQL executed (use pp=normal-backtrace to disable)
-  pp=disable : disable profiling for this session
-  pp=enable : enable profiling for this session (if previously disabled)
-  pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
-  pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
-  pp=profile-gc-ruby-head: requires the memory_profiler gem, new location based report
-  pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem).
-  pp=flamegraph&flamegraph_sample_rate=1: creates a flamegraph with the specified sample rate (in ms). Overrides value set in config
-  pp=flamegraph_embed: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem), embedded resources for use on an intranet.
-  pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
+    def make_link(postfix, env)
+      link = env["PATH_INFO"] + "?" + env["QUERY_STRING"].sub("pp=help", "pp=#{postfix}")
+      "pp=<a href='#{link}'>#{postfix}</a>"
+    end
+
+    def help(client_settings, env)
+      headers = {'Content-Type' => 'text/html'}
+      body = "<html><body>
+<pre style='line-height: 30px; font-size: 16px;'>
+Append the following to your query string:
+
+  #{make_link "help", env} : display this screen
+  #{make_link "env", env} : display the rack environment
+  #{make_link "skip", env} : skip mini profiler for this request
+  #{make_link "no-backtrace", env} #{"(*) " if client_settings.backtrace_none?}: don't collect stack traces from all the SQL executed (sticky, use pp=normal-backtrace to enable)
+  #{make_link "normal-backtrace", env} #{"(*) " if client_settings.backtrace_default?}: collect stack traces from all the SQL executed and filter normally
+  #{make_link "full-backtrace", env} #{"(*) " if client_settings.backtrace_full?}: enable full backtraces for SQL executed (use pp=normal-backtrace to disable)
+  #{make_link "disable", env} : disable profiling for this session
+  #{make_link "enable", env} : enable profiling for this session (if previously disabled)
+  #{make_link "profile-gc", env} : perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
+  #{make_link "profile-memory", env} : requires the memory_profiler gem, new location based report
+  #{make_link "flamegraph", env} : works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem).
+  #{make_link "flamegraph&flamegraph_sample_rate=1", env}: creates a flamegraph with the specified sample rate (in ms). Overrides value set in config
+  #{make_link "flamegraph_embed", env} : works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem), embedded resources for use on an intranet.
+  #{make_link "trace-exceptions", env} : requires Ruby 2.0, will return all the spots where your application raises exceptions
+  #{make_link "analyze-memory", env} : requires Ruby 2.0, will perform basic memory analysis of heap
+</pre>
+</body>
+</html>
 "
 
       client_settings.write!(headers)
@@ -501,7 +594,11 @@ 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['SCRIPT_NAME']}#{@config.base_url_path}"
+      path = if env["action_controller.instance"]
+        env["action_controller.instance"].url_for("#{@config.base_url_path}")
+      else
+        "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
+      end
 
       settings = {
        :path            => path,

data/lib/mini_profiler/storage/file_store.rb

@@ -26,8 +26,14 @@ module Rack
         end
 
         private
-        def path(key)
-          @path + "/" + @prefix  + "_" + key
+        if RUBY_PLATFORM =~ /mswin(?!ce)|mingw|cygwin|bccwin/
+          def path(key)
+            @path + "/" + @prefix  + "_" + key.gsub(/:/, '_')
+          end
+        else
+          def path(key)
+            @path + "/" + @prefix  + "_" + key
+          end
         end
       end
 

data/lib/mini_profiler/storage/memcache_store.rb

@@ -9,6 +9,7 @@ module Rack
         require 'dalli' unless defined? Dalli
         args ||= {}
         @prefix             = args[:prefix]     || "MPMemcacheStore"
+        @prefix             += "-#{Rack::MiniProfiler::VERSION}"
         @client             = args[:client]     || Dalli::Client.new
         @expires_in_seconds = args[:expires_in] || EXPIRES_IN_SECONDS
       end

data/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.9.3'
+    VERSION = '0.9.8'
   end
 end

data/lib/mini_profiler_rails/railtie.rb

@@ -9,7 +9,12 @@ module Rack::MiniProfilerRails
       
     c = Rack::MiniProfiler.config
 
-    # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
+    # By default, only show the MiniProfiler in development mode.
+    # To use the MiniProfiler in production, call Rack::MiniProfiler.authorize_request
+    # from a hook in your ApplicationController
+    #
+    # Example:
+    #   before_action { Rack::MiniProfiler.authorize_request if current_user.is_admin? }
     #
     # NOTE: this must be set here with = and not ||=
     #  The out of the box default is "true"
@@ -19,8 +24,9 @@ module Rack::MiniProfilerRails
 
     c.skip_paths ||= []
 
+    c.skip_paths << app.config.assets.prefix if serves_static_assets?(app)
+
     if Rails.env.development?
-      c.skip_paths << app.config.assets.prefix if app.respond_to? :assets
       c.skip_schema_queries = true
     end
 
@@ -59,6 +65,16 @@ module Rack::MiniProfilerRails
     @already_initialized = true
   end
 
+  def self.serves_static_assets?(app)
+    return false if !app.respond_to?(:assets)
+    # Rails 4.2 deprecates serve_static_assets in favor of serve_static_files
+    if app.config.respond_to?(:serve_static_files)
+      app.config.serve_static_files
+    else
+      app.config.serve_static_assets
+    end
+  end
+
   class Railtie < ::Rails::Railtie
 
     initializer "rack_mini_profiler.configure_rails_initialization" do |app|

data/lib/patches/db/mongo.rb

@@ -0,0 +1,12 @@
+# Mongo/Mongoid 5 patches
+class Mongo::Server::Connection
+  def dispatch_with_timing(*args, &blk)
+    return dispatch_without_timing(*args, &blk) unless SqlPatches.should_measure?
+
+    result, _record = SqlPatches.record_sql(args[0][0].payload.inspect) do
+      dispatch_without_timing(*args, &blk)
+    end
+    return result
+  end
+  alias_method_chain :dispatch, :timing
+end

data/lib/patches/db/nobrainer.rb

@@ -0,0 +1,29 @@
+class Rack::MiniProfiler::NoBrainerProfiler
+
+  def on_query(env)
+    if SqlPatches.should_measure?
+      not_indexed = env[:criteria] && env[:criteria].where_present? &&
+                        !env[:criteria].where_indexed? &&
+                        !env[:criteria].model.try(:perf_warnings_disabled)
+
+      query = ""
+
+      # per-model/query database overrides
+      query << "[#{env[:options][:db]}] " if env[:options][:db]
+
+      # "read", "write" prefix
+      # query << "(#{NoBrainer::RQL.type_of(env[:query]).to_s}) "
+
+      query << "NOT USING INDEX: " if not_indexed
+      query << env[:query].inspect.gsub(/\n/, '').gsub(/ +/, ' ') + " "
+
+      if env[:exception]
+        query << "exception: #{env[:exception].class} #{env[:exception].message.split("\n").first} "
+      end
+
+      ::Rack::MiniProfiler.record_sql query.strip, env[:duration] * 1000.0
+    end
+  end
+
+  NoBrainer::Profiler.register self.new
+end

data/lib/patches/db/oracle_enhanced.rb

@@ -0,0 +1,70 @@
+class ActiveRecord::Result
+  alias_method :each_without_profiling, :each
+  def each(&blk)
+    return each_without_profiling(&blk) unless @miniprofiler_sql_id
+
+    start        = Time.now
+    result       = each_without_profiling(&blk)
+    elapsed_time = SqlPatches.elapsed_time(start)
+    @miniprofiler_sql_id.report_reader_duration(elapsed_time)
+
+    result
+  end
+end
+
+class ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
+  SCHEMA_QUERY_TYPES = ["Sequence", "Primary Key", "Primary Key Trigger", nil].freeze
+
+  alias_method :execute_without_profiling, :execute
+  def execute(sql, name = nil)
+    mp_profile_sql(sql, name) { execute_without_profiling(sql, name) }
+  end
+
+  alias_method :exec_query_without_profiling, :exec_query
+  def exec_query(sql, name = 'SQL', binds = [])
+    mp_profile_sql(sql, name) { exec_query_without_profiling(sql, name, binds) }
+  end
+
+  alias_method :exec_insert_without_profiling, :exec_insert
+  def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
+    mp_profile_sql(sql, name) { exec_insert_without_profiling(sql, name, binds, pk, sequence_name) }
+  end
+
+  alias_method :exec_update_without_profiling, :exec_update
+  def exec_update(sql, name, binds)
+    mp_profile_sql(sql, name) { exec_update_without_profiling(sql, name, binds) }
+  end
+
+  # See oracle-enhanced/lib/active_record/connection_adapters/oracle_enhanced_database_statements.rb:183
+  # where the exec delete method is aliased in the same way. We just have to do it again here to make sure
+  # the new exec_delete alias is linked to our profiling-enabled version.
+  alias :exec_delete :exec_update
+
+  private
+
+  def mp_profile_sql(sql, name, &blk)
+    return yield unless mp_should_measure?(name)
+
+    start        = Time.now
+    result       = yield
+    elapsed_time = SqlPatches.elapsed_time(start)
+    record       = ::Rack::MiniProfiler.record_sql(sql, elapsed_time)
+
+    # Some queries return the row count as a Fixnum and will be frozen, don't save a record
+    # for those.
+    result.instance_variable_set("@miniprofiler_sql_id", record) if (result && !result.frozen?)
+
+    result
+  end
+
+  # Only measure when profiling is enabled
+  # When skip_schema_queries is set to true, it will ignore any query of the types
+  # in the schema_query_types array
+  def mp_should_measure?(name)
+    return false unless SqlPatches.should_measure?
+
+    !(Rack::MiniProfiler.config.skip_schema_queries && SCHEMA_QUERY_TYPES.include?(name))
+  end
+end
+
+SqlPatches.patched = true

data/lib/patches/sql_patches.rb

@@ -14,6 +14,12 @@ class SqlPatches
     false
   end
 
+  def self.correct_version?(required_version, klass)
+    Gem::Dependency.new('', required_version).match?('', klass::VERSION)
+  rescue NameError
+    false
+  end
+
   def self.module_exists?(name)
     eval(name + ".class").to_s.eql?('Module')
   rescue NameError
@@ -37,10 +43,13 @@ class SqlPatches
   end
 end
 
-require 'patches/db/mysql2'         if SqlPatches.class_exists? "Mysql2::Client"
-require 'patches/db/pg'             if SqlPatches.class_exists? "PG::Result"
-require 'patches/db/moped'          if SqlPatches.class_exists?("Moped::Node")
-require 'patches/db/plucky'         if SqlPatches.class_exists?("Plucky::Query")
-require 'patches/db/rsolr'          if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0"
-require 'patches/db/sequel'         if !SqlPatches.patched? && SqlPatches.class_exists?("Sequel::Database")
-require 'patches/db/activerecord'   if !SqlPatches.patched? && SqlPatches.module_exists?("ActiveRecord")
+require 'patches/db/mysql2'           if defined?(Mysql2::Client) && SqlPatches.class_exists?("Mysql2::Client")
+require 'patches/db/pg'               if defined?(PG::Result) && SqlPatches.class_exists?("PG::Result")
+require 'patches/db/oracle_enhanced'  if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) && SqlPatches.class_exists?("ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter") && SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+require 'patches/db/mongo'            if defined?(Mongo) &&!SqlPatches.patched? && SqlPatches.module_exists?("Mongo")
+require 'patches/db/moped'            if defined?(Moped::Node) && SqlPatches.class_exists?("Moped::Node")
+require 'patches/db/plucky'           if defined?(Plucky::Query) && SqlPatches.class_exists?("Plucky::Query")
+require 'patches/db/rsolr'            if defined?(RSolr::Connection) && SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0"
+require 'patches/db/sequel'           if defined?(Sequel::Database) && !SqlPatches.patched? && SqlPatches.class_exists?("Sequel::Database")
+require 'patches/db/activerecord'     if defined?(ActiveRecord) &&!SqlPatches.patched? && SqlPatches.module_exists?("ActiveRecord")
+require 'patches/db/nobrainer'        if defined?(NoBrainer) && SqlPatches.module_exists?("NoBrainer")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -223,8 +223,11 @@ files:
 - lib/mini_profiler/version.rb
 - lib/mini_profiler_rails/railtie.rb
 - lib/patches/db/activerecord.rb
+- lib/patches/db/mongo.rb
 - lib/patches/db/moped.rb
 - lib/patches/db/mysql2.rb
+- lib/patches/db/nobrainer.rb
+- lib/patches/db/oracle_enhanced.rb
 - lib/patches/db/pg.rb
 - lib/patches/db/plucky.rb
 - lib/patches/db/rsolr.rb
@@ -253,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.