rack-insight 0.5.26 → 0.5.27

data/spec/rack/insight/panels/redis_panel_spec.rb

@@ -1,10 +1,23 @@
 require 'spec_helper'
 require 'rack/insight/panels/redis_panel'
 
+REDIS_INTERFACE = begin
+  # When Redis::Client is defined then Redis >= 3.0.0
+  if defined?(Redis::Client)
+    {  client:  'Redis::Client',
+       call_method: :call }
+  elsif defined?(Redis)
+    { client: 'Redis',
+      call_method: :call_command }
+  else
+    nil
+  end
+end
+
 module Rack::Insight
   describe "RedisPanel" do
     before do
-      reset_insight :panel_files => %w[redis_panel]
+      reset_insight :panel_classes => [Rack::Insight::RedisPanel]
     end
 
     describe "heading" do
@@ -17,7 +30,8 @@ module Rack::Insight
     describe "content" do
       describe "usage table" do
         it "displays the total number of redis calls" do
-          RedisPanel.record(["get, user:1"], Kernel.caller) { }
+          Kernel.const_get(REDIS_INTERFACE[:client]).send(REDIS_INTERFACE[:call_method], ["get, user:1"])
+
           response = get_via_rack "/"
 
           # This causes a bus error:
@@ -65,4 +79,4 @@ module Rack::Insight
       end
     end
   end
-end
+end unless REDIS_INTERFACE.nil?

data/spec/rack/insight/panels/speedtracer_panel_spec.rb

@@ -1,86 +1,87 @@
-require 'spec_helper'
-
-module Rack::Insight
-  describe "SpeedTracerPanel" do
-    before do
-      mock_constant("ActionView::Template")
-      reset_insight :panel_files => %w{speedtracer_panel}
-    end
-
-    describe "heading" do
-      it "lists traces" do
-        response = get_via_rack "/"
-        response.should have_heading("traces")
-      end
-    end
-
-    def mock_template(path)
-      template = stub("ActionView::Template")
-      template.stub!(:virtual_path => path)
-      template
-    end
-
-    describe "content", :pending => "time to build good Speedtracer tests" do
-      it "displays the template paths" do
-        app.before_return do
-          mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show"))
-        end
-        response = get_via_rack "/"
-        response.should contain("users/show")
-      end
-
-      it "displays the template children" do
-        app.before_return do
-          mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
-            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
-          end
-        end
-        response = get_via_rack "/"
-        response.should have_selector("li", :content => "users/show") do |li|
-          li.should contain("users/toolbar")
-        end
-      end
-
-      context "for templates that rendered templates" do
-        it "displays the total time" do
-          app.before_return do
-            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
-              mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
-            end
-          end
-
-          response = get_via_rack "/"
-          response.should have_selector("li", :content => "users/show") do |li|
-            li.should contain(TIME_MS_REGEXP)
-          end
-        end
-
-        it "displays the exclusive time" do
-          app.before_return do
-            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
-              mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
-            end
-          end
-
-          response = get_via_rack "/"
-          response.should have_selector("li", :content => "users/show") do |li|
-            li.should contain(/\d\.\d{2} exclusive/)
-          end
-        end
-      end
-
-      context "for leaf templates" do
-        it "does not display the exclusive time" do
-          app.before_return do
-            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show"))
-          end
-
-          response = get_via_rack "/"
-          response.should contain("users/show") do |li|
-            li.should_not contain("exclusive")
-          end
-        end
-      end
-    end
-  end
-end
+# The SpeedTracerPanel needs to be updated to follow the RackInsight pattern.  Until then there is no sense in these tests.
+#require 'spec_helper'
+#
+#module Rack::Insight
+#  describe "SpeedTracerPanel" do
+#    before do
+#      mock_constant("ActionView::Template")
+#      reset_insight :panel_files => %w{speedtracer_panel}
+#    end
+#
+#    describe "heading" do
+#      it "lists traces" do
+#        response = get_via_rack "/"
+#        response.should have_heading("traces")
+#      end
+#    end
+#
+#    def mock_template(path)
+#      template = double("ActionView::Template")
+#      template.stub!(:virtual_path => path)
+#      template
+#    end
+#
+#    describe "content", :pending => "time to build good Speedtracer tests" do
+#      it "displays the template paths" do
+#        app.before_return do
+#          mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show"))
+#        end
+#        response = get_via_rack "/"
+#        response.should contain("users/show")
+#      end
+#
+#      it "displays the template children" do
+#        app.before_return do
+#          mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
+#            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
+#          end
+#        end
+#        response = get_via_rack "/"
+#        response.should have_selector("li", :content => "users/show") do |li|
+#          li.should contain("users/toolbar")
+#        end
+#      end
+#
+#      context "for templates that rendered templates" do
+#        it "displays the total time" do
+#          app.before_return do
+#            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
+#              mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
+#            end
+#          end
+#
+#          response = get_via_rack "/"
+#          response.should have_selector("li", :content => "users/show") do |li|
+#            li.should contain(TIME_MS_REGEXP)
+#          end
+#        end
+#
+#        it "displays the exclusive time" do
+#          app.before_return do
+#            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
+#              mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
+#            end
+#          end
+#
+#          response = get_via_rack "/"
+#          response.should have_selector("li", :content => "users/show") do |li|
+#            li.should contain(/\d\.\d{2} exclusive/)
+#          end
+#        end
+#      end
+#
+#      context "for leaf templates" do
+#        it "does not display the exclusive time" do
+#          app.before_return do
+#            mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show"))
+#          end
+#
+#          response = get_via_rack "/"
+#          response.should contain("users/show") do |li|
+#            li.should_not contain("exclusive")
+#          end
+#        end
+#      end
+#    end
+#  end
+#end

