rack-mini-profiler 0.1.21 → 0.1.22

data/{CHANGELOG → Ruby/CHANGELOG}

@@ -97,3 +97,11 @@
   * 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/{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/{lib → Ruby/lib}/mini_profiler/gc_profiler.rb

@@ -3,10 +3,12 @@ class Rack::MiniProfiler::GCProfiler
   def object_space_stats
     stats = {}
     ids = Set.new
+    i=0
     ObjectSpace.each_object { |o|
-      stats[o.class] ||= 1
-      stats[o.class] += 1
-      ids << o.object_id
+      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
@@ -35,24 +37,42 @@ class Rack::MiniProfiler::GCProfiler
     result
   end
 
-  def profile_gc(app,env)
-    
-    body = [];
+  def profile_gc_time(app,env)
+    body = []
 
-    stat_after = nil
-    stat_before = object_space_stats
     begin
       GC::Profiler.clear
       GC::Profiler.enable
       b = app.call(env)[2]
       b.close if b.respond_to? :close
-      stat_after = object_space_stats
+      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
 
-    diff = diff_object_stats(stat_before[:stats],stat_after[:stats])
+    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:
@@ -69,13 +89,12 @@ ObjectSpace stats:
       body << "#{k} : #{v}\n" 
     end
 
-    r = analyze_strings(stat_before[:ids], stat_after[:ids])
 
     body << "\n
 String stats:
 ------------\n"
 
-    r.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
+    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
       body << "#{count} : #{string}\n"
     end
 

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

@@ -21,7 +21,8 @@ module Rack
 
 	class MiniProfiler
 
-		VERSION = '107'.freeze
+    # we really should add a cleaner way to version JS and includes
+		VERSION = '108'.freeze
 
     class << self 
       
@@ -211,9 +212,19 @@ module Rack
       end
 
       if query_string =~ /pp=profile-gc/
-        return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
+        # 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/
@@ -391,7 +402,8 @@ 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 (ruby 1.9.3 only)
+  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)
 "
     
       client_settings.write!(headers)

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.21"
+	s.version = "0.1.22"
 	s.summary = "Profiles loading speed for rack applications."
 	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."
@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
 	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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -83,48 +83,48 @@ 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/gc_profiler.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/mini_profiler/storage/memcache_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:
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -668836557
+      hash: -138209491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -668836557
+      hash: -138209491
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24