rack-bug 0.2.1 → 0.3.0

data/lib/rack/bug/views/panels/redis.html.erb

@@ -16,6 +16,7 @@
       <tr>
         <th>Time&nbsp;(ms)</th>
         <th>Command</th>
+        <th class="backtrace"></th>
       </tr>
     </thead>
     <tbody>
@@ -24,7 +25,20 @@
         <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
           <td><%= query.display_time %></td>
           <td><%= query.command %></td>
+          <td><%= "<a href='#' class='reveal_backtrace'>Show Backtrace</a>" if query.has_backtrace? %></td>
         </tr>
+        <% if query.has_backtrace? %>
+          <tr style="display:none">
+            <td></td>
+            <td colspan="2">
+              <ul>
+                <% query.filtered_backtrace.each do |line| %>
+                  <li><%=h line %></li>
+                <% end %>
+              </ul>
+            </td>
+          </tr>
+        <% end %>
         <% i += 1 %>
       <% end %>
     </tbody>

data/lib/rack/bug/views/panels/sphinx.html.erb

@@ -0,0 +1,32 @@
+<h3>Sphinx Usage</h3>
+<table id="Sphinx_usage">
+  <tr>
+    <th>Total Calls</th>
+    <td><%= stats.calls %></td>
+
+    <th>Total Time</th>
+    <td><%= stats.display_time %></td>
+  </tr>
+</table>
+
+<% if stats.queries.any? %>
+  <h3>Breakdown</h3>
+  <table id="Sphinx_breakdown">
+    <thead>
+      <tr>
+        <th>Time&nbsp;(ms)</th>
+        <th>Command</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% i = 1 %>
+      <% stats.queries.each do |query| %>
+        <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+          <td><%= query.display_time %></td>
+          <td><%= query.command %></td>
+        </tr>
+        <% i += 1 %>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/rack-bug.gemspec

@@ -1,126 +1,131 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-bug}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-08-06}
+  s.date = %q{2010-05-28}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
-    "MIT-LICENSE.txt",
-     "README.rdoc"
+    "README.md",
+    "MIT-LICENSE.txt"
   ]
   s.files = [
     ".gitignore",
-     "History.txt",
-     "MIT-LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack/bug.rb",
-     "lib/rack/bug/options.rb",
-     "lib/rack/bug/panel.rb",
-     "lib/rack/bug/panel_app.rb",
-     "lib/rack/bug/panels/active_record_panel.rb",
-     "lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb",
-     "lib/rack/bug/panels/cache_panel.rb",
-     "lib/rack/bug/panels/cache_panel/memcache_extension.rb",
-     "lib/rack/bug/panels/cache_panel/panel_app.rb",
-     "lib/rack/bug/panels/cache_panel/stats.rb",
-     "lib/rack/bug/panels/log_panel.rb",
-     "lib/rack/bug/panels/log_panel/rails_extension.rb",
-     "lib/rack/bug/panels/memory_panel.rb",
-     "lib/rack/bug/panels/rails_info_panel.rb",
-     "lib/rack/bug/panels/redis_panel.rb",
-     "lib/rack/bug/panels/redis_panel/redis_extension.rb",
-     "lib/rack/bug/panels/redis_panel/stats.rb",
-     "lib/rack/bug/panels/request_variables_panel.rb",
-     "lib/rack/bug/panels/sql_panel.rb",
-     "lib/rack/bug/panels/sql_panel/panel_app.rb",
-     "lib/rack/bug/panels/sql_panel/query.rb",
-     "lib/rack/bug/panels/sql_panel/sql_extension.rb",
-     "lib/rack/bug/panels/templates_panel.rb",
-     "lib/rack/bug/panels/templates_panel/actionview_extension.rb",
-     "lib/rack/bug/panels/templates_panel/rendering.rb",
-     "lib/rack/bug/panels/templates_panel/trace.rb",
-     "lib/rack/bug/panels/timer_panel.rb",
-     "lib/rack/bug/params_signature.rb",
-     "lib/rack/bug/public/__rack_bug__/bookmarklet.html",
-     "lib/rack/bug/public/__rack_bug__/bookmarklet.js",
-     "lib/rack/bug/public/__rack_bug__/bug.css",
-     "lib/rack/bug/public/__rack_bug__/bug.js",
-     "lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js",
-     "lib/rack/bug/public/__rack_bug__/jquery.tablesorter.min.js",
-     "lib/rack/bug/public/__rack_bug__/spinner.gif",
-     "lib/rack/bug/render.rb",
-     "lib/rack/bug/toolbar.rb",
-     "lib/rack/bug/views/error.html.erb",
-     "lib/rack/bug/views/panels/active_record.html.erb",
-     "lib/rack/bug/views/panels/cache.html.erb",
-     "lib/rack/bug/views/panels/execute_sql.html.erb",
-     "lib/rack/bug/views/panels/explain_sql.html.erb",
-     "lib/rack/bug/views/panels/log.html.erb",
-     "lib/rack/bug/views/panels/profile_sql.html.erb",
-     "lib/rack/bug/views/panels/rails_info.html.erb",
-     "lib/rack/bug/views/panels/redis.html.erb",
-     "lib/rack/bug/views/panels/request_variables.html.erb",
-     "lib/rack/bug/views/panels/sql.html.erb",
-     "lib/rack/bug/views/panels/templates.html.erb",
-     "lib/rack/bug/views/panels/timer.html.erb",
-     "lib/rack/bug/views/panels/view_cache.html.erb",
-     "lib/rack/bug/views/redirect.html.erb",
-     "lib/rack/bug/views/toolbar.html.erb",
-     "rack-bug.gemspec",
-     "spec/fixtures/config.ru",
-     "spec/fixtures/dummy_panel.rb",
-     "spec/fixtures/sample_app.rb",
-     "spec/rack/bug/panels/active_record_panel_spec.rb",
-     "spec/rack/bug/panels/cache_panel_spec.rb",
-     "spec/rack/bug/panels/log_panel_spec.rb",
-     "spec/rack/bug/panels/memory_panel_spec.rb",
-     "spec/rack/bug/panels/rails_info_panel_spec.rb",
-     "spec/rack/bug/panels/redis_panel_spec.rb",
-     "spec/rack/bug/panels/sql_panel_spec.rb",
-     "spec/rack/bug/panels/templates_panel_spec.rb",
-     "spec/rack/bug/panels/timer_panel_spec.rb",
-     "spec/rack/toolbar_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "History.txt",
+    "MIT-LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "Thorfile",
+    "lib/rack/bug.rb",
+    "lib/rack/bug/filtered_backtrace.rb",
+    "lib/rack/bug/options.rb",
+    "lib/rack/bug/panel.rb",
+    "lib/rack/bug/panel_app.rb",
+    "lib/rack/bug/panels/active_record_panel.rb",
+    "lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb",
+    "lib/rack/bug/panels/cache_panel.rb",
+    "lib/rack/bug/panels/cache_panel/memcache_extension.rb",
+    "lib/rack/bug/panels/cache_panel/panel_app.rb",
+    "lib/rack/bug/panels/cache_panel/stats.rb",
+    "lib/rack/bug/panels/log_panel.rb",
+    "lib/rack/bug/panels/log_panel/rails_extension.rb",
+    "lib/rack/bug/panels/memory_panel.rb",
+    "lib/rack/bug/panels/rails_info_panel.rb",
+    "lib/rack/bug/panels/redis_panel.rb",
+    "lib/rack/bug/panels/redis_panel/redis_extension.rb",
+    "lib/rack/bug/panels/redis_panel/stats.rb",
+    "lib/rack/bug/panels/request_variables_panel.rb",
+    "lib/rack/bug/panels/sphinx_panel.rb",
+    "lib/rack/bug/panels/sphinx_panel/sphinx_extension.rb",
+    "lib/rack/bug/panels/sphinx_panel/stats.rb",
+    "lib/rack/bug/panels/sql_panel.rb",
+    "lib/rack/bug/panels/sql_panel/panel_app.rb",
+    "lib/rack/bug/panels/sql_panel/query.rb",
+    "lib/rack/bug/panels/sql_panel/sql_extension.rb",
+    "lib/rack/bug/panels/templates_panel.rb",
+    "lib/rack/bug/panels/templates_panel/actionview_extension.rb",
+    "lib/rack/bug/panels/templates_panel/rendering.rb",
+    "lib/rack/bug/panels/templates_panel/trace.rb",
+    "lib/rack/bug/panels/timer_panel.rb",
+    "lib/rack/bug/params_signature.rb",
+    "lib/rack/bug/public/__rack_bug__/bookmarklet.html",
+    "lib/rack/bug/public/__rack_bug__/bookmarklet.js",
+    "lib/rack/bug/public/__rack_bug__/bug.css",
+    "lib/rack/bug/public/__rack_bug__/bug.js",
+    "lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js",
+    "lib/rack/bug/public/__rack_bug__/jquery.tablesorter.min.js",
+    "lib/rack/bug/public/__rack_bug__/spinner.gif",
+    "lib/rack/bug/render.rb",
+    "lib/rack/bug/toolbar.rb",
+    "lib/rack/bug/views/error.html.erb",
+    "lib/rack/bug/views/panels/active_record.html.erb",
+    "lib/rack/bug/views/panels/cache.html.erb",
+    "lib/rack/bug/views/panels/execute_sql.html.erb",
+    "lib/rack/bug/views/panels/explain_sql.html.erb",
+    "lib/rack/bug/views/panels/log.html.erb",
+    "lib/rack/bug/views/panels/profile_sql.html.erb",
+    "lib/rack/bug/views/panels/rails_info.html.erb",
+    "lib/rack/bug/views/panels/redis.html.erb",
+    "lib/rack/bug/views/panels/request_variables.html.erb",
+    "lib/rack/bug/views/panels/sphinx.html.erb",
+    "lib/rack/bug/views/panels/sql.html.erb",
+    "lib/rack/bug/views/panels/templates.html.erb",
+    "lib/rack/bug/views/panels/timer.html.erb",
+    "lib/rack/bug/views/panels/view_cache.html.erb",
+    "lib/rack/bug/views/redirect.html.erb",
+    "lib/rack/bug/views/toolbar.html.erb",
+    "rack-bug.gemspec",
+    "spec/fixtures/config.ru",
+    "spec/fixtures/dummy_panel.rb",
+    "spec/fixtures/sample_app.rb",
+    "spec/rack/bug/panels/active_record_panel_spec.rb",
+    "spec/rack/bug/panels/cache_panel_spec.rb",
+    "spec/rack/bug/panels/log_panel_spec.rb",
+    "spec/rack/bug/panels/memory_panel_spec.rb",
+    "spec/rack/bug/panels/rails_info_panel_spec.rb",
+    "spec/rack/bug/panels/redis_panel_spec.rb",
+    "spec/rack/bug/panels/sql_panel_spec.rb",
+    "spec/rack/bug/panels/templates_panel_spec.rb",
+    "spec/rack/bug/panels/timer_panel_spec.rb",
+    "spec/rack/toolbar_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/brynary/rack-bug}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubyforge_project = %q{rack-bug}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Debugging toolbar for Rack applications implemented as middleware}
   s.test_files = [
     "spec/fixtures/dummy_panel.rb",
-     "spec/fixtures/sample_app.rb",
-     "spec/rack/bug/panels/active_record_panel_spec.rb",
-     "spec/rack/bug/panels/cache_panel_spec.rb",
-     "spec/rack/bug/panels/log_panel_spec.rb",
-     "spec/rack/bug/panels/memory_panel_spec.rb",
-     "spec/rack/bug/panels/rails_info_panel_spec.rb",
-     "spec/rack/bug/panels/redis_panel_spec.rb",
-     "spec/rack/bug/panels/sql_panel_spec.rb",
-     "spec/rack/bug/panels/templates_panel_spec.rb",
-     "spec/rack/bug/panels/timer_panel_spec.rb",
-     "spec/rack/toolbar_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/fixtures/sample_app.rb",
+    "spec/rack/bug/panels/active_record_panel_spec.rb",
+    "spec/rack/bug/panels/cache_panel_spec.rb",
+    "spec/rack/bug/panels/log_panel_spec.rb",
+    "spec/rack/bug/panels/memory_panel_spec.rb",
+    "spec/rack/bug/panels/rails_info_panel_spec.rb",
+    "spec/rack/bug/panels/redis_panel_spec.rb",
+    "spec/rack/bug/panels/sql_panel_spec.rb",
+    "spec/rack/bug/panels/templates_panel_spec.rb",
+    "spec/rack/bug/panels/timer_panel_spec.rb",
+    "spec/rack/toolbar_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
+      s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

data/spec/fixtures/config.ru

@@ -1,7 +1,9 @@
 require "rubygems"
+
+$LOAD_PATH.unshift File.dirname(__FILE__)
 require "sample_app"
 
-$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__)) + '/../../lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 require "rack/bug"
 
 use Rack::Bug, :password => "secret"

data/spec/fixtures/sample_app.rb

@@ -1,29 +1,30 @@
 require "sinatra/base"
 
-class SampleApp < Sinatra::Default
+class SampleApp < Sinatra::Base
 
   get "/redirect" do
     redirect "/"
   end
-  
+
   get "/error" do
     raise "Error!"
   end
-  
+
   get "/" do
     if params[:content_type]
       headers["Content-Type"] = params[:content_type]
     end
-    
+
     <<-HTML
       <html>
         <head>
         </head>
         <body>
           <p>Hello</p>
+          <p><a href="__rack_bug__/bookmarklet.html">Page with bookmarklet for enabling Rack::Bug</a></p>
         </body>
       </html>
     HTML
   end
-  
-end
+
+end

data/spec/rack/bug/panels/active_record_panel_spec.rb

@@ -4,27 +4,27 @@ module Rack::Bug
   describe ActiveRecordPanel do
     before do
       ActiveRecordPanel.reset
-      header "rack-bug.panel_classes", [ActiveRecordPanel]
+      rack_env "rack-bug.panel_classes", [ActiveRecordPanel]
     end
-    
+
     describe "heading" do
       it "displays the total number of instantiated AR objects" do
         ActiveRecordPanel.record("User")
         ActiveRecordPanel.record("Group")
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("2 AR Objects")
       end
     end
