rack-mini-profiler 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d3cb66046f8ae5f6a4c61b944374e4176db06c
-  data.tar.gz: be9fd719a26021fed90ec17851cddf5b510aed0c
+  metadata.gz: 00a128037529807d7766b5879fbe52bb08e166b4
+  data.tar.gz: 0b50933b899ed619bea7c18e08f8448795d4634d
 SHA512:
-  metadata.gz: 728b47de4b3ed3694646d449e8b9722d86a7485b49fb24a360721575c4e1a7ded56ddf2c5ba1d830ae297f4e2c8e87a17f4b3f260b9b05c30438e2f14d9c1df8
-  data.tar.gz: 26e3da128c7f2850f766af2aa1bfbdf6378f8663dde418e8245af070c0915a3eba6d9a3b68c8bdee70215388016fcab3dd76b040f21cf29877b99592eb67d275
+  metadata.gz: 7a18aa291f92f0ca6f33f56285eaca6dccfd07eb02b33470a6af05af23fb3f941c72588d0c35d4342fd2c34567c74e0f301de01d82be54b4c19d2433c7c2ccf7
+  data.tar.gz: d7c07474c0bdb2df7e76129d0cc604f2622974a1080e3a41bdcc70b6556408fcb16ae7f31ab0dd46c32354ffce52eb53c30947cb0cd9d29a88c88394dce907ea

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.10.7 2017-11-24
+
+- [FEATURE] Replace Time.now with Process.clock_gettime(Process::CLOCK_MONOTONIC)
+- [FIX] Error with webrick and empty cache control
+
 ## 0.10.6 2017-10-30
 
 - [FEATURE] Support for vertical positions (top/bottom)

data/README.md

@@ -8,12 +8,9 @@ Middleware that displays speed badge for every html page. Designed to work both
 
 Well, not exactly mega urgent, but nice to see you are reading this.
 
-There are 2 very simple changes I would like to see ASAP
+There is one very simple change I would like to see ASAP: I would like to see `# frozen_string_literal: true` on every file we ship
 
-1. Stop using Time.now EVERYWHERE in rack-mini-profiler and replace with `Process.clock_gettime(Process::CLOCK_MONOTONIC)`
-2. I would like to see `# frozen_string_literal: true` on every file we ship
-
-If you pick up either of these, be sure to amend the README in your PR AND add a Changelog. 
+If you pick up this task, be sure to amend the README in your PR AND add a Changelog. 
 
 #### Features
 

data/lib/mini_profiler/client_settings.rb

@@ -42,7 +42,7 @@ module Rack
         if (MiniProfiler.config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
           # this is non-obvious, don't kill the profiling cookie on errors or short requests
           # this ensures that stuff that never reaches the rails stack does not kill profiling
-          if status.to_i >= 200 && status.to_i < 300 && ((Time.now - @start) > 0.1)
+          if status.to_i >= 200 && status.to_i < 300 && ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - @start) > 0.1)
             discard_cookie!(headers)
           end
         else

data/lib/mini_profiler/profiler.rb

@@ -149,7 +149,7 @@ module Rack
 
     def call(env)
 
-      start = Time.now
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       client_settings = ClientSettings.new(env, @storage, start)
       MiniProfiler.deauthorize_request if @config.authorization_mode == :whitelist
 
@@ -325,7 +325,7 @@ module Rack
 
       page_struct = current.page_struct
       page_struct[:user] = user(env)
-      page_struct[:root].record_time((Time.now - start) * 1000)
+      page_struct[:root].record_time((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start) * 1000)
 
       if flamegraph
         body.close if body.respond_to? :close
@@ -366,7 +366,7 @@ module Rack
         headers.delete('Date')
       end
 
-      headers['X-MiniProfiler-Original-Cache-Control'] = headers['Cache-Control']
+      headers['X-MiniProfiler-Original-Cache-Control'] = headers['Cache-Control'] unless headers['Cache-Control'].nil?
       headers['Cache-Control'] = "#{"no-store, " if config.disable_caching}must-revalidate, private, max-age=0"
 
       # inject header

data/lib/mini_profiler/profiling_methods.rb

@@ -89,11 +89,11 @@ module Rack
           parent_timer = Rack::MiniProfiler.current.current_timer
 
           if type == :counter
-            start = Time.now
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             begin
               self.send without_profiling, *args, &orig
             ensure
