time_bandits 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60323e9d2981d428d2b3a1053944f22ee61eb006
-  data.tar.gz: 468a458c3bcb15cce429e79fe434698d7e689a14
+  metadata.gz: acc7cbb26b11fb1994866f77893b803ed7b22d01
+  data.tar.gz: e7d1dbf959382fc54dd1bf86c9ba75690db8ac70
 SHA512:
-  metadata.gz: f7afb9cabf033fc56b8edf45585f08e0257bc3f7955c3ab63267ac38585727a7d633f86895afad3bfd9f2d676e456dc3bedd996d1214b2a04a3d8c2af52b34da
-  data.tar.gz: 57f397b925e412816cb7d0b03f49e7208ce16213ba9a64fdf3fe9c422575749dba6b7735a3cd8145e06dfcbf4f0c826e14c854aa615bc29b3c406dd880caf942
+  metadata.gz: 50fa739258c7236ee9d0f66a7e0347164d99402d76d48b88e6836deb2b6bd0790071ef849aeae11ee1a499836e29fe9062f46a69a9986a4022259624ac292650
+  data.tar.gz: 65210bbea9658c6f5daadddeec201ed3c16a8d903d79d6d4e30fc488ae161d66dff42fee60774ac3e59b634d565d4f563dbbd47593a46abd53711205b07de7b5

data/Appraisals

@@ -1,6 +1,7 @@
 [
   "4.1.15",
   "4.2.6",
+  "5.0.0",
 ].each do |rails_version|
   appraise "activesupport-#{rails_version}" do
     gem "activesupport", rails_version

data/README.rdoc

@@ -84,8 +84,33 @@ In order for the test to run you need a running memcached, redis-server and mysq
 
 == Release Notes
 
-master
+version 0.10.0
+  -- support rails 5
+
+version 0.9.2
+  -- sequel gem changes broke sequel time consumer
+
+version 0.9.1
+  -- make sure redis times consumer logs keys in ASCII
+
+version 0.9.0
+  -- added beetle time consumer
+
+version 0.8.1
+  - bugfix
+
+version 0.8.0
+  - support retrieving current runtime including not yet consumed time
+
+version 0.7.4
   - use appraisal for testing against multiple rails versions
+  - bugfix for actions without render
+
+version 0.7.3
+  - bugfix dalli consumer for rails 4.2
+
+version 0.7.2
+  - support ruby 2.2.0
 
 version 0.7.1
   - support measuring sequel gem

data/docker-compose.yml

@@ -0,0 +1,28 @@
+version: '2'
+
+services:
+  mysql:
+    container_name: mysql
+    image: mysql:5.5
+    ports:
+      - "3601:3306"
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+
+  memcached:
+    container_name: memcached
+    image: memcached:1.4.27
+    ports:
+      - "11211:11211"
+
+  redis:
+    container_name: redis
+    image: redis:3.2.0
+    ports:
+      - "6379:6379"
+
+  rabbitmq:
+    container_name: rabbitmq
+    image: rabbitmq:3.6.2
+    ports:
+      - "5672:5672"

data/gemfiles/activesupport_4.1.15.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    time_bandits (0.9.1)
+    time_bandits (0.9.2)
       activesupport (>= 2.3.2)
       thread_variables
 

data/gemfiles/activesupport_4.2.6.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    time_bandits (0.9.1)
+    time_bandits (0.9.2)
       activesupport (>= 2.3.2)
       thread_variables
 

data/gemfiles/activesupport_5.0.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activesupport", "5.0.0"
+gem "activerecord", "5.0.0"
+
+gemspec :path => "../"

data/gemfiles/activesupport_5.0.0.gemfile.lock