data/spec/rack/insight/panels/sql_panel_spec.rb

@@ -5,7 +5,10 @@ module Rack::Insight
   describe "SQLPanel" do
     before do
       mock_constant("ActiveRecord::ConnectionAdapters::MysqlAdapter")
-      reset_insight :panel_files => %w{sql_panel}
+      # TODO: Figure out why panel_classes work here but panel_files does not.
+      #  reset_insight :panel_files => %w{sql_panel}
+      reset_insight :panel_classes => [Rack::Insight::SQLPanel]
+      app.insight_app.secret_key = "abc"
     end
 
     describe "heading" do
@@ -32,7 +35,7 @@ module Rack::Insight
           mock_method_call("ActiveRecord::ConnectionAdapters::MysqlAdapter", "execute", ["SELECT NOW();"])
         end
         response = get_via_rack "/"
-        response.should have_row("#sql", "SELECT NOW();")
+        response.should have_row("div.panel_content#SqlPanel", "SELECT NOW();")
       end
 
       it "displays the time of each executed SQL query" do
@@ -40,24 +43,24 @@ module Rack::Insight
           mock_method_call("ActiveRecord::ConnectionAdapters::MysqlAdapter", "execute", ["SELECT NOW();"])
         end
         response = get_via_rack "/"
-        response.should have_row("#sql", "SELECT NOW();", TIME_MS_REGEXP)
+        response.should have_row("div.panel_content#SqlPanel", "SELECT NOW();", TIME_MS_REGEXP)
       end
     end
 
     def stub_result(results = [[]])
       columns = results.first
-      fields = columns.map { |c| stub("field", :name => c) }
+      fields = columns.map { |c| double("field", :name => c) }
       rows = results[1..-1]
 
-      result = stub("result", :fetch_fields => fields)
-      result.stub!(:map).and_yield(rows)
+      result = double("result", :fetch_fields => fields)
+      result.stub(:map).and_yield(rows)
       return result
     end
 
     def expect_query(sql, results)
-      conn = stub("connection")
+      conn = double("connection")
       mock_constant("ActiveRecord::Base")
-      ActiveRecord::Base.stub!(:connection => conn)
+      ActiveRecord::Base.stub(:connection => conn)
       conn.should_receive(:execute).with(sql).and_return(stub_result(results))
     end
 

data/spec/rack/insight/panels/templates_panel_spec.rb

@@ -16,8 +16,8 @@ module Rack::Insight
     end
 
     def mock_template(path)
-      template = stub("ActionView::Template")
-      template.stub!(:virtual_path => path)
+      template = double("ActionView::Template")
+      template.stub(:virtual_path => path)
       template
     end
 
@@ -37,7 +37,7 @@ module Rack::Insight
           end
         end
         response = get_via_rack "/"
-        response.should have_selector("li", :content => "users/show") do |li|
+        response.should have_selector("div.panel_content#TemplatesPanel", :content => "users/show") do |li|
           li.should contain("users/toolbar")
         end
       end
@@ -51,12 +51,12 @@ module Rack::Insight
           end
 
           response = get_via_rack "/"
-          response.should have_selector("li", :content => "users/show") do |li|
+          response.should have_selector("div.panel_content#TemplatesPanel", :content => "users/show") do |li|
             li.should contain(TIME_MS_REGEXP)
           end
         end
 
-        it "displays the exclusive time" do
+        it "displays the exclusive and child times" do
           app.before_return do
             mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/show")) do
               mock_method_call("ActionView::Template", :render, [], :instance, mock_template("users/toolbar"))
