db_debug 0.0.3 → 0.0.4

data/lib/db_debug/active_record.rb

@@ -1,40 +1,42 @@
-module DbDebug
+require 'active_record/connection_adapters/postgresql_adapter'
+
+class DbDebug
   module ActiveRecord
-    module Base
-      class << self
-        def included(klass)
-          klass.extend ClassMethods
+    module ConnectionAdapters
+      module PostgreSQLAdapter
+        def self.included(klass)
           klass.class_eval do
-            class << self
-              alias_method_chain :find_by_sql, :record_counter
-            end
+            alias_method_chain :exec_query, :db_debug
           end
-          include InstanceMethods
         end
-      end
-
-      module ClassMethods
-        def find_by_sql_with_record_counter(*args)
-          if defined? request
-            resp = nil
-            request.env['db.count'] = request.env['db.count'] + 1
-            time = Benchmark.realtime { resp = find_by_sql_without_record_counter(*args) } * 1000
-            if request.params[:db_debug]
-              Logger.log :white, "DB Query took: #{time} ms"
+        
+        def exec_query_with_db_debug(sql, name = 'SQL', binds = [])
+          if DbDebug.enabled            
+            DbDebug.count += 1
+            start = Time.now
+            res = exec_query_without_db_debug(sql, name, binds)
+            time = (Time.now - start) * 1000
+            
+            if DbDebug.verbose
+              Logger.log :white, ""
+              Logger.log :red, "DB CALL " + "="*72
+              Logger.log :green, "SQL:     #{sql.split("\n").join("").strip}"
+              Logger.log :green, "BINDS:   #{binds}" if binds.present?
+              Logger.log :white, "TIME:    #{time} ms"
               Logger.log :white, caller.delete_if{ |str| str.include?("/gems/") || str.include?("script/rails") }.join("\n")
+              Logger.log :red, "="*80
+              Logger.log :white, ""
+              
             end
-            request.env['db.time'] = request.env['db.time'] + time
-            resp
+            DbDebug.time += time
+            res
           else
-            find_by_sql_without_record_counter(*args)
+            exec_query_without_db_debug(sql, name, binds)
           end
         end
       end
-
-      module InstanceMethods
-      end
     end
   end
 end
 
-ActiveRecord::Base.send(:include, DbDebug::ActiveRecord::Base)
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, DbDebug::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) 

data/lib/db_debug/engine.rb

@@ -1,5 +1,5 @@
-module DbDebug
+class DbDebug
   class Engine < ::Rails::Engine
     config.app_middleware.use DbDebug::Middleware
   end
-end
+end

data/lib/db_debug/logger.rb

@@ -1,4 +1,4 @@
-module DbDebug
+class DbDebug
   module Logger
     COLOR_MAP = {
       :black => 30,
@@ -15,5 +15,15 @@ module DbDebug
       code = COLOR_MAP[color]
       Rails.logger.debug "\033[0;#{code}m#{str}\033[0;#37m"      
     end
+    
+    def self.determine_color count, time
+      if count <= 10 || time < 50.0
+        :green
+      elsif count <= 20 || time < 100.0
+        :yellow
+      else
+        :red
+      end
+    end
   end
 end

data/lib/db_debug/middleware.rb

@@ -1,25 +1,15 @@
-module DbDebug
+class DbDebug
   class Middleware
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      env['db.count'] = 0
-      env['db.time'] = 0.0
-      resp = @app.call(env)
-      color = determine_color env['db.count'], env['db.time']
-      Logger.log color, "You hit the database #{env['db.count']} times and it took %5.3f ms" % env['db.time']
-      resp
-    end
-    
-    def determine_color count, time
-      if count <= 10 || time < 50.0
-        :green
-      elsif count <= 20 || time < 100.0
-        :yellow
-      else
-        :red
+      db_debug = env["QUERY_STRING"].gsub!(/&db_debug/, "")
+
+      
+      DbDebug.trace verbose: db_debug.present?  do
+        @app.call(env)
       end
     end
   end

data/lib/db_debug/version.rb

@@ -1,3 +1,3 @@
-module DbDebug
-  VERSION = "0.0.3"
+class DbDebug
+  VERSION = "0.0.4"
 end

data/lib/db_debug.rb

@@ -1,9 +1,24 @@
 require "db_debug/middleware"
 require "db_debug/active_record"
-require "db_debug/action_controller"
 require "db_debug/version"
 require "db_debug/logger"
 require "db_debug/engine"
 
-module DbDebug
+class DbDebug
+  cattr_accessor :count, :time, :verbose, :enabled
+  
+  def self.trace opts = {}
+    DbDebug.enabled   = true
+    DbDebug.count     = opts[:count] || 0
+    DbDebug.time      = opts[:time]  || 0
+    DbDebug.verbose   = opts[:verbose] || false
+    
+    res = yield
+    
+    color = Logger.determine_color DbDebug.count, DbDebug.time
+    Logger.log color, "You hit the database #{DbDebug.count} times and it took %5.3f ms" % DbDebug.time
+    
+    DbDebug.enabled   = false
+    res
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_debug
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,7 +35,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/db_debug/action_controller.rb
 - lib/db_debug/active_record.rb
 - lib/db_debug/engine.rb
 - lib/db_debug/logger.rb

data/lib/db_debug/action_controller.rb

@@ -1,41 +0,0 @@
-module  DbDebug
-  module ActionController
-    module Base
-      class << self
-        def included(klass)
-            klass.class_eval do
-            around_filter :hack_to_pass_shit_to_rack_middleware
-
-            protected
-
-            def hack_to_pass_shit_to_rack_middleware
-              klasses = [ActiveRecord::Base, ActiveRecord::Base.class]
-              methods = ["session", "cookies", "params", "request"]
-
-              methods.each do |shenanigan|
-                oops = instance_variable_get(:"@_#{shenanigan}") 
-
-                klasses.each do |klass|
-                  klass.send(:define_method, shenanigan, proc { oops })
-                end
-              end
-
-              yield
-
-              methods.each do |shenanigan|      
-                klasses.each do |klass|
-                  klass.send :remove_method, shenanigan
-                end
-              end
-            end 
-          end
-        end
-      end
-    end
-  end
-  
-end
-
-
-
-ActionController::Base.send(:include, DbDebug::ActionController::Base)