@@ -0,0 +1,93 @@
+PATH
+  remote: ../
+  specs:
+    time_bandits (0.9.2)
+      activesupport (>= 2.3.2)
+      thread_variables
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    amq-client (1.0.2)
+      amq-protocol (>= 1.2.0)
+      eventmachine
+    amq-protocol (1.6.0)
+    amqp (1.0.2)
+      amq-client (~> 1.0.2)
+      amq-protocol (>= 1.3.0)
+      eventmachine
+    ansi (1.5.0)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.0.0)
+    beetle (0.4.8)
+      activesupport (>= 2.3.4)
+      amq-client (= 1.0.2)
+      amq-protocol (= 1.6.0)
+      amqp (= 1.0.2)
+      bunny (~> 0.7.10)
+      daemons (>= 1.1.9)
+      eventmachine_httpserver (>= 0.2.1)
+      hiredis (>= 0.4.5, < 0.6)
+      redis (>= 2.2.2, < 3.2)
+      uuid4r (>= 0.1.2)
+    bunny (0.7.10)
+    byebug (9.0.5)
+    concurrent-ruby (1.0.2)
+    daemons (1.2.3)
+    dalli (2.7.6)
+    eventmachine (1.2.0.1)
+    eventmachine_httpserver (0.2.1)
+    hiredis (0.5.2)
+    i18n (0.7.0)
+    memcached (1.8.0)
+    metaclass (0.0.4)
+    minitest (5.9.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    mysql2 (0.4.4)
+    rake (10.5.0)
+    redis (3.1.0)
+    sequel (4.36.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    thread_variables (0.2.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uuid4r (0.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.0.0)
+  activesupport (= 5.0.0)
+  ansi
+  appraisal
+  beetle (>= 0.4.6)
+  byebug
+  dalli
+  memcached (~> 1.8.0)
+  minitest (~> 5.5)
+  mocha
+  mysql2
+  rake (~> 10.5.0)
+  redis
+  sequel
+  time_bandits!
+
+BUNDLED WITH
+   1.12.5

data/lib/time_bandits/monkey_patches/action_controller.rb

@@ -5,7 +5,7 @@ module ActionController #:nodoc:
   module Instrumentation
 
     # patch to ensure that the completed line is always written to the log.
-    # this is not necessary anymore with rails 4.
+    # this is not necessary anymore with Rails 4 and higher.
     def process_action(action, *args)
       raw_payload = get_raw_payload
       ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
@@ -24,9 +24,10 @@ module ActionController #:nodoc:
       end
       raise exception if exception
       result
-    end unless Rails::VERSION::STRING =~ /\A4\./
+    end unless Rails::VERSION::STRING >= "4.0"
 
     # patch to ensure that render times are always recorded in the log.
+    # this is not necessary anymore with Rails 3 and up.
     def render(*args)
       render_output = nil
       exception = nil
@@ -40,7 +41,7 @@ module ActionController #:nodoc:
       end
       raise exception if exception
       render_output
-    end
+    end unless Rails::VERSION::STRING >= "3.0"
 
     def cleanup_view_runtime #:nodoc:
       consumed_before_rendering = TimeBandits.consumed
@@ -73,7 +74,7 @@ module ActionController #:nodoc:
           :path       => (request.fullpath rescue "unknown")
         }
       end
-    elsif Rails::VERSION::STRING !~ /\A4\.[012]/
+    elsif Rails::VERSION::STRING < "3"
       raise "time_bandits ActionController monkey patch is not compatible with your Rails version"
     end
 
@@ -101,7 +102,7 @@ module ActionController #:nodoc:
         [ event.duration, additions, payload[:view_runtime], "#{payload[:controller]}##{payload[:action]}" ]
       )
 
-      # this an ugly hack to encure completed lines show up in the test logs
+      # this is an ugly hack to ensure completed lines show up in the test logs
       # TODO: move this code to some other place
       return unless Rails.env.test? && Rails::VERSION::STRING >= "3.2"
 

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\.[012])/
+  Rails::VERSION::STRING =~ /^(3\.[012]|4\.[012])|5.0/
 
 require "active_record/log_subscriber"
 
@@ -48,6 +48,8 @@ module ActiveRecord
     # temporarily switch to protected mode and change it back later to
     # public.
 
+    # Note that render_bind was added for Rails 4.0, and the implementation
+    # has changed since then, so we are careful to only redefine it if necessary.
     unless instance_methods.include?(:render_bind)
       protected
       def render_bind(column, value)
@@ -76,29 +78,51 @@ module ActiveRecord
 
       return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
 
-      name = '%s (%.1fms)' % [payload[:name], event.duration]
-      sql  = payload[:sql].squeeze(' ')
-      binds = nil
+      log_sql_statement(payload, event)
+    end
+    public :sql
+    public
 
