time_bandits 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e78610739a238c4fdd8996c6d04233f55da3b2d
-  data.tar.gz: 4759fe23caee371f1a33ec748f2955f9377740f1
+  metadata.gz: 49d969750b99d03c0d11b1268c50daab039a5416
+  data.tar.gz: f69f222e09dea2bf1a95e79bdb164b00433aabbd
 SHA512:
-  metadata.gz: 9e29f720c97c525431418c57d1551c6064b247afa12de33225c85564baa0c48ac506239b703c026cc65ccd849c61579a4b25bc92862546ef12eaaa0279cf26bf
-  data.tar.gz: db03cdbae7ad22d4c36fd637b75705c3ddcb32447a4de60ac2d90117268198fcd394b4bd8529d8c3cba733d3d04083f67c08a79adc953e58859c31650e94b3dd
+  metadata.gz: b083343d3b81f94cabb2b07711aa68de48f61ab7bd61f705e05d8939354f6011a3269d114184dba8a1d4014adb89c92d38a054782c67cbe344186a3775f6a118
+  data.tar.gz: 61638788e719ce91c16c09410b5a6a44cd4d4373ab02749a0b666da158f2a7c176dec66296e7878d0b87352dfaf8d99bb8b3f6087cc8b79ab500b783a2ee36b8

data/lib/time_bandits/monkey_patches/action_controller.rb

@@ -1,8 +1,7 @@
-require 'action_controller/metal/instrumentation'
-require 'action_controller/log_subscriber'
-
 module ActionController #:nodoc:
 
+  require 'action_controller/metal/instrumentation'
+
   module Instrumentation
 
     # patch to ensure that the completed line is always written to the log.
@@ -74,7 +73,7 @@ module ActionController #:nodoc:
           :path       => (request.fullpath rescue "unknown")
         }
       end
-    elsif Rails::VERSION::STRING !~ /\A4\.[01]/
+    elsif Rails::VERSION::STRING !~ /\A4\.[012]/
       raise "time_bandits ActionController monkey patch is not compatible with your Rails version"
     end
 
@@ -88,6 +87,8 @@ module ActionController #:nodoc:
     end
   end
 
+  require 'action_controller/log_subscriber'
+
   class LogSubscriber
     # the original method logs the completed line.
     # but we do it in the middleware, unless we're in test mode. don't ask.

data/lib/time_bandits/monkey_patches/active_record.rb

@@ -4,7 +4,7 @@
 # it needs to be adapted to each new rails version
 
 raise "time_bandits ActiveRecord monkey patch is not compatible with your rails version" unless
-  Rails::VERSION::STRING =~ /^(3\.[012]|4\.[01])/
+  Rails::VERSION::STRING =~ /^(3\.[012]|4\.[012])/
 
 require "active_record/log_subscriber"
 

data/lib/time_bandits/time_consumers/dalli.rb

@@ -8,7 +8,7 @@ module TimeBandits::TimeConsumers
     fields :time, :calls, :misses, :reads, :writes
     format "Dalli: %.3f(%dr,%dm,%dw,%dc)", :time, :reads, :misses, :writes, :calls
 
-    if Rails::VERSION::STRING >= "4.0" && Rails.cache.class.respond_to?(:instrument=)
+    if Rails::VERSION::STRING >= "4.0" && Rails::VERSION::STRING < "4.2" && Rails.cache.class.respond_to?(:instrument=)
       # Rails 4 mem_cache_store (which uses dalli internally), unlike dalli_store, is not instrumented by default
       def reset
         Rails.cache.class.instrument = true

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables