rack-mini-profiler 0.1.28 → 0.9.0

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

@@ -55,8 +55,16 @@ module Rack
         end
       end
 
-      def profile_method(klass, method, &blk)
-        default_name = klass.to_s + " " + method.to_s
+      def counter_method(klass, method, &blk)
+        self.profile_method(klass, method, :counter, &blk)
+      end
+
+      def uncounter_method(klass, method)
+        self.unprofile_method(klass, method)
+      end
+
+      def profile_method(klass, method, type = :profile, &blk)
+        default_name = type==:counter ? method.to_s  : klass.to_s + " " + method.to_s
         clean = clean_method_name(method)
 
         with_profiling =  ("#{clean}_with_mini_profiler").intern
@@ -81,22 +89,34 @@ module Rack
               end
           end
 
-          parent_timer = Rack::MiniProfiler.current.current_timer
-          page_struct = Rack::MiniProfiler.current.page_struct
           result = nil
+          parent_timer = Rack::MiniProfiler.current.current_timer
 
-          Rack::MiniProfiler.current.current_timer = current_timer = parent_timer.add_child(name)
-          begin
-            result = self.send without_profiling, *args, &orig
-          ensure
-            current_timer.record_time
-            Rack::MiniProfiler.current.current_timer = parent_timer
+          if type == :counter
+            start = Time.now
+            begin
+              result = self.send without_profiling, *args, &orig
+            ensure
+              duration_ms = (Time.now - start).to_f * 1000
+              parent_timer.add_custom(name, duration_ms, Rack::MiniProfiler.current.page_struct )
+            end
+          else
+            page_struct = Rack::MiniProfiler.current.page_struct
+
+            Rack::MiniProfiler.current.current_timer = current_timer = parent_timer.add_child(name)
+            begin
+              result = self.send without_profiling, *args, &orig
+            ensure
+              current_timer.record_time
+              Rack::MiniProfiler.current.current_timer = parent_timer
+            end
           end
+
           result
         end
         klass.send :alias_method, method, with_profiling
       end
-      
+
       # Add a custom timing. These are displayed similar to SQL/query time in
       # columns expanding to the right.
       #

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

@@ -4,7 +4,7 @@ module Rack
   class MiniProfiler
 
     class RequestTimerStruct < TimerStruct
-      
+
       def self.createRoot(name, page)
         rt = RequestTimerStruct.new(name, page, nil)
         rt["IsRoot"]= true
@@ -77,7 +77,7 @@ module Rack
         self['SqlTimings'].push(timer)
         self['HasSqlTimings'] = true
         self['SqlTimingsDurationMilliseconds'] += elapsed_ms
-        page['DurationMillisecondsInSql'] += elapsed_ms        
+        page['DurationMillisecondsInSql'] += elapsed_ms
         timer
       end
 
@@ -103,13 +103,13 @@ module Rack
         self['DurationMilliseconds'] = milliseconds
         self['IsTrivial'] = true if milliseconds < self["TrivialDurationThresholdMilliseconds"]
         self['DurationWithoutChildrenMilliseconds'] = milliseconds - @children_duration
-        
+
         if @parent
           @parent.children_duration += milliseconds
         end
 
-      end     
+      end
     end
   end
-  
+
 end

data/{Ruby/lib → lib}/mini_profiler/storage/file_store.rb

@@ -2,6 +2,10 @@ module Rack
   class MiniProfiler
     class FileStore < AbstractStore
 
+      # Sub-class thread so we have a named thread (useful for debugging in Thread.list).
+      class CacheCleanupThread < Thread
+      end
+
       class FileCache
         def initialize(path, prefix)
           @path = path
@@ -40,17 +44,35 @@ module Rack
         @user_view_lock = Mutex.new
 
         me = self
-        Thread.new do
+        t = CacheCleanupThread.new do
+          interval = 10
+          cleanup_cache_cycle = 3600
+          cycle_count = 1
+
           begin
-            while true do
+            until Thread.current[:should_exit] do
               # TODO: a sane retry count before bailing
