time_bandits 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01eaedc2476f9acf317bb48a0a2c9e1aa77742a2
-  data.tar.gz: 1fbf51beb7e4d4992639e3ae035fcd66ed3bec6f
+  metadata.gz: 6d4bbdee09ecd1f5428fe0c93b049b5f157814ba
+  data.tar.gz: 686ef134d2a40459582093824f69da699d8a0394
 SHA512:
-  metadata.gz: f660bf5ae9ff600eecf8300247d6995564c97f87d662f1a46f5cd7a27997b55156e31ed464a26cc166066e1bdff9ab2ee9111fe234fb1116597efd8f32f0f862
-  data.tar.gz: 404ea48c566456ab5c9d1aaf3dae5c9270e376a068fa3cd1f49615a83b46e14c7cca466812d617e6d1fda934cc20bafcbf3bd9afcaa436e93b0d2081dcd7e51b
+  metadata.gz: 90c532ac1341dd826a10abada88e6ddc003a0e7fac38f7a534d45f24ea29aadac2b9a522d060c95e2ae99d15387de7b054fad32a94ec91ea2f89b93107f83899
+  data.tar.gz: b8bdbe06f60a9acf31437a554562440611a68ea9ac35a6f8cb75de0dc2c2377c7239d815e7f50b8c6502fcca008028c8121b80aee905d80a4f835d3bd174381a

data/lib/time_bandits/railtie.rb

@@ -15,11 +15,19 @@ module TimeBandits
 
       ActiveSupport.on_load(:action_controller) do
         require 'time_bandits/monkey_patches/action_controller'
+
+        # Rails 5 may trigger the on_load event several times.
+        next if included_modules.include?(ActionController::TimeBanditry)
+        # For some magic reason, the test above is always false, but I'll leave it in
+        # here, should rails every decide to change this behavior.
+
         include ActionController::TimeBanditry
 
         # make sure TimeBandits.reset is called in test environment as middlewares are not executed
         if Rails.env.test?
           require 'action_controller/test_case'
+          # Rails 5 fires on_load events multiple times, so we need to protect against endless recursion here
+          next if ActionController::TestCase::Behavior.instance_methods.include?(:process_without_time_bandits)
           module ActionController::TestCase::Behavior
             def process_with_time_bandits(*args)
               TimeBandits.reset
@@ -33,6 +41,7 @@ module TimeBandits
 
       ActiveSupport.on_load(:active_record) do
         require 'time_bandits/monkey_patches/active_record'
+        # TimeBandits.add is idempotent, so no need to protect against on_load fired multiple times.
         TimeBandits.add TimeBandits::TimeConsumers::Database
       end
 

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Custom performance logging for Rails