rack-mini-profiler 0.1.17 → 0.1.22

data/{CHANGELOG → Ruby/CHANGELOG}

@@ -1,83 +1,107 @@
-28-June-2012 - Sam  
- 
-  * Started change log
-  * Corrected profiler so it properly captures POST requests (was supressing non 200s)
-  * Amended Rack.MiniProfiler.config[:user_provider] to use ip addres for identity 
-  * Fixed bug where unviewed missing ids never got cleared
-  * Supress all '/assets/' in the rails tie (makes debugging easier)
-  * record_sql was mega buggy
-
-9-July-2012 - Sam 
-
-  * Cleaned up mechanism for profiling in production, all you need to do now
-	is call Rack::MiniProfiler.authorize_request to get profiling working in
-	production 
-	* Added option to display full backtraces pp=full-backtrace
-	* Cleaned up railties, got rid of the post authorize callback
-	* Version 0.1.3
-
-12-July-2012 - Sam 
-
-  * Fixed incorrect profiling steps (was not indenting or measuring start time right
-	* Implemented native PG and MySql2 interceptors, this gives way more accurate times
-	* Refactored context so its a proper class and not a hash 
-	* Added some more client probing built in to rails
-	* More tests
-
-18-July-2012 - Sam 
-  
-  * Added First Paint time for chrome
-  * Bug fix to ensure non Rails installs have mini profiler
-  * Version 0.1.7
-
-30-July-2012 - Sam 
-  
-  * Made compliant with ancient versions of Rack (including Rack used by Rails2)
-  * Fixed broken share link 
-  * Fixed crashes on startup (in MemoryStore and FileStore)
-  * Version 0.1.8
-  * Unicode fix 
-  * Version 0.1.9
-
-7-August-2012 - Sam
-
-  * Added option to disable profiler for the current session (pp=disable / pp=enable)
-  * yajl compatability contributed by Sven Riedel 
-
-10-August-2012 - Sam 
-
-  * Added basic prepared statement profiling for postgres 
-
-20-August-2012 - Sam 
-  
-  * 1.12.pre 
-  * Cap X-MiniProfiler-Ids at 10, otherwise the header can get killed
-
-3-September-2012 - Sam
-
-  * 1.13.pre
-  * pg gem prepared statements were not being logged correctly 
-  * added setting config.backtrace_ignores = [] - an array of regexes that match on caller lines that get ignored
-  * added setting config.backtrace_includes = [] - an array of regexes that get included in the trace by default 
-  * cleaned up the way client settings are stored
-  * made pp=full-backtrace "sticky"
-  * added pp=normal-backtrace to clear the "sticky" state
-  * change "pp=sample" to work with "caller" no need for stack trace gem
-
-4-September-2012 - Sam 
-
-  * 1.15.pre
-  * fixed annoying bug where client settings were not sticking 
-  * fixed long standing issue with Rack::ConditionalGet stopping MiniProfiler from working properly
-
-5-September-2012 - Sam 
-
-  * 1.16
-  * fixed long standing problem specs (issue with memory store)
-  * fixed issue where profiler would be dumped when you got a 404 in production (and any time rails is bypassed)
-  * implemented stacktrace properly
-
-9-September-2012 - Sam
-
-  * 1.17
-  * pp=sample was bust unless stacktrace was installed
+28-June-2012 - Sam  
+ 
+  * Started change log
+  * Corrected profiler so it properly captures POST requests (was supressing non 200s)
+  * Amended Rack.MiniProfiler.config[:user_provider] to use ip addres for identity 
+  * Fixed bug where unviewed missing ids never got cleared
+  * Supress all '/assets/' in the rails tie (makes debugging easier)
+  * record_sql was mega buggy
+  * added MemcacheStore
+
+9-July-2012 - Sam 
+
+  * Cleaned up mechanism for profiling in production, all you need to do now
+	is call Rack::MiniProfiler.authorize_request to get profiling working in
+	production 
+	* Added option to display full backtraces pp=full-backtrace
+	* Cleaned up railties, got rid of the post authorize callback
+	* Version 0.1.3
+
+12-July-2012 - Sam 
+
+  * Fixed incorrect profiling steps (was not indenting or measuring start time right
+	* Implemented native PG and MySql2 interceptors, this gives way more accurate times
+	* Refactored context so its a proper class and not a hash 
+	* Added some more client probing built in to rails
+	* More tests
+
+18-July-2012 - Sam 
+  
+  * Added First Paint time for chrome
+  * Bug fix to ensure non Rails installs have mini profiler
+  * Version 0.1.7
+
+30-July-2012 - Sam 
+  
+  * Made compliant with ancient versions of Rack (including Rack used by Rails2)
+  * Fixed broken share link 
+  * Fixed crashes on startup (in MemoryStore and FileStore)
+  * Version 0.1.8
+  * Unicode fix 
+  * Version 0.1.9
+
+7-August-2012 - Sam
+
+  * Added option to disable profiler for the current session (pp=disable / pp=enable)
+  * yajl compatability contributed by Sven Riedel 
+
+10-August-2012 - Sam 
+
+  * Added basic prepared statement profiling for postgres 
+
+20-August-2012 - Sam 
+  
+  * 1.12.pre 
+  * Cap X-MiniProfiler-Ids at 10, otherwise the header can get killed
+
+3-September-2012 - Sam
+
+  * 1.13.pre
+  * pg gem prepared statements were not being logged correctly 
+  * added setting config.backtrace_ignores = [] - an array of regexes that match on caller lines that get ignored
+  * added setting config.backtrace_includes = [] - an array of regexes that get included in the trace by default 
+  * cleaned up the way client settings are stored
+  * made pp=full-backtrace "sticky"
+  * added pp=normal-backtrace to clear the "sticky" state
+  * change "pp=sample" to work with "caller" no need for stack trace gem
+
+4-September-2012 - Sam 
+
+  * 1.15.pre
+  * fixed annoying bug where client settings were not sticking 
+  * fixed long standing issue with Rack::ConditionalGet stopping MiniProfiler from working properly
+
+5-September-2012 - Sam 
+
+  * 1.16
+  * fixed long standing problem specs (issue with memory store)
+  * fixed issue where profiler would be dumped when you got a 404 in production (and any time rails is bypassed)
+  * implemented stacktrace properly
+
+9-September-2012 - Sam
+
+  * 1.17
+  * pp=sample was bust unless stacktrace was installed
+
+10-September-2012 - Sam 
+
+  * 1.19
+  * fix compat issue with 1.8.7
+
+12-September-2012 - Sam
+  
+  * 1.20
+  * Added pp=profile-gc , it allows you to profile the GC in Ruby 1.9.3
+
+17-September-2012
+  * 1.21
+  * New MemchacedStore 
+  * Rails 4 support
+
+17-September-2012
+  * Allow rack-mini-profiler to be sourced from github
+  * Extracted the pp=profile-gc-time out, the object space profiler needs to disable gc
+
+20-September-2010
+  * 1.22
+  * Fix permission issue in the gem

data/{README.md → Ruby/README.md}

@@ -56,7 +56,7 @@ By default, rack-mini-profiler stores its results in a memory store:
 Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
 ```
 
-There are 2 other available storage engines, `RedisStore` and `FileStore`. 
+There are 2 other available storage engines, `RedisStore`, `MemcacheStore`, and `FileStore`.
 
 MemoryStore is stores results in a processes heap - something that does not work well in a multi process environment. 
 FileStore stores results in the file system - something that may not work well in a multi machine environment. 

data/{lib → Ruby/lib}/html/includes.js

@@ -449,11 +449,12 @@ var MiniProfiler = (function ($) {
         };
 
         // fetch profile results for any ajax calls
+        // note, this does not use $ cause we want to hook into the main jQuery
         if (jQuery && jQuery(document) && jQuery(document).ajaxComplete) {
             jQuery(document).ajaxComplete(jQueryAjaxComplete);
         }
 
-        if (jQuery(document).ajaxStart)
+        if (jQuery && jQuery(document).ajaxStart)
             jQuery(document).ajaxStart(function () { ajaxStartTime = new Date(); });
         
         // fetch results after ASP Ajax calls

data/Ruby/lib/mini_profiler/gc_profiler.rb

@@ -0,0 +1,103 @@
+class Rack::MiniProfiler::GCProfiler
+  
+  def object_space_stats
+    stats = {}
+    ids = Set.new
+    i=0
+    ObjectSpace.each_object { |o|
+      i = stats[o.class] || 0
+      i += 1
+      stats[o.class] = i
+      ids << o.object_id if Integer === o.object_id 
+    }
+    {:stats => stats, :ids => ids}
+  end
+
+  def diff_object_stats(before,after)
+    diff = {}
+    after.each do |k,v|
+      diff[k] = v - (before[k] || 0)
+    end
+    before.each do |k,v|
+      diff[k] = 0 - v unless after[k]
+    end
+
+    diff
+  end
+
+  def analyze_strings(ids_before,ids_after)
+    result = {}
+    ids_after.each do |id|
+      obj = ObjectSpace._id2ref(id)
+      if String === obj && !ids_before.include?(obj.object_id) 
+        result[obj] ||= 0 
+        result[obj] += 1
+      end
+    end
+    result
+  end
+
+  def profile_gc_time(app,env)
+    body = []
+
+    begin
+      GC::Profiler.clear
+      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
+      GC.enable
+      GC::Profiler.disable
+    end
+
+    return [200, {'Content-Type' => 'text/plain'}, body]
+  end
+
+  def profile_gc(app,env)
+    
+    body = [];
+
+    stat_before,stat_after,diff,string_analysis = nil
+    begin
+      GC.disable
+      stat_before = object_space_stats
+      b = app.call(env)[2]
+      b.close if b.respond_to? :close
+      stat_after = object_space_stats
+      
+      diff = diff_object_stats(stat_before[:stats],stat_after[:stats])
+      string_analysis = analyze_strings(stat_before[:ids], stat_after[:ids])
+    ensure
+      GC.enable
+    end
+
+
+    body << "
+ObjectSpace delta caused by request:
+--------------------------------------------\n"
+    diff.to_a.reject{|k,v| v == 0}.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
+      body << "#{k} : #{v}\n" if v != 0
+    end
+
+    body << "\n
+ObjectSpace stats:
+-----------------\n"
+
+    stat_after[:stats].to_a.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
+      body << "#{k} : #{v}\n" 
+    end
+
+
+    body << "\n
+String stats:
+------------\n"
+
+    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
+      body << "#{count} : #{string}\n"
+    end
+
+    return [200, {'Content-Type' => 'text/plain'}, body]
+  end
+end

data/{lib → Ruby/lib}/mini_profiler/profiler.rb

@@ -7,6 +7,7 @@ require 'mini_profiler/sql_timer_struct'
 require 'mini_profiler/client_timer_struct'
 require 'mini_profiler/request_timer_struct'
 require 'mini_profiler/storage/abstract_store'
+require 'mini_profiler/storage/memcache_store'
 require 'mini_profiler/storage/memory_store'
 require 'mini_profiler/storage/redis_store'
 require 'mini_profiler/storage/file_store'
@@ -14,12 +15,14 @@ require 'mini_profiler/config'
 require 'mini_profiler/profiling_methods'
 require 'mini_profiler/context'
 require 'mini_profiler/client_settings'
+require 'mini_profiler/gc_profiler'
 
 module Rack
 
 	class MiniProfiler
 
-		VERSION = '107'.freeze
+    # we really should add a cleaner way to version JS and includes
+		VERSION = '108'.freeze
 
     class << self 
       
@@ -208,6 +211,20 @@ module Rack
         return [status,headers,body]
       end
 
+      if query_string =~ /pp=profile-gc/
+        # begin
+          if query_string =~ /pp=profile-gc-time/
+            return Rack::MiniProfiler::GCProfiler.new.profile_gc_time(@app, env)
+          else
+            return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
+          end
+        # rescue => e
+        #   p e
+        #   e.backtrace.each do |s|
+        #     puts s
+        #   end
+        # end
+      end
       MiniProfiler.create_current(env, @config)
       MiniProfiler.deauthorize_request if @config.authorization_mode == :whitelist
       if query_string =~ /pp=normal-backtrace/
@@ -295,7 +312,7 @@ module Rack
 
       if query_string =~ /pp=help/
         body.close if body.respond_to? :close
-        return help(nil, client_settings)
+        return help(client_settings)
       end
       
       page_struct = current.page_struct
@@ -372,7 +389,7 @@ module Rack
       [200, headers, [body]]
     end
 
-    def help(category = nil, client_settings)
+    def help(client_settings)
       headers = {'Content-Type' => 'text/plain'}
       body = "Append the following to your query string:
 
@@ -385,10 +402,9 @@ module Rack
   pp=sample : sample stack traces and return a report isolating heavy usage (experimental works best with the stacktrace gem)
   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)
 "
-      if (category == :stacktrace)
-        body = "pp=stacktrace requires the stacktrace gem - add gem 'stacktrace' to your Gemfile"
-      end
     
       client_settings.write!(headers)
       [200, headers, [body]]

data/{lib → Ruby/lib}/mini_profiler/profiling_methods.rb

@@ -8,6 +8,22 @@ module Rack
 			  c.current_timer.add_sql(query, elapsed_ms, c.page_struct, c.skip_backtrace, c.full_backtrace) if (c && c.current_timer)
 		  end
 
+      def start_step(name)
+        if current
+          parent_timer = current.current_timer
+          current.current_timer = current_timer = current.current_timer.add_child(name)
+          [current_timer,parent_timer]
+        end
+      end
+
+      def finish_step(obj)
+        if obj && current
+          current_timer, parent_timer = obj
+          current_timer.record_time
+          current.current_timer = parent_timer
+        end
+      end
+
       # perform a profiling step on given block
       def step(name, opts = nil)
         if current
@@ -55,8 +71,16 @@ module Rack
           return self.send without_profiling, *args, &orig unless Rack::MiniProfiler.current
 
           name = default_name 
-          name = blk.bind(self).call(*args) if blk
-          
+          if blk
+            name =
+              if respond_to?(:instance_exec)
+                instance_exec(*args, &blk)
+              else
+                # deprecated in Rails 4.x
+                blk.bind(self).call(*args)
+              end
+          end
+
           parent_timer = Rack::MiniProfiler.current.current_timer
           page_struct = Rack::MiniProfiler.current.page_struct
           result = nil

data/Ruby/lib/mini_profiler/storage/memcache_store.rb

@@ -0,0 +1,51 @@
+module Rack
+  class MiniProfiler
+    class MemcacheStore < AbstractStore
+
+      EXPIRE_SECONDS = 60*60*24
+      MAX_RETRIES = 10
+
+      def initialize(client = nil, prefix = "MPMemcacheStore")
+        require 'dalli' unless defined? Dalli
+        @prefix = prefix
+        @client = client || Dalli::Client.new(['localhost:11211'])
+      end
+
+      def save(page_struct)
+        @client.set("#{@prefix}#{page_struct['Id']}", Marshal::dump(page_struct), EXPIRE_SECONDS)
+      end
+
+      def load(id)
+        raw = @client.get("#{@prefix}#{id}")
+        if raw
+          Marshal::load raw
+        end
+      end
+
+      def set_unviewed(user, id)
+        @client.add("#{@prefix}-#{user}-v", [], EXPIRE_SECONDS)
+        MAX_RETRIES.times do
+          break if @client.cas("#{@prefix}-#{user}-v", EXPIRE_SECONDS) do |ids|
+            ids << id unless ids.include?(id)
+            ids
+          end
+        end
+      end
+
+      def set_viewed(user, id)
+        @client.add("#{@prefix}-#{user}-v", [], EXPIRE_SECONDS)
+        MAX_RETRIES.times do
+          break if @client.cas("#{@prefix}-#{user}-v", EXPIRE_SECONDS) do |ids|
+            ids.delete id
+            ids
+          end
+        end
+      end
+
+      def get_unviewed_ids(user)
+        @client.get("#{@prefix}-#{user}-v") || []
+      end
+
+    end
+  end
+end

data/{lib → Ruby/lib}/mini_profiler_rails/railtie.rb

@@ -12,8 +12,9 @@ module MiniProfilerRails
         Rails.env.development? || Rails.env.production?  
       }
 
+      c.skip_paths ||= []
+
       if Rails.env.development?
-        c.skip_paths ||= []
         c.skip_paths << "/assets/"
         c.skip_schema_queries = true
       end

data/{lib → Ruby/lib}/rack-mini-profiler.rb

@@ -1,6 +1,6 @@
 require 'mini_profiler/profiler'
 require 'patches/sql_patches'
 
-if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
+if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
   require 'mini_profiler_rails/railtie'
 end

data/rack-mini-profiler.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.17"
+	s.version = "0.1.22"
 	s.summary = "Profiles loading speed for rack applications."
-	s.authors = ["Aleks Totic","Sam Saffron", "Robin Ward"]
-	s.description = "Page loading speed displayed on every page. Optimize while you develop, performance is a feature."
+	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.files = [
 		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
 	s.extra_rdoc_files = [
-		"README.md",
-    "CHANGELOG"
+		"Ruby/README.md",
+    "Ruby/CHANGELOG"
 	]
 	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
+
+  s.require_paths = ["Ruby/lib"]
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
-- Aleks Totic
 - Sam Saffron
 - Robin Ward
+- Aleks Totic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -77,52 +77,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Page loading speed displayed on every page. Optimize while you develop,
-  performance is a feature.
+description: Profiling toolkit for Rack applications with Rails integration. Client
+  Side profiling, DB profiling and Server profiling.
 email: sam.saffron@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
-- CHANGELOG
+- Ruby/README.md
+- Ruby/CHANGELOG
 files:
 - rack-mini-profiler.gemspec
-- lib/mini_profiler/sql_timer_struct.rb
-- lib/mini_profiler/request_timer_struct.rb
-- lib/mini_profiler/timer_struct.rb
-- lib/mini_profiler/page_timer_struct.rb
-- lib/mini_profiler/client_settings.rb
-- lib/mini_profiler/context.rb
-- lib/mini_profiler/config.rb
-- lib/mini_profiler/profiling_methods.rb
-- lib/mini_profiler/client_timer_struct.rb
-- lib/mini_profiler/profiler.rb
-- lib/mini_profiler/storage/memory_store.rb
-- lib/mini_profiler/storage/file_store.rb
-- lib/mini_profiler/storage/redis_store.rb
-- lib/mini_profiler/storage/abstract_store.rb
-- lib/rack-mini-profiler.rb
-- lib/html/jquery.1.7.1.js
-- lib/html/includes.tmpl
-- lib/html/share.html
-- lib/html/includes.less
-- lib/html/list.css
-- lib/html/includes.js
-- lib/html/jquery.tmpl.js
-- lib/html/list.tmpl
-- lib/html/profile_handler.js
-- lib/html/includes.css
-- lib/html/list.js
-- lib/mini_profiler_rails/railtie.rb
-- lib/patches/sql_patches.rb
-- README.md
-- CHANGELOG
+- Ruby/lib/mini_profiler/sql_timer_struct.rb
+- Ruby/lib/mini_profiler/request_timer_struct.rb
+- Ruby/lib/mini_profiler/timer_struct.rb
+- Ruby/lib/mini_profiler/page_timer_struct.rb
+- Ruby/lib/mini_profiler/client_settings.rb
+- Ruby/lib/mini_profiler/context.rb
+- Ruby/lib/mini_profiler/config.rb
+- Ruby/lib/mini_profiler/profiling_methods.rb
+- Ruby/lib/mini_profiler/gc_profiler.rb
+- Ruby/lib/mini_profiler/client_timer_struct.rb
+- Ruby/lib/mini_profiler/profiler.rb
+- Ruby/lib/mini_profiler/storage/memory_store.rb
+- Ruby/lib/mini_profiler/storage/file_store.rb
+- Ruby/lib/mini_profiler/storage/redis_store.rb
+- Ruby/lib/mini_profiler/storage/abstract_store.rb
+- Ruby/lib/mini_profiler/storage/memcache_store.rb
+- Ruby/lib/rack-mini-profiler.rb
+- Ruby/lib/html/jquery.1.7.1.js
+- Ruby/lib/html/includes.tmpl
+- Ruby/lib/html/share.html
+- Ruby/lib/html/includes.less
+- Ruby/lib/html/list.css
+- Ruby/lib/html/includes.js
+- Ruby/lib/html/jquery.tmpl.js
+- Ruby/lib/html/list.tmpl
+- Ruby/lib/html/profile_handler.js
+- Ruby/lib/html/includes.css
+- Ruby/lib/html/list.js
+- Ruby/lib/mini_profiler_rails/railtie.rb
+- Ruby/lib/patches/sql_patches.rb
+- Ruby/README.md
+- Ruby/CHANGELOG
 homepage: http://miniprofiler.com
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- Ruby/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 899780701
+      hash: -138209491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 899780701
+      hash: -138209491
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24