time_bandits 0.1.4 → 0.2.0

data/lib/time_bandits/monkey_patches/action_controller.rb

@@ -8,15 +8,7 @@ module ActionController #:nodoc:
     # patch to ensure that the completed line is always written to the log
     def process_action(action, *args)
 
-      raw_payload = {
-        :controller => self.class.name,
-        :action     => self.action_name,
-        :params     => request.filtered_parameters,
-        :formats    => request.formats.map(&:to_sym),
-        :method     => request.method,
-        :path       => (request.fullpath rescue "unknown")
-      }
-
+      raw_payload = get_raw_payload(action)
       ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
 
       exception = nil
@@ -59,6 +51,34 @@ module ActionController #:nodoc:
       runtime - consumed_during_rendering*1000
     end
 
+    private
+
+    if Rails::VERSION::STRING =~ /^3\.2/
+      def get_raw_payload(action)
+        {
+          :controller => self.class.name,
+          :action     => self.action_name,
+          :params     => request.filtered_parameters,
+          :formats    => request.formats.map(&:to_sym),
+          :method     => request.method,
+          :path       => (request.fullpath rescue "unknown")
+        }
+      end
+    elsif Rails::VERSION::STRING =~ /^3\.[01]/
+      def get_raw_payload(action)
+        {
+          :controller => self.class.name,
+          :action     => self.action_name,
+          :params     => request.filtered_parameters,
+          :format     => request.format.try(:ref),
+          :method     => request.method,
+          :path       => (request.fullpath rescue "unknown")
+        }
+      end
+    else
+      raise "time_bandits ActionController monkey patch is not compatible with your Rails version"
+    end
+
     module ClassMethods
       def log_process_action(payload) #:nodoc:
         messages, view_runtime = [], payload[:view_runtime]

data/lib/time_bandits/monkey_patches/active_record.rb

@@ -3,8 +3,8 @@
 # and the number of query cache hits
 # it needs to be adapted to each new rails version
 
-raise "AR log subscriber monkey patch for custom benchmarking is not compatible with your rails version" unless
-  (Rails::VERSION::STRING > "3.0" && Rails::VERSION::STRING < "3.1")
+raise "time_bandits ActiveRecord monkey patch is not compatible with your rails version" unless
+  Rails::VERSION::STRING =~ /^3\.[012]/
 
 require "active_record/log_subscriber"
 
@@ -46,8 +46,19 @@ module ActiveRecord
 
       return unless logger.debug?
 
-      name = '%s (%.1fms)' % [event.payload[:name], event.duration]
-      sql  = event.payload[:sql].squeeze(' ')
+      payload = event.payload
+
+      return if 'SCHEMA' == payload[:name]
+
+      name = '%s (%.1fms)' % [payload[:name], event.duration]
+      sql  = payload[:sql].squeeze(' ')
+      binds = nil
+
+      unless (payload[:binds] || []).empty?
+        binds = "  " + payload[:binds].map { |col,v|
+          [col.name, v]
+        }.inspect
+      end
 
       if odd?
         name = color(name, CYAN, true)
@@ -56,7 +67,7 @@ module ActiveRecord
         name = color(name, MAGENTA, true)
       end
 
-      debug "  #{name}  #{sql}"
+      debug "  #{name}  #{sql}#{binds}"
     end
   end
 

data/lib/time_bandits/rack/logger.rb

@@ -1,7 +1,8 @@
 module TimeBandits
   module Rack
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
+      # TODO: how to deal with tags
+      def initialize(app, tags=nil)
         @app = app
       end
 
@@ -20,10 +21,9 @@ module TimeBandits
         Thread.current[:time_bandits_completed_info] = nil
 
         request = ActionDispatch::Request.new(env)
-        path = request.fullpath
+        path = request.filtered_path
 
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{start_time.to_default_s}"
+        info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{start_time.to_default_s}"
       end
 
       def after_dispatch(env, result, run_time)
@@ -33,7 +33,7 @@ module TimeBandits
         message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % (run_time*1000)
         message << " (#{additions.join(' | ')})" unless additions.blank?
         info message
-
+      ensure
         ActiveSupport::LogSubscriber.flush_all!
       end
 

data/lib/time_bandits/railtie.rb

@@ -1,11 +1,15 @@
 module TimeBandits
+
+  module Rack
+    autoload :Logger, 'time_bandits/rack/logger'
+  end
+
   class Railtie < Rails::Railtie
 
     initializer "time_bandits" do |app|
       app.config.middleware.swap("Rails::Rack::Logger", "TimeBandits::Rack::Logger")
 
       ActiveSupport.on_load(:action_controller) do
-        require 'time_bandits/rack/logger.rb'
         require 'time_bandits/monkey_patches/action_controller'
         include ActionController::TimeBanditry
       end

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: time_bandits
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 +01:00
+date: 2012-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency