rack-mini-profiler 0.9.0.pre → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9507bf24483a76c136680a0bbcc6e4a4363471
-  data.tar.gz: 9e99da2d17e0f35e76673adb60f3fcf72324340b
+  metadata.gz: 521860df9b65cce4c241d9fed2b68c671fcecdfe
+  data.tar.gz: bc1e39096a4c99ff1eabc31fa94bca57845dc95d
 SHA512:
-  metadata.gz: 9eb3a4c161db91bff011f00bd5ed425ffe29d567dece26006ebc0aa08135b5177d495c4d222122254aa024cd66fa3b4edcb79a2383dda5eabac43b6a26a41d8f
-  data.tar.gz: 7115cedbc00272f16e3e3b2321a8c40b7c1ed4e21338d8ab0c1111470c1e87074decd7eae21aed95cde07eea2563f31241f4a8bc31e85c1bc43a925ae23d2311
+  metadata.gz: f5b6273e7286a487549c2beea765802d30f6e27e7624dd4317c12cb028e8eaa97cac9914e8bb6bb53f12757f1002fa56d513a60adf57f7d3910875ff6784d7de
+  data.tar.gz: cbe7f735f443cb54c209170a32da9c45ded84d0b151e87ba1cc0f113c6cad393390430712e354c88215b7f88a69f540649be033fcdadfbbef44d9d0aacd4305d

data/README.md

@@ -15,7 +15,6 @@ The new home for rack-mini-profiler is https://github.com/MiniProfiler/rack-mini
 - 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/sql_timer_struct.rb#L36-L44)
-- Add travis-ci testing at least MRI 1.9.3, JRuby and MRI 2.0
 
 If you feel like taking on any of this start an issue and update us on your progress.
 
@@ -190,3 +189,26 @@ end
 
 If you include the query string `pp=help` at the end of your request you will see the various options available. You can use these options to extend or contract the amount of diagnostics rack-mini-profiler gathers.
 
+## Licence
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Sam Saffron
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/mini_profiler/profiler.rb

@@ -204,7 +204,7 @@ module Rack
         skip_it = true
       end
 
-      if query_string =~ /pp=enable/
+      if query_string =~ /pp=enable/ && (@config.authorization_mode != :whitelist || MiniProfiler.request_authorized?)
         skip_it = false
         config.enabled = true
       end
@@ -283,12 +283,14 @@ module Rack
             current.measure = false
             match_data = query_string.match(/flamegraph_sample_rate=(?<rate>[\d\.]+)/)
 
+            mode = query_string =~ /mode=c/ ? :c : :ruby
+
             if match_data && !match_data[:rate].to_f.zero?
               sample_rate = match_data[:rate].to_f
             else
               sample_rate = config.flamegraph_sample_rate
             end
-            flamegraph = Flamegraph.generate(nil, fidelity: sample_rate, embed_resources: query_string =~ /embed/) do
+            flamegraph = Flamegraph.generate(nil, fidelity: sample_rate, embed_resources: query_string =~ /embed/, mode: mode) do
               status,headers,body = @app.call(env)
             end
           end

data/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/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/patches/sql_patches.rb

@@ -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.9.0.pre"
+	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."
@@ -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 = ["lib"]
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.9.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -68,6 +68,118 @@ 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
@@ -128,9 +240,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14