-              me.cleanup_cache
-              sleep(3600)
+
+              # We don't want to hit the filesystem every 10s to clean up the cache so we need to do a bit of
+              # accounting to avoid sleeping that entire time.  We don't want to sleep for the entire period because
+              # it means the thread will stay live in hot deployment scenarios, keeping a potentially large memory
+              # graph from being garbage collected upon undeploy.
+              if cycle_count * interval >= cleanup_cache_cycle
+                cycle_count = 1
+                me.cleanup_cache
+              end
+
+              sleep(interval)
+              cycle_count += 1
             end
           rescue
             # don't crash the thread, we can clean up next time
           end
         end
+
+        at_exit { t[:should_exit] = true }
+
+        t
       end
 
       def save(page_struct)

data/{Ruby/lib → lib}/mini_profiler/storage/memory_store.rb

@@ -2,6 +2,10 @@ module Rack
   class MiniProfiler
     class MemoryStore < AbstractStore
 
+      # Sub-class thread so we have a named thread (useful for debugging in Thread.list).
+      class CacheCleanupThread < Thread
+      end
+
       EXPIRES_IN_SECONDS = 60 * 60 * 24
 
       def initialize(args = nil)
@@ -14,12 +18,29 @@ module Rack
 
         # TODO: fix it to use weak ref, trouble is may be broken in 1.9 so need to use the 'ref' gem
         me = self
-        Thread.new do
-          while true do
-            me.cleanup_cache
-            sleep(3600)
+        t = CacheCleanupThread.new do
+          interval = 10
+          cleanup_cache_cycle = 3600
+          cycle_count = 1
+
+          until Thread.current[:should_exit] do
+            # We don't want to hit the filesystem every 10s to clean up the cache so we need to do a bit of
+            # accounting to avoid sleeping that entire time.  We don't want to sleep for the entire period because
+            # it means the thread will stay live in hot deployment scenarios, keeping a potentially large memory
+            # graph from being garbage collected upon undeploy.
+            if cycle_count * interval >= cleanup_cache_cycle
+              cycle_count = 1
+              me.cleanup_cache
+            end
+
+            sleep(interval)
+            cycle_count += 1
           end
         end
+
+        at_exit { t[:should_exit] = true }
+
+        t
       end
 
       def save(page_struct)

data/lib/mini_profiler/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class MiniProfiler
+    VERSION = '898a13ca6797c6bc1fee313e17d388b0'.freeze
+  end
+end

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