-              duration_ms = (Time.now - start).to_f * 1000
+              duration_ms = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_f * 1000
               parent_timer.add_custom(name, duration_ms, Rack::MiniProfiler.current.page_struct )
             end
           else
@@ -131,9 +131,9 @@ module Rack
       def counter(type, duration_ms=nil)
         result = nil
         if block_given?
-          start       = Time.now
+          start       = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           result      = yield
-          duration_ms = (Time.now - start).to_f * 1000
+          duration_ms = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_f * 1000
         end
         return result if current.nil? || !request_authorized?
         current.current_timer.add_custom(type, duration_ms, current.page_struct)

data/lib/mini_profiler/storage/file_store.rb

@@ -139,10 +139,10 @@ module Rack
         @auth_token_lock.synchronize {
           token1, token2, cycle_at = @auth_token_cache[""]
 
-          unless cycle_at && (Time === cycle_at) && (cycle_at > Time.now)
+          unless cycle_at && (Float === cycle_at) && (cycle_at > Process.clock_gettime(Process::CLOCK_MONOTONIC))
             token2 = token1
             token1 = SecureRandom.hex
-            cycle_at = Time.now + Rack::MiniProfiler::AbstractStore::MAX_TOKEN_AGE
+            cycle_at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + Rack::MiniProfiler::AbstractStore::MAX_TOKEN_AGE
           end
 
           @auth_token_cache[""] = [token1, token2, cycle_at]

data/lib/mini_profiler/storage/memcache_store.rb

@@ -67,7 +67,7 @@ module Rack
            key1 = nil unless key1 && key1.length == 32
            key2 = nil unless key2 && key2.length == 32
 
-           if key1 && cycle_at && (cycle_at > Time.now)
+           if key1 && cycle_at && (cycle_at > Process.clock_gettime(Process::CLOCK_MONOTONIC))
               return [key1,key2].compact
            end
         end
@@ -77,7 +77,7 @@ module Rack
         # cycle keys
         key2 = key1
         key1 = SecureRandom.hex
-        cycle_at = Time.now + timeout
+        cycle_at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout
 
         @client.set("#{@prefix}-tokens", Marshal::dump([key1, key2, cycle_at]))
 

data/lib/mini_profiler/storage/memory_store.rb

@@ -70,7 +70,7 @@ module Rack
         cleanup_cycle    = args.fetch(:cleanup_cycle)    { CLEANUP_CYCLE }
         t = CacheCleanupThread.new(cleanup_interval, cleanup_cycle, self) do |t|
           until Thread.current[:should_exit] do
-            self.sleepy_run
+            CacheCleanupThread.current.sleepy_run
           end
         end
         at_exit { t[:should_exit] = true }
@@ -115,7 +115,7 @@ module Rack
       end
 
       def cleanup_cache
-        expire_older_than = ((Time.now.to_f - @expires_in_seconds) * 1000).to_i
+        expire_older_than = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - @expires_in_seconds) * 1000).to_i
         @timer_struct_lock.synchronize {
           @timer_struct_cache.delete_if { |k, v| v[:started] < expire_older_than }
         }
@@ -124,10 +124,10 @@ module Rack
       def allowed_tokens
         @token_lock.synchronize do
 
-          unless @cycle_at && (@cycle_at > Time.now)
+          unless @cycle_at && (@cycle_at > Process.clock_gettime(Process::CLOCK_MONOTONIC))
             @token2 = @token1
             @token1 = SecureRandom.hex
-            @cycle_at = Time.now + Rack::MiniProfiler::AbstractStore::MAX_TOKEN_AGE
+            @cycle_at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + Rack::MiniProfiler::AbstractStore::MAX_TOKEN_AGE
           end
 
           [@token1, @token2].compact

data/lib/mini_profiler/storage/redis_store.rb

@@ -32,7 +32,7 @@ module Rack
       def set_unviewed(user, id)
         key = user_key(user)
         if redis.exists(prefixed_id(id))
-          expire_at = Time.now.to_i + redis.ttl(prefixed_id(id))
+          expire_at = Process.clock_gettime(Process::CLOCK_MONOTONIC).to_i + redis.ttl(prefixed_id(id))
           redis.zadd(key, expire_at, id)
         end
         redis.expire(key, @expires_in_seconds)
@@ -43,7 +43,7 @@ module Rack
         redis.del(key)
         ids.each do |id|
           if redis.exists(prefixed_id(id))