-    
+
     describe "content" do
       it "displays the count of instantiated objects for each class" do
         ActiveRecordPanel.record("User")
         ActiveRecordPanel.record("User")
         ActiveRecordPanel.record("Group")
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_row("#active_record", "User", "2")
         response.should have_row("#active_record", "Group", "1")
       end
     end
   end
-end
+end

data/spec/rack/bug/panels/cache_panel_spec.rb

@@ -4,156 +4,156 @@ module Rack::Bug
   describe CachePanel do
     before do
       CachePanel.reset
-      header "rack-bug.panel_classes", [CachePanel]
+      rack_env "rack-bug.panel_classes", [CachePanel]
     end
-    
+
     describe "heading" do
       it "displays the total memcache time" do
-        response = get "/"
+        response = get_via_rack "/"
         response.should have_heading("Cache: 0.00ms")
       end
     end
-    
+
     describe "content" do
       describe "usage table" do
         it "displays the total number of memcache calls" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
-          
+          response = get_via_rack "/"
+
           # This causes a bus error:
           # response.should have_selector("th:content('Total Calls') + td", :content => "1")
 
           response.should have_row("#cache_usage", "Total Calls", "1")
         end
-        
+
         it "displays the total memcache time" do
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "Total Time", "0.00ms")
         end
