rack-mini-profiler 0.1.30 → 0.9.2

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

@@ -4,9 +4,15 @@ module Rack::MiniProfilerRails
 
   # call direct if needed to do a defer init
   def self.initialize!(app)
+    
+    raise "MiniProfilerRails initialized twice. Set `require: false' for rack-mini-profiler in your Gemfile" if @already_initialized
+      
     c = Rack::MiniProfiler.config
 
     # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
+    #
+    # NOTE: this must be set here with = and not ||=
+    #  The out of the box default is "true"
     c.pre_authorize_cb = lambda { |env|
       !Rails.env.test?
     }
@@ -14,16 +20,21 @@ module Rack::MiniProfilerRails
     c.skip_paths ||= []
 
     if Rails.env.development?
-      c.skip_paths << "/assets/"
+      c.skip_paths << app.config.assets.prefix if app.respond_to? :assets
       c.skip_schema_queries = true
     end
 
-    if Rails.env.production?
+    unless Rails.env.development? || Rails.env.test?
       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"
+    base_path = Rails.application.config.paths['tmp'].first rescue "#{Rails.root}/tmp"
+    tmp       = base_path + '/miniprofiler'
     FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
 
     c.storage_options = {:path => tmp}
@@ -32,14 +43,20 @@ module Rack::MiniProfilerRails
     # Quiet the SQL stack traces
     c.backtrace_remove = Rails.root.to_s + "/"
     c.backtrace_includes =  [/^\/?(app|config|lib|test)/]
-    c.skip_schema_queries =  Rails.env != 'production'
+    c.skip_schema_queries = (Rails.env.development? || Rails.env.test?)
 
     # Install the Middleware
     app.middleware.insert(0, Rack::MiniProfiler)
 
     # Attach to various Rails methods
-    ::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
-    ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
+    ActiveSupport.on_load(:action_controller) do
+      ::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
+    end
+    ActiveSupport.on_load(:action_view) do
+      ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
+    end
+    
+    @already_initialized = true
   end
 
   class Railtie < ::Rails::Railtie

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

@@ -47,7 +47,8 @@ if SqlPatches.class_exists? "Mysql2::Client"
       start = Time.now
       result = query_without_profiling(*args,&blk)
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(args[0], elapsed_time))
+      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
       result
 
@@ -117,7 +118,8 @@ if SqlPatches.class_exists? "PG::Result"
       start = Time.now
       result = exec_without_profiling(*args,&blk)
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(args[0], elapsed_time))
+      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
       result
     end
@@ -131,7 +133,8 @@ if SqlPatches.class_exists? "PG::Result"
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
       mapped = args[0]
       mapped = @prepare_map[mapped] || args[0] if @prepare_map
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+      record = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
       result
     end
@@ -142,10 +145,12 @@ if SqlPatches.class_exists? "PG::Result"
 
       start = Time.now
       result = send_query_prepared_without_profiling(*args,&blk)
+
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
       mapped = args[0]
       mapped = @prepare_map[mapped] || args[0] if @prepare_map
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(mapped, elapsed_time))
+      record = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
       result
     end
@@ -157,7 +162,8 @@ if SqlPatches.class_exists? "PG::Result"
       start = Time.now
       result = exec_without_profiling(*args,&blk)
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(args[0], elapsed_time))
+      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
+      result.instance_variable_set("@miniprofiler_sql_id", record) if result
 
       result
     end
@@ -180,7 +186,7 @@ if SqlPatches.class_exists?("Moped::Node")
       start = Time.now
       result = process_without_profiling(*args,&blk)
       elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(args[0].log_inspect, elapsed_time))
+      ::Rack::MiniProfiler.record_sql(args[0].log_inspect, elapsed_time)
 
       result
     end
@@ -207,7 +213,7 @@ if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0" #
           data << "\n#{Rack::Utils.unescape(request_context[:data])}"
         end
       end
-      result.instance_variable_set("@miniprofiler_sql_id", ::Rack::MiniProfiler.record_sql(data, elapsed_time))
+      ::Rack::MiniProfiler.record_sql(data, elapsed_time)
 
       result
     end
@@ -222,7 +228,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,20 +1,20 @@
 Gem::Specification.new do |s|
-	s.name = "rack-mini-profiler"
-	s.version = "0.1.30"
-	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."
-	s.email = "sam.saffron@gmail.com"
-	s.homepage = "http://miniprofiler.com"
+  s.name = "rack-mini-profiler"
+  s.version = "0.9.2"
+  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."
+  s.email = "sam.saffron@gmail.com"
+  s.homepage = "http://miniprofiler.com"
   s.license = "MIT"
-	s.files = [
-		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('Ruby/lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
-	s.extra_rdoc_files = [
-		"Ruby/README.md",
-    "Ruby/CHANGELOG"
-	]
-	s.add_runtime_dependency 'rack', '>= 1.1.3'
+  s.files = [
+    'rack-mini-profiler.gemspec',
+  ].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+  s.extra_rdoc_files = [
+    "README.md",
+    "CHANGELOG.md"
+  ]
+  s.add_runtime_dependency 'rack', '>= 1.1.3'
   if RUBY_VERSION < "1.9"
     s.add_runtime_dependency 'json', '>= 1.6'
   end
@@ -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"]
+  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.30
+  version: 0.9.2
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,111 +10,221 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   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: rack-test
   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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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.md
 files:
+- CHANGELOG.md
+- README.md
+- lib/html/includes.css
+- lib/html/includes.js
+- lib/html/includes.less
+- lib/html/includes.tmpl
+- lib/html/jquery.1.7.1.js
+- lib/html/jquery.tmpl.js
+- lib/html/list.css
+- lib/html/list.js
+- lib/html/list.tmpl
+- lib/html/profile_handler.js
+- lib/html/share.html
+- lib/mini_profiler/client_settings.rb
+- lib/mini_profiler/client_timer_struct.rb
+- lib/mini_profiler/config.rb
+- lib/mini_profiler/context.rb
+- lib/mini_profiler/custom_timer_struct.rb
+- lib/mini_profiler/gc_profiler.rb
+- lib/mini_profiler/page_timer_struct.rb
+- lib/mini_profiler/profiler.rb
+- lib/mini_profiler/profiling_methods.rb
+- lib/mini_profiler/request_timer_struct.rb
+- lib/mini_profiler/sql_timer_struct.rb
+- lib/mini_profiler/storage/abstract_store.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/redis_store.rb
+- lib/mini_profiler/timer_struct.rb
+- lib/mini_profiler/version.rb
+- lib/mini_profiler_rails/railtie.rb
+- lib/patches/net_patches.rb
+- lib/patches/sql_patches.rb
+- lib/rack-mini-profiler.rb
 - 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
 homepage: http://miniprofiler.com
 licenses:
 - MIT
@@ -122,20 +232,20 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- Ruby/lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Profiles loading speed for rack applications.