@@ -64,8 +64,9 @@ module Rack::Insight
           end
 
           response = get_via_rack "/"
-          response.should have_selector("li", :content => "users/show") do |li|
-            li.should contain(/\d\.\d{2} exclusive/)
+          response.should have_selector("div.panel_content#TemplatesPanel", :content => "users/show") do |li|
+            li.should contain(/exclusive: \d\.\d{2}ms/)
+            li.should contain(/child: \d\.\d{2}ms/)
           end
         end
       end

data/spec/rack/insight/panels/timer_panel_spec.rb

@@ -17,22 +17,22 @@ module Rack::Insight
     describe "content" do
       it "displays the user CPU time" do
         response = get_via_rack "/"
-        response.should have_row("#timer", "User CPU time", TIME_MS_REGEXP)
+        response.should have_row("table.sortable", "User CPU time", TIME_MS_REGEXP)
       end
 
       it "displays the system CPU time" do
         response = get_via_rack "/"
-        response.should have_row("#timer", "System CPU time", TIME_MS_REGEXP)
+        response.should have_row("table.sortable", "System CPU time", TIME_MS_REGEXP)
       end
 
       it "displays the total CPU time" do
         response = get_via_rack "/"
-        response.should have_row("#timer", "Total CPU time", TIME_MS_REGEXP)
+        response.should have_row("table.sortable", "Total CPU time", TIME_MS_REGEXP)
       end
 
       it "displays the elapsed time" do
         response = get_via_rack "/"
-        response.should have_row("#timer", "Elapsed time", TIME_MS_REGEXP)
+        response.should have_row("table.sortable", "Elapsed time", TIME_MS_REGEXP)
       end
     end
   end

data/spec/spec_helper.rb

@@ -14,11 +14,11 @@ require "rack/insight/rspec_matchers"
 
 # Will use the default Ruby Logger.
 Rack::Insight::Config.configure do |config|
-  config[:verbosity] = Rack::Insight::Logging::VERBOSITY[:silent]
+  config[:verbosity] = Rack::Insight::Config::VERBOSITY[:silent]
   config[:log_level] = ::Logger::INFO
 end
 puts "Log Level for specs is #{::Logger::ERROR}"
-puts "Verbosity level for specs is #{Rack::Insight::Logging::VERBOSITY.select {|k,v| v == Rack::Insight::Config.verbosity }.keys.first.inspect} or #{Rack::Insight::Config.verbosity}"
+puts "Verbosity level for specs is #{Rack::Insight::Config::VERBOSITY.select {|k,v| v == Rack::Insight::Config.verbosity }.keys.first.inspect} or #{Rack::Insight::Config.verbosity}"
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -49,11 +49,13 @@ RSpec.configure do |config|
     @added_constants.clear
   end
 
-  def reset_insight(options=nil)
+  config.after :suite do
+    # Clear the database between runs
     system(*%w{rm -f rack-insight.sqlite})
-
     Rack::Insight::Database.reset
+  end
 
+  def reset_insight(options=nil)
     app.prototype
     app.insight_app.reset(options)
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-insight
 version: !ruby/object:Gem::Version
-  version: 0.5.26
-  prerelease: 
+  version: 0.5.27
 platform: ruby
 authors:
 - Peter Boling
@@ -12,207 +11,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.13
 - !ruby/object:Gem::Dependency
   name: roodi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: webrat
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
-description: ! "Debugging toolbar for Rack applications implemented as\n    middleware.
+        version: 0.6.0
+description: "Debugging toolbar for Rack applications implemented as\n    middleware.
   \ Based on logical-insight and rack-bug. "
 email:
 - peter.boling@gmail.com
-- evan@lrdesign.com
-- judson@lrdesign.com
-- bryan@brynary.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -222,6 +166,8 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - .simplecov
 - .travis.yml
 - CHANGELOG
@@ -242,6 +188,7 @@ files:
 - lib/rack/insight/instrumentation.rb
 - lib/rack/insight/instrumentation/backstage.rb
 - lib/rack/insight/instrumentation/client.rb
+- lib/rack/insight/instrumentation/eigen_client.rb
 - lib/rack/insight/instrumentation/instrument.rb
 - lib/rack/insight/instrumentation/package-definition.rb
 - lib/rack/insight/instrumentation/probe-definition.rb
@@ -354,28 +301,28 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: https://github.com/pboling/rack-insight
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Debugging toolbar for Rack applications implemented as middleware.
 test_files:
 - spec/custom_matchers.rb