@@ -7,14 +7,14 @@ 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
-    c.pre_authorize_cb = lambda { |env|
+    c.pre_authorize_cb ||= lambda { |env|
       !Rails.env.test?
     }
 
     c.skip_paths ||= []
 
     if Rails.env.development?
-      c.skip_paths << "/assets/"
+      c.skip_paths << app.config.assets.prefix
       c.skip_schema_queries = true
     end
 
@@ -22,6 +22,10 @@ module Rack::MiniProfilerRails
       c.authorization_mode = :whitelist
     end
 
+    if Rails.logger
+      c.logger = Rails.logger
+    end
+
     # The file store is just so much less flaky
     tmp = Rails.root.to_s + "/tmp/miniprofiler"
     FileUtils.mkdir_p(tmp) unless File.exists?(tmp)

data/{Ruby/lib → lib}/patches/sql_patches.rb

@@ -200,7 +200,7 @@ if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0" #
 
       data = "#{request_context[:method].upcase} #{request_context[:uri]}"
       if request_context[:method] == :post and request_context[:data]
-        if request_context[:headers].include("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
+        if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
           # it's xml, unescaping isn't needed
           data << "\n#{request_context[:data]}"
         else
@@ -222,7 +222,8 @@ if SqlPatches.class_exists?("Sequel::Database") && !SqlPatches.patched?
     class Database
       alias_method :log_duration_original, :log_duration
       def log_duration(duration, message)
-        ::Rack::MiniProfiler.record_sql(message, duration)
+        # `duration` will be in seconds, but we need it in milliseconds for internal consistency.
+        ::Rack::MiniProfiler.record_sql(message, duration * 1000)
         log_duration_original(duration, message)
       end
     end

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.28"
+	s.version = "0.9.0"
 	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."
@@ -9,10 +9,10 @@ Gem::Specification.new do |s|
   s.license = "MIT"
 	s.files = [
 		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+	].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
 	s.extra_rdoc_files = [
-		"Ruby/README.md",
-    "Ruby/CHANGELOG"
+		"README.md",
+    "CHANGELOG"
 	]
 	s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
@@ -22,6 +22,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
+  s.add_development_dependency 'dalli'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'ZenTest'
+  s.add_development_dependency 'autotest'
+  s.add_development_dependency 'redis'
+  s.add_development_dependency 'therubyracer'
+  s.add_development_dependency 'less'
+  s.add_development_dependency 'flamegraph'
 
-  s.require_paths = ["Ruby/lib"]
-end
+  s.require_paths = ["lib"]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.9.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -68,53 +68,163 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flamegraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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:
-- Ruby/README.md
-- Ruby/CHANGELOG
+- README.md
+- CHANGELOG
 files:
 - rack-mini-profiler.gemspec
-- Ruby/lib/mini_profiler_rails/railtie.rb
-- Ruby/lib/html/list.css
-- Ruby/lib/html/jquery.tmpl.js
-- Ruby/lib/html/list.tmpl
-- Ruby/lib/html/share.html
-- Ruby/lib/html/includes.less
-- Ruby/lib/html/profile_handler.js
-- Ruby/lib/html/includes.tmpl
-- Ruby/lib/html/includes.js
-- Ruby/lib/html/list.js
-- Ruby/lib/html/jquery.1.7.1.js
-- Ruby/lib/html/flamegraph.html
-- Ruby/lib/html/includes.css
-- Ruby/lib/mini_profiler/context.rb
-- Ruby/lib/mini_profiler/page_timer_struct.rb
-- Ruby/lib/mini_profiler/storage/file_store.rb
-- Ruby/lib/mini_profiler/storage/memcache_store.rb
-- Ruby/lib/mini_profiler/storage/memory_store.rb
-- Ruby/lib/mini_profiler/storage/abstract_store.rb
-- Ruby/lib/mini_profiler/storage/redis_store.rb
-- Ruby/lib/mini_profiler/client_settings.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/sql_timer_struct.rb
-- Ruby/lib/mini_profiler/config.rb
-- Ruby/lib/mini_profiler/custom_timer_struct.rb
-- Ruby/lib/mini_profiler/version.rb
-- Ruby/lib/mini_profiler/timer_struct.rb
-- Ruby/lib/mini_profiler/profiler.rb
-- Ruby/lib/mini_profiler/request_timer_struct.rb
-- Ruby/lib/mini_profiler/flame_graph.rb
-- Ruby/lib/patches/net_patches.rb
-- Ruby/lib/patches/sql_patches.rb
-- Ruby/lib/rack-mini-profiler.rb
-- Ruby/README.md
-- Ruby/CHANGELOG
+- lib/mini_profiler_rails/railtie.rb
+- lib/html/list.css
+- lib/html/jquery.tmpl.js
+- lib/html/list.tmpl
+- lib/html/share.html
+- lib/html/includes.less
+- lib/html/profile_handler.js
+- lib/html/includes.tmpl
+- lib/html/includes.js
+- lib/html/list.js
+- lib/html/jquery.1.7.1.js
+- lib/html/includes.css
+- lib/mini_profiler/context.rb
+- lib/mini_profiler/page_timer_struct.rb
+- lib/mini_profiler/storage/file_store.rb
+- lib/mini_profiler/storage/memcache_store.rb
+- lib/mini_profiler/storage/memory_store.rb
+- lib/mini_profiler/storage/abstract_store.rb
+- lib/mini_profiler/storage/redis_store.rb
+- lib/mini_profiler/client_settings.rb
+- lib/mini_profiler/profiling_methods.rb
+- lib/mini_profiler/gc_profiler.rb
+- lib/mini_profiler/client_timer_struct.rb
+- lib/mini_profiler/sql_timer_struct.rb
+- lib/mini_profiler/config.rb
+- lib/mini_profiler/custom_timer_struct.rb
+- lib/mini_profiler/version.rb
+- lib/mini_profiler/timer_struct.rb
+- lib/mini_profiler/profiler.rb
+- lib/mini_profiler/request_timer_struct.rb
+- lib/patches/net_patches.rb
+- lib/patches/sql_patches.rb
+- lib/rack-mini-profiler.rb
+- README.md
+- CHANGELOG
 homepage: http://miniprofiler.com
 licenses:
 - MIT
@@ -122,7 +232,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- Ruby/lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -135,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.