-        
+
         it "dispays the number of memcache hits" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "Hits", "0")
         end
-        
+
         it "displays the number of memcache misses" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "Misses", "1")
         end
-        
+
         it "displays the number of memcache gets" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "gets", "1")
         end
-        
+
         it "displays the number of memcache sets" do
           CachePanel.record(:set, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "sets", "1")
         end
-        
+
         it "displays the number of memcache deletes" do
           CachePanel.record(:delete, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "deletes", "1")
         end
-        
+
         it "displays the number of memcache get_multis" do
           CachePanel.record(:get_multi, "user:1", "user:2") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_usage", "get_multis", "1")
         end
       end
-      
+
       describe "breakdown" do
         it "displays each memcache operation" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_breakdown", "get")
         end
-        
+
         it "displays the time for each memcache call" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_breakdown", "user:1", TIME_MS_REGEXP)
         end
-        
+
         it "displays the keys for each memcache call" do
           CachePanel.record(:get, "user:1") { }
-          response = get "/"
+          response = get_via_rack "/"
           response.should have_row("#cache_breakdown", "user:1", "get")
         end
       end
     end
-    
+
     describe "expire_all" do
       before do
-        header "rack-bug.secret_key", 'abc'
+        rack_env "rack-bug.secret_key", 'abc'
       end
-      
+
       it "expires the cache keys" do
         Rails.stub!(:cache => mock("cache"))
         Rails.cache.should_receive(:delete).with("user:1")
         Rails.cache.should_receive(:delete).with("user:2")
         Rails.cache.should_receive(:delete).with("user:3")
         Rails.cache.should_receive(:delete).with("user:4")
-        
-        get "/__rack_bug__/delete_cache_list",
+
+        get_via_rack "/__rack_bug__/delete_cache_list",
           :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
           :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
       end
-      
+
       it "returns OK" do
         Rails.stub!(:cache => mock("cache", :delete => nil))
-        response = get "/__rack_bug__/delete_cache_list",
+        response = get_via_rack "/__rack_bug__/delete_cache_list",
           :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
           :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
         response.should contain("OK")
       end
     end
-    
+
     describe "expire" do
       before do
-        header "rack-bug.secret_key", 'abc'
+        rack_env "rack-bug.secret_key", 'abc'
       end
-      
+
       it "expires the cache key" do
         Rails.stub!(:cache => mock("cache"))
         Rails.cache.should_receive(:delete).with("user:1")
-        get "/__rack_bug__/delete_cache", :key => "user:1",
+        get_via_rack "/__rack_bug__/delete_cache", :key => "user:1",
           :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
       end
-      
+
       it "returns OK" do
         Rails.stub!(:cache => mock("cache", :delete => nil))
-        response = get "/__rack_bug__/delete_cache", :key => "user:1",
+        response = get_via_rack "/__rack_bug__/delete_cache", :key => "user:1",
           :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
         response.should contain("OK")
       end
     end
-    
+
     describe "view_cache" do
       before do
-        header "rack-bug.secret_key", 'abc'
+        rack_env "rack-bug.secret_key", 'abc'
       end
-      
+
       it "renders the cache key" do
         Rails.stub!(:cache => mock("cache", :read => "cache body"))
-        response = get "/__rack_bug__/view_cache", :key => "user:1",
+        response = get_via_rack "/__rack_bug__/view_cache", :key => "user:1",
           :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
         response.should contain("cache body")
       end
-      
+
       it "renders non-String cache values properly" do
         Rails.stub!(:cache => mock("cache", :read => [1, 2]))
-        response = get "/__rack_bug__/view_cache", :key => "user:1",
+        response = get_via_rack "/__rack_bug__/view_cache", :key => "user:1",
           :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
         response.should contain("[1, 2]")
       end
     end
 
   end
-end
+end