-      unless (payload[:binds] || []).empty?
-        binds = "  " + payload[:binds].map { |col,v|
-          render_bind(col, v)
-        }.inspect
-      end
+    private
+    if Rails::VERSION::STRING < "5.0"
+      def log_sql_statement(payload, event)
+        name = '%s (%.1fms)' % [payload[:name], event.duration]
+        sql  = payload[:sql].squeeze(' ')
+        binds = nil
 
-      if odd?
-        name = color(name, CYAN, true)
-        sql  = color(sql, nil, true)
-      else
-        name = color(name, MAGENTA, true)
+        unless (payload[:binds] || []).empty?
+          binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
+        end
+
+        name = colorize_payload_name(name, payload[:name])
+        sql  = color(sql, sql_color(sql), true)
+
+        debug "  #{name}  #{sql}#{binds}"
       end
+    else
+      def log_sql_statement(payload, event)
+        name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+        sql   = payload[:sql]
+        binds = nil
+
+        unless (payload[:binds] || []).empty?
+          binds = "  " + payload[:binds].map { |col,v| render_bind(col, v) }.inspect
+        end
 
-      debug "  #{name}  #{sql}#{binds}"
+        if odd?
+          name = color(name, CYAN, true)
+          sql  = color(sql, nil, true)
+        else
+          name = color(name, MAGENTA, true)
+        end
+
+        debug "  #{name}  #{sql}#{binds}"
+      end
     end
-    public :sql
-    public
   end
 
+  require "active_record/railties/controller_runtime"
+
   module Railties
     module ControllerRuntime
       def cleanup_view_runtime

data/lib/time_bandits/monkey_patches/active_support_cache_store.rb

@@ -1,6 +1,9 @@
 require "active_support/cache"
 
-# rails 4 builtin mem_cache_store broke hit reporting for fetch
+# Rails 4 builtin mem_cache_store broke hit reporting for fetch.
+# This has been fixed in Rails 5.
+# The dalli time consumer makes sure to require this file only for Rails 4.
+
 class ActiveSupport::Cache::Store
   private
   # only called by fetch

data/lib/time_bandits/railtie.rb

@@ -11,7 +11,7 @@ module TimeBandits
   class Railtie < Rails::Railtie
 
     initializer "time_bandits" do |app|
-      app.config.middleware.swap("Rails::Rack::Logger", "TimeBandits::Rack::Logger")
+      app.config.middleware.swap(Rails::Rack::Logger, TimeBandits::Rack::Logger)
 
       ActiveSupport.on_load(:action_controller) do
         require 'time_bandits/monkey_patches/action_controller'
@@ -19,14 +19,14 @@ module TimeBandits
 
         # make sure TimeBandits.reset is called in test environment as middlewares are not executed
         if Rails.env.test?
-          require 'action_controller/test_case'
-          module ActionController::TestCase::Behavior
-            def process_with_time_bandits(*args)
+          module TestWithTimeBanditsReset
+            def process(*args)
               TimeBandits.reset
-              process_without_time_bandits(*args)
+              super
             end
-            alias_method_chain :process, :time_bandits
           end
+          require 'action_controller/test_case'
+          ActionController::TestCase::Behavior.prepend TestWithTimeBanditsReset
         end
       end
 

data/lib/time_bandits/time_consumers/dalli.rb

@@ -1,4 +1,4 @@
-if Rails::VERSION::STRING >= "4.0"
+if Rails::VERSION::STRING =~ /\A4.[0123]/
   require "time_bandits/monkey_patches/active_support_cache_store"
 end
 

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Stefan Kaes
@@ -233,10 +233,13 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- docker-compose.yml
 - gemfiles/activesupport_4.1.15.gemfile
 - gemfiles/activesupport_4.1.15.gemfile.lock
 - gemfiles/activesupport_4.2.6.gemfile
 - gemfiles/activesupport_4.2.6.gemfile.lock
+- gemfiles/activesupport_5.0.0.gemfile
+- gemfiles/activesupport_5.0.0.gemfile.lock
 - lib/time_bandits.rb
 - lib/time_bandits/monkey_patches/action_controller.rb
 - lib/time_bandits/monkey_patches/active_record.rb