lrd_rack_bug 0.3.1.1 → 0.3.1.2

data/lib/rack/bug/filtered_backtrace.rb

@@ -11,13 +11,22 @@ module Rack
       end
 
       def filtered_backtrace
-        @filtered_backtrace ||= @backtrace.map{|l| l.to_s.strip }.select do |line|
-          root_for_backtrace_filtering.nil? ||
-          (line.index(root_for_backtrace_filtering) == 0) && !(line.index(root_for_backtrace_filtering("vendor")) == 0)
-        end
+        @filtered_backtrace ||= @backtrace.grep(FilteredBacktrace.backtrace_regexp)
+      end
+
+      def self.backtrace_regexp
+        @backtrace_regexp ||=
+          begin
+            if true or (app_root = root_for_backtrace_filtering).nil?
+              /.*/
+            else
+              excludes = %w{vendor}
+              %r{^#{app_root}(?:#{::File::Separator}(?!#{excludes.join("|")}).+)$}
+            end
+          end
       end
 
-      def root_for_backtrace_filtering(sub_path = nil)
+      def self.root_for_backtrace_filtering(sub_path = nil)
         if defined?(Rails) && Rails.respond_to?(:root)
           sub_path ? Rails.root.join(sub_path) : Rails.root
         else

data/lib/rack/bug/panels/sql_panel.rb

@@ -13,16 +13,21 @@ module Rack
         PanelApp.new
       end
 
-      def self.record(sql, backtrace = [], &block)
-        return block.call unless Rack::Bug.enabled?
+      def self.record(sql, backtrace = [])
+        return yield unless Rack::Bug.enabled?
 
         start_time = Time.now
-        result = block.call
-        queries << QueryResult.new(sql, Time.now - start_time, backtrace)
+
+        result = nil
+        begin
+          result = yield
+        ensure
+          queries << QueryResult.new(sql, Time.now - start_time, backtrace, result)
+        end
 
         return result
       end
-      
+
       def self.record_event(sql, duration, backtrace = [])
         return unless Rack::Bug.enabled?
         queries << QueryResult.new(sql, duration, backtrace)
@@ -37,8 +42,7 @@ module Rack
       end
 
       def self.total_time
-        (queries.inject(0) do |memo, query| 
-          Rails.logger.debug{ "QTime: #{query.time}" }
+        (queries.inject(0) do |memo, query|
           memo + query.time
         end) * 1_000
       end

data/lib/rack/bug/panels/sql_panel/query.rb

@@ -8,10 +8,12 @@ module Rack
         attr_reader :sql
         attr_reader :time
 
-        def initialize(sql, time, backtrace = [])
+        def initialize(sql, time, backtrace = [], result=nil)
+          Rails.logger.debug{ "QueryResult: #{sql}" }
           @sql = sql
           @time = time
           @backtrace = backtrace
+          @result = result
           @results = nil
         end
 

data/lrd_rack_bug.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lrd_rack_bug}
-  s.version = "0.3.1.1"
+  s.version = "0.3.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp", "Evan Dorn", "Judson Lester"]
@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/lrdesign/lrd_rack_bug}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Debugging toolbar for Rack applications implemented as 
-    middleware.  Rails 3 compatible version maintained by Logical Reality 
+  s.summary = %q{Debugging toolbar for Rack applications implemented as
+    middleware.  Rails 3 compatible version maintained by Logical Reality
     Design.  }
-  s.description = %q{Debugging toolbar for Rack applications implemented as 
-    middleware.  Rails 3 compatible version maintained by Logical Reality 
+  s.description = %q{Debugging toolbar for Rack applications implemented as
+    middleware.  Rails 3 compatible version maintained by Logical Reality
     Design.  }
   s.add_dependency("uuid", "~> 2.3.1")
   #s.test_files = Dir.glob("spec/**/*") gem test assumes Test::Unit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: lrd_rack_bug
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 0
   - 3
   - 1
-  - 1
-  version: 0.3.1.1
+  - 2
+  version: 0.3.1.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -37,7 +37,7 @@ dependencies:
         version: 2.3.1
   type: :runtime
   version_requirements: *id001
-description: "Debugging toolbar for Rack applications implemented as \n    middleware.  Rails 3 compatible version maintained by Logical Reality \n    Design.  "
+description: "Debugging toolbar for Rack applications implemented as\n    middleware.  Rails 3 compatible version maintained by Logical Reality\n    Design.  "
 email: evan@lrdesign.com judson@lrdesign.com
 executables: []
 
@@ -184,6 +184,6 @@ rubyforge_project:
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Debugging toolbar for Rack applications implemented as  middleware.  Rails 3 compatible version maintained by Logical Reality  Design.
+summary: Debugging toolbar for Rack applications implemented as middleware.  Rails 3 compatible version maintained by Logical Reality Design.
 test_files: []