rack-mini-profiler 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915cfa4f71cab960c3f73128fa213cce013f0b65
-  data.tar.gz: 3465e843ef28ed50178f1f76255de96b474903f6
+  metadata.gz: 6f6c4ad1e41a0b8cf00506f6c3d732a0a8ea2dc1
+  data.tar.gz: 0a4e5b357dd0473b157ba8728c069cd165fbb99f
 SHA512:
-  metadata.gz: 7c232ba029fb050b15d6b4cdb08b9dc3a6079ed723c06beb7b99dcbc7b6d009822aa2686895661a8e57497a0c5e529a691bf7507c0a895639be9b0e0346ddf29
-  data.tar.gz: 45b90274fd6828441a1a4ca14017a6d3b1f1292b65c157dbd03964748b7fd648b39f06484b36d56fd0340b52498bd9c8b0242fe6063e6e23dd115d4b99c10040
+  metadata.gz: 91b62e7d1beec331e6d104bbf3efe4b2e267c1d93e83166d3289d15798e3a777f847e8f7a0d49f138098e3fea075dcc771b13691534087c6911cf08072e157ee
+  data.tar.gz: 81115816fa927e35361804b8e8ef79148d39283cbf7b7609020dd993b811e7af4972f38b5c00d75a04f01eb3a3c1e33a2e0a3e5fbe74370efccd25694f069257

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # CHANGELOG
+## 0.9.4 - 2014-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

@@ -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.
 
@@ -184,7 +183,7 @@ The available configuration options are:
 * 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.
+* 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

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/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?
@@ -304,9 +307,14 @@ module Rack
         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
@@ -446,30 +454,79 @@ 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'
+
+      body = "ObjectSpace stats:\n\n"
+
+      body << ObjectSpace.count_objects
+        .sort{|a,b| b[1] <=> a[1]}
+        .map{|k,v| "#{k}: #{v}"}
+        .join("\n")
+
+      body << "\n\n\n1000 Largest strings:\n\n"
+
+      strings = []
+      max_size = 1000
+
+      GC.start
+      GC.start
+
+      ObjectSpace.each_object(String) do |str|
+        strings << [str[0..200], str.length]
+        if strings.length > max_size * 2
+          trim_strings(strings, max_size)
+        end
+      end
+
+      trim_strings(strings, max_size)
+
+      body << strings.map{|s,len| "#{s}\n(#{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-gc-time", env} : perform built-in gc profiling on this request (ruby 1.9.3 only)
+  #{make_link "profile-gc-ruby-head", 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 execptions
+  #{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 +558,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['SCRIPT_NAME']}#{@config.base_url_path}"
+      path     = "#{env['RACK_MINI_PROFILER_ORIGINAL_SCRIPT_NAME']}#{@config.base_url_path}"
 
       settings = {
        :path            => path,

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.4'
   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"

data/lib/patches/sql_patches.rb

@@ -37,10 +37,10 @@ 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/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")

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.4
 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-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.