-            expire_at = Time.now.to_i + redis.ttl(prefixed_id(id))
+            expire_at = Process.clock_gettime(Process::CLOCK_MONOTONIC).to_i + redis.ttl(prefixed_id(id))
             redis.zadd(key, expire_at, id)
           end
         end
@@ -57,7 +57,7 @@ module Rack
       # Remove expired ids from the unviewed sorted set and return the remaining ids
       def get_unviewed_ids(user)
         key = user_key(user)
-        redis.zremrangebyscore(key, '-inf', Time.now.to_i)
+        redis.zremrangebyscore(key, '-inf', Process.clock_gettime(Process::CLOCK_MONOTONIC).to_i)
         redis.zrevrangebyscore(key, '+inf', '-inf')
       end
 

data/lib/mini_profiler/timer_struct/custom.rb

@@ -8,7 +8,7 @@ module Rack
           @parent      = parent
           @page        = page
           @type        = type
-          start_millis = ((Time.now.to_f * 1000).to_i - page[:started]) - duration_ms
+          start_millis = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i - page[:started]) - duration_ms
           super(
             :type                  => type,
             :start_milliseconds    => start_millis,

data/lib/mini_profiler/timer_struct/page.rb

@@ -11,7 +11,7 @@ module Rack
         def initialize(env)
           timer_id     = MiniProfiler.generate_id
           page_name    = env['PATH_INFO']
-          started_at   = (Time.now.to_f * 1000).to_i
+          started_at   = (Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i
           machine_name = env['SERVER_NAME']
           super(
             :id                                      => timer_id,

data/lib/mini_profiler/timer_struct/request.rb

@@ -12,7 +12,7 @@ module Rack
         attr_accessor :children_duration
 
         def initialize(name, page, parent)
-          start_millis = (Time.now.to_f * 1000).to_i - page[:started]
+          start_millis = (Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i - page[:started]
           depth        = parent ? parent.depth + 1 : 0
           super(
             :id                                      => MiniProfiler.generate_id,
@@ -39,7 +39,7 @@ module Rack
             :custom_timings                          => {}
           )
           @children_duration = 0
-          @start             = Time.now
+          @start             = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           @parent            = parent
           @page              = page
         end
@@ -117,7 +117,7 @@ module Rack
         end
 
         def record_time(milliseconds = nil)
-          milliseconds ||= (Time.now - @start) * 1000
+          milliseconds ||= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - @start) * 1000
           self[:duration_milliseconds]                  = milliseconds
           self[:is_trivial]                             = true if milliseconds < self[:trivial_duration_threshold_milliseconds]
           self[:duration_without_children_milliseconds] = milliseconds - @children_duration

data/lib/mini_profiler/timer_struct/sql.rb

@@ -32,7 +32,7 @@ module Rack
 
           @parent      = parent
           @page        = page
-          start_millis = ((Time.now.to_f * 1000).to_i - page[:started]) - duration_ms
+          start_millis = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1000).to_i - page[:started]) - duration_ms
           super(
             :execute_type                      => 3, # TODO
             :formatted_command_string          => query,

data/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '0.10.6'
+    VERSION = '0.10.7'
   end
 end

data/lib/patches/db/activerecord.rb

@@ -28,7 +28,7 @@ module Rack
         return log_without_miniprofiler(*args, &block) unless SqlPatches.should_measure?
 
         sql, name, binds = args
-        start            = Time.now
+        start            = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         rval             = log_without_miniprofiler(*args, &block)
 
         # Don't log schema queries if the option is set

data/lib/patches/db/mysql2.rb

@@ -5,7 +5,7 @@ class Mysql2::Result
   def each(*args, &blk)
     return each_without_profiling(*args, &blk) unless defined?(@miniprofiler_sql_id)
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = each_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
 

data/lib/patches/db/neo4j.rb

@@ -3,7 +3,7 @@ class Neo4j::Core::Query
 
   def response
     return @response if @response
-    start = Time.now
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     rval = response_without_miniprofiler
     elapsed_time = SqlPatches.elapsed_time(start)
     Rack::MiniProfiler.record_sql(to_cypher, elapsed_time)

data/lib/patches/db/oracle_enhanced.rb

@@ -3,7 +3,7 @@ class ActiveRecord::Result
   def each(&blk)
     return each_without_profiling(&blk) unless defined?(@miniprofiler_sql_id)
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = each_without_profiling(&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
     @miniprofiler_sql_id.report_reader_duration(elapsed_time)
@@ -45,7 +45,7 @@ class ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter
   def mp_profile_sql(sql, name, &blk)
     return yield unless mp_should_measure?(name)
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = yield
     elapsed_time = SqlPatches.elapsed_time(start)
     record       = ::Rack::MiniProfiler.record_sql(sql, elapsed_time)

data/lib/patches/db/pg.rb

@@ -18,7 +18,7 @@ class PG::Result
   end
 
   def mp_report_sql(&block)
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = yield
     elapsed_time = SqlPatches.elapsed_time(start)
     @miniprofiler_sql_id.report_reader_duration(elapsed_time)
@@ -49,7 +49,7 @@ class PG::Connection
   def exec(*args,&blk)
     return exec_without_profiling(*args,&blk) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = exec_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
     record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
@@ -61,7 +61,7 @@ class PG::Connection
   def exec_prepared(*args,&blk)
     return exec_prepared_without_profiling(*args,&blk) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = exec_prepared_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
     mapped       = args[0]
@@ -75,7 +75,7 @@ class PG::Connection
   def send_query_prepared(*args,&blk)
     return send_query_prepared_without_profiling(*args,&blk) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = send_query_prepared_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
     mapped       = args[0]
@@ -89,7 +89,7 @@ class PG::Connection
   def async_exec(*args,&blk)
     return async_exec_without_profiling(*args,&blk) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = exec_without_profiling(*args,&blk)
     elapsed_time = SqlPatches.elapsed_time(start)
     record       = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)

data/lib/patches/db/plucky.rb

@@ -27,7 +27,7 @@ class Plucky::Query
   def profile_database_operation(method, message, *args, &blk)
     return self.send("#{method.id2name}_without_profiling", *args, &blk) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = self.send("#{method.id2name}_without_profiling", *args, &blk)
     elapsed_time = SqlPatches.elapsed_time(start)
 

data/lib/patches/db/riak.rb

@@ -5,7 +5,7 @@ class Riak::Multiget
     def get_all(client, fetch_list)
       return get_all_without_profiling(client, fetch_list) unless SqlPatches.should_measure?
 
-      start        = Time.now
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       result       = get_all_without_profiling(client, fetch_list)
       elapsed_time = SqlPatches.elapsed_time(start)
       record       = ::Rack::MiniProfiler.record_sql("get_all size=#{fetch_list.size}", elapsed_time)
@@ -92,7 +92,7 @@ class Riak::Client
   def profile(request, &blk)
     return yield unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = yield
     elapsed_time = SqlPatches.elapsed_time(start)
     record       = ::Rack::MiniProfiler.record_sql(request, elapsed_time)

data/lib/patches/db/rsolr.rb

@@ -3,7 +3,7 @@ class RSolr::Connection
   def execute_with_profiling(client, request_context)
     return execute_without_profiling(client, request_context) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = execute_without_profiling(client, request_context)
     elapsed_time = SqlPatches.elapsed_time(start)
 

data/lib/patches/sql_patches.rb

@@ -6,7 +6,7 @@ class SqlPatches
   end
 
   def self.record_sql(statement, parameters = nil, &block)
-    start  = Time.now
+    start  = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result = yield
     record = ::Rack::MiniProfiler.record_sql(statement, elapsed_time(start), parameters)
     return result, record
@@ -18,7 +18,7 @@ class SqlPatches
   end
 
   def self.elapsed_time(start_time)
-    ((Time.now - start_time).to_f * 1000).round(1)
+    ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time).to_f * 1000).round(1)
   end
 
   def self.sql_patches

data/rack-mini-profiler.gemspec

@@ -21,11 +21,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack', '>= 1.2.0'
   s.required_ruby_version = '>= 1.9.3'
 
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler',
+    'changelog_uri'   => 'https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md'
+  }
+
   s.add_development_dependency 'rake', '< 11'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'activerecord', '~> 3.0'
   s.add_development_dependency 'dalli'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rspec', '~> 3.6.0'
   s.add_development_dependency 'redis'
   s.add_development_dependency 'sass'
   s.add_development_dependency 'flamegraph'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,9 @@ files:
 homepage: http://miniprofiler.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/MiniProfiler/rack-mini-profiler
+  changelog_uri: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: