rack-insight 0.5.26 → 0.5.27

data/lib/rack/insight/panels/log_panel.rb

@@ -1,8 +1,9 @@
 module Rack::Insight
   class LogPanel < Panel
     class LogEntry
+      # TODO: Update this to the Rack::Insight panel format
       attr_reader :level, :time, :message
-      LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL']
+      LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] unless defined?(LEVELS)
 
       def initialize(level, time, message)
         @level = LEVELS[level]

data/lib/rack/insight/panels/redis_panel.rb

@@ -2,26 +2,6 @@ module Rack::Insight
   class RedisPanel < Panel
     require "rack/insight/panels/redis_panel/stats"
 
-    def initialize(app)
-      super
-
-      unless is_probing?
-        probe(self) do
-          if defined?(Redis::Client)
-            # Redis >= 3.0.0
-            instrument "Redis::Client" do
-              instance_probe :call
-            end
-          elsif defined?(Redis)
-            # Redis < 3.0.0
-            instrument "Redis" do
-              instance_probe :call_command
-            end
-          end
-        end
-      end
-    end
-
     def request_start(env, start)
       @stats = Stats.new
     end

data/lib/rack/insight/panels/redis_panel/stats.rb

@@ -30,6 +30,7 @@ module Rack::Insight
 
       def record_call(time, command_args, method_call)
         @queries << Query.new(time, command_args, method_call)
+        puts "Recorded Redis Call: #{@queries.inspect}"
         @calls += 1
         @time += time
       end

data/lib/rack/insight/panels/speedtracer_panel.rb

@@ -9,6 +9,9 @@ require 'rack/insight/panels/speedtracer_panel/tracer'
 
 module Rack::Insight
   module SpeedTracer
+    # TODO Refactor this class name...
+    # TODO: Fix indentation of this class.
+    # TODO: Update this class to Rack::Insight pattern.
     class Panel < ::Rack::Insight::Panel
 
     def initialize(app)

data/lib/rack/insight/params_signature.rb

@@ -6,14 +6,15 @@ module Rack::Insight
     extend ERB::Util
 
     def self.sign(request, hash)
+      #puts "ParamsSignature#sign called!: #{caller.first}"
       parts = []
 
       hash.keys.sort.each do |key|
         parts << "#{key}=#{u(hash[key])}"
       end
 
-      signature = new(request).signature(hash)
-      parts << "hash=#{u(signature)}"
+      hancock = new(request).signature(hash)
+      parts << "hash=#{u(hancock)}"
 
       parts.join("&amp;")
     end
@@ -36,6 +37,7 @@ module Rack::Insight
       if secret_key_blank?
         raise SecurityError.new("Missing secret key")
       elsif request.params["hash"] != signature(request.params)
+        #puts "request params hash: #{request.params}\nsignature: #{signature(request.params)}"
         raise SecurityError.new("Invalid query hash.")
       end
     end
@@ -45,15 +47,15 @@ module Rack::Insight
     end
 
     def signature_base(params)
-      signature = []
-      signature << secret_key
+      hancock = []
+      hancock << secret_key
 
       params.keys.sort.each do |key|
         next if key == "hash"
-        signature << params[key].to_s
+        hancock << params[key].to_s
       end
 
-      signature.join(":")
+      hancock.join(":")
     end
 
   end

data/lib/rack/insight/rspec_matchers.rb

@@ -17,6 +17,22 @@ module Rack::Insight
       end
     end
 
+    RSpec::Matchers.define :have_li do |container, key, value|
+      match do |response|
+        if value
+          response.should have_selector("#{container} li", :content => key) do |row|
+            row.should contain(value)
+          end
+        else
+          response.should have_selector("#{container} li", :content => key)
+        end
+      end
+
+      failure_message_for_should do |response|
+        "Expected: \n#{response.body}\nto have a li matching #{key}"
+      end
+    end
+
     RSpec::Matchers.define :have_heading do |text|
       match do |response|
         response.should have_selector("#rack-insight_toolbar li") do |heading|

data/lib/rack/insight/toolbar.rb

@@ -26,6 +26,7 @@ module Rack::Insight
 
     def okay_to_modify?(env, response)
       req = Rack::Request.new(env)
+      return false unless response.content_type.respond_to?(:split)
       content_type, charset = response.content_type.split(";")
 
       response.ok? && MIME_TYPES.include?(content_type) && !req.xhr?

data/lib/rack/insight/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Insight
 
-  VERSION = '0.5.26'
+  VERSION = '0.5.27'
 
   end
 end

data/rack-insight.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = Rack::Insight::VERSION
 
   s.authors = ["Peter Boling", "Evan Dorn", "Judson Lester", "Bryan Helmkamp"]
-  s.email = %w{peter.boling@gmail.com evan@lrdesign.com judson@lrdesign.com bryan@brynary.com}
+  s.email = %w{peter.boling@gmail.com}
   s.extra_rdoc_files = [
     "README.md",
     "LICENSE",
@@ -18,6 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.licenses = ["MIT"]
+  s.platform = Gem::Platform::RUBY
+
   s.homepage      = "https://github.com/pboling/rack-insight"
   s.summary = %q{Debugging toolbar for Rack applications implemented as
     middleware.}
@@ -27,13 +30,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("rack")
   s.add_runtime_dependency("uuidtools", ">= 2.1.2") # incurs far fewer dependencies that the uuid gem, and no shell forking
   s.add_runtime_dependency("sqlite3", ">= 1.3.3")
-  s.add_development_dependency "redcarpet"
-  s.add_development_dependency(%q<reek>, [">= 1.2.8"])
-  s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
-  s.add_development_dependency(%q<rake>, [">= 0"])
-  s.add_development_dependency "rspec", ">= 2.11.0"
-  s.add_development_dependency "sinatra"
-  s.add_development_dependency "webrat"
-  s.add_development_dependency "debugger", ">= 1.5.0"
-  s.add_development_dependency "gem-release", ">= 0.5.2"
+  #s.add_development_dependency "redcarpet", ">= 3.0.0"
+  s.add_development_dependency(%q<reek>, [">= 1.2.13"])
+  s.add_development_dependency(%q<roodi>, [">= 2.2.0"])
+  s.add_development_dependency(%q<rake>, [">= 10.1.0"])
+  s.add_development_dependency "rspec", ">= 2.14.1"
+  s.add_development_dependency "sinatra", ">= 1.4.3"
+  s.add_development_dependency "webrat", ">= 0.7.3"
+  #s.add_development_dependency "debugger", ">= 1.6.1"
+  s.add_development_dependency "gem-release", ">= 0.6.0"
 end

data/spec/insight_spec.rb

@@ -142,22 +142,25 @@ describe Rack::Insight do
     end
   end
 
-  context "configured with a SQLite database file path" do
-    before do
-      # We need to pass the SQLite database file path to the gem
-      require 'fileutils'
-      FileUtils.rm_rf("my_custom_db_path.sqlite") #because it doesn't count if it's already there
-      reset_insight :database_path => 'my_custom_db_path.sqlite'
-    end
-
-    it "should create a database at the path specified in the options" do
-      File.exist?('my_custom_db_path.sqlite').should be_true
-    end
-
-    after do
-      FileUtils.rm_rf("my_custom_db_path.sqlite")
-      reset_insight :database_path => nil
-    end
-
-  end
+  # These specs are no longer applicable, since reset_insight no longer clears the sqlite database.
+  # Clearing of the database is now accomplished in a *config.after :suite do* block
+
+  #context "configured with a SQLite database file path" do
+  #  before do
+  #    # We need to pass the SQLite database file path to the gem
+  #    require 'fileutils'
+  #    FileUtils.rm_rf("my_custom_db_path.sqlite") #because it doesn't count if it's already there
+  #    reset_insight :database_path => 'my_custom_db_path.sqlite'
+  #  end
+  #
+  #  it "should create a database at the path specified in the options" do
+  #    File.exist?('my_custom_db_path.sqlite').should be_true
+  #  end
+  #
+  #  after do
+  #    FileUtils.rm_rf("my_custom_db_path.sqlite")
+  #    reset_insight :database_path => nil
+  #  end
+  #
+  #end
 end

data/spec/instrumentation_spec.rb

@@ -35,14 +35,57 @@ class Two < One
   end
 end
 
+class Probeable
+  include Rack::Insight::Instrumentation::Client
+  class << self
+    include Rack::Insight::Instrumentation::EigenClient
+  end
+end
+
+module MyEigenClient;
+  def self.included(base)
+    base.send(:attr_accessor, :is_probed)
+  end
+end
+module MyClient; def probe; "anal probe is #{self.class.is_probed}"; end; end
+class MyPanel; include MyClient; class << self; include MyEigenClient; end; end
+class MyPanel2; include MyClient; class << self; include MyEigenClient; end; end
+
+describe "Validate Client Design" do
+  it "MyPanel instance should respond to probe" do
+    MyPanel.new.respond_to?(:probe).should be_true
+  end
+  it "MyPanel#probe should return 'anal_probe is '" do
+    MyPanel.new.probe.should == 'anal probe is '
+  end
+  it "MyPanel class should respond to is_probed" do
+    MyPanel.respond_to?(:is_probed).should be_true
+  end
+  it "MyPanel.is_probed should default to nil" do
+    MyPanel.is_probed.should == nil
+  end
+  it "MyPanel.is_probed should be settable" do
+    MyPanel.is_probed = 'fat mojo'
+    MyPanel.is_probed.should == 'fat mojo'
+    MyPanel.new.probe.should == 'anal probe is fat mojo'
+  end
+  it "MyPanel2.is_probed should not interfere with MyPanel.is_probed" do
+    MyPanel.is_probed = 'fat mojo'
+    MyPanel2.is_probed = 'nice banana'
+    MyPanel.is_probed.should == 'fat mojo'
+    MyPanel2.is_probed.should == 'nice banana'
+    MyPanel.new.probe.should == 'anal probe is fat mojo'
+    MyPanel2.new.probe.should == 'anal probe is nice banana'
+  end
+end
+
 describe "Setting up probes" do
   let :method_calls do [] end
   let :method_subject do [] end
   let :recording_list do [] end
 
   let :test_collector do
-    collector = Object.new
-    collector.extend Rack::Insight::Instrumentation::Client
+    collector = Probeable.new
     collector.instance_variable_set("@calls", method_calls)
     def collector.after_detect(method_call, timing, arguments, results)
       @calls << [method_call, timing, arguments, results]

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

@@ -5,14 +5,14 @@ module Rack::Insight
   describe "ActiveRecordPanel" do
     before do
       mock_constant("ActiveRecord::Base")
-      reset_insight :panel_files => %w{active_record_panel}
+      reset_insight :panel_classes => [Rack::Insight::ActiveRecordPanel]
     end
 
     def mock_model(name)
-      model = stub("model")
-      model.stub!(:name => name)
-      obj = stub(name)
-      obj.stub!(:base_class => model)
+      model = double("model")
+      model.stub(:name => name)
+      obj = double(name)
+      obj.stub(:base_class => model)
       obj
     end
 
@@ -36,8 +36,8 @@ module Rack::Insight
           mock_method_call("ActiveRecord::Base", "allocate", [], :class, mock_model("Group"))
         end
         response = get_via_rack "/"
-        response.should have_row("#active_record", "User", "2")
-        response.should have_row("#active_record", "Group", "1")
+        response.should have_row("#ActiveRecordPanel", "User", "2")
+        response.should have_row("#ActiveRecordPanel", "Group", "1")
       end
     end
   end

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

@@ -8,10 +8,10 @@ module Rack::Insight
     end
 
     def mock_model(name)
-      model = stub("model")
-      model.stub!(:name => name)
-      obj = stub(name)
-      obj.stub!(:base_class => model)
+      model = double("model")
+      model.stub(:name => name)
+      obj = double(name)
+      obj.stub(:base_class => model)
       obj
     end
 

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

@@ -122,7 +122,7 @@ module Rack::Insight
 
       describe "expire_all" do
         it "expires the cache keys" do
-          Rails.stub!(:cache => mock("cache"))
+          Rails.stub(:cache => double("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")
@@ -134,7 +134,7 @@ module Rack::Insight
         end
 
         it "returns OK" do
-          Rails.stub!(:cache => mock("cache", :delete => nil))
+          Rails.stub(:cache => double("cache", :delete => nil))
           response = get_via_rack "/__insight__/delete_cache_list",
             :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
             :hash => Digest::SHA1.hexdigest("abc:user:1:user:2:user:3:user:4")
@@ -144,14 +144,14 @@ module Rack::Insight
 
       describe "expire" do
         it "expires the cache key" do
-          Rails.stub!(:cache => mock("cache"))
+          Rails.stub(:cache => double("cache"))
           Rails.cache.should_receive(:delete).with("user:1")
           get_via_rack "/__insight__/delete_cache", :key => "user:1",
             :hash => Digest::SHA1.hexdigest("abc:user:1")
         end
 
         it "returns OK" do
-          Rails.stub!(:cache => mock("cache", :delete => nil))
+          Rails.stub(:cache => double("cache", :delete => nil))
           response = get_via_rack "/__insight__/delete_cache", :key => "user:1",
             :hash => Digest::SHA1.hexdigest("abc:user:1")
           response.should contain("OK")
@@ -160,14 +160,14 @@ module Rack::Insight
 
       describe "view_cache" do
         it "renders the cache key" do
-          Rails.stub!(:cache => mock("cache", :read => "cache body"))
+          Rails.stub(:cache => double("cache", :read => "cache body"))
           response = get_via_rack "/__insight__/view_cache", :key => "user:1",
             :hash => Digest::SHA1.hexdigest("abc:user:1")
           response.should contain("cache body")
         end
 
         it "renders non-String cache values properly" do
-          Rails.stub!(:cache => mock("cache", :read => [1, 2]))
+          Rails.stub(:cache => double("cache", :read => [1, 2]))
           response = get_via_rack "/__insight__/view_cache", :key => "user:1",
             :hash => Digest::SHA1.hexdigest("abc:user:1")
           response.should contain("[1, 2]")

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

@@ -14,21 +14,19 @@ module Rack::Insight
       end
     end
 
-    describe "content" do
-      it "displays recorded log lines" do
-        app.before_return do
-          mock_method_call("Logger", "add", [0, "This is a logged message"])
-        end
-        response = get_via_rack "/"
-        response.should contain("This is a logged message")
-        response.should contain("DEBUG")
-      end
-    end
+    #describe "content" do
+    #  it "displays recorded log lines" do
+    #    Rack::Insight::Config.logger.fatal("This is a logged message")
+    #    response = get_via_rack "/"
+    #    response.should contain("This is a logged message")
+    #    response.should contain("DEBUG")
+    #  end
+    #end
 
     describe "Extended Logger" do
       it "does still return true/false for #add if class Logger" do
         #AS::BufferedLogger returns the added string, Logger returns true/false
-        LOGGER.add(0, "foo").should  == true
+        LOGGER.add(0, "foo").should == true
       end
     end
 

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Rack::Insight
   describe "MemoryPanel" do
-    before do
+    before(:each) do
       reset_insight :panel => [Rack::Insight::MemoryPanel]
     end
 

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

@@ -7,12 +7,12 @@ module Rack::Insight
       mock_constant("Rails::Info")
       reset_insight :panel_classes => [Rack::Insight::RailsInfoPanel]
 
-      Rails::Info.stub!(:properties => [])
+      Rails::Info.stub(:properties => [])
     end
 
     describe "heading" do
       it "displays the Rails version" do
-        Rails.stub!(:version => "v2.3.0")
+        Rails.stub(:version => "v2.3.0")
         response = get_via_rack "/"
         response.should have_heading("Rails v2.3.0")
       end
@@ -20,10 +20,10 @@ module Rack::Insight
 
     describe "content" do
       it "displays the Rails::Info properties" do
-        Rails.stub!(:version => "v2.3.0")
-        Rails::Info.stub!(:properties => [["Name", "Value"]])
+        Rails.stub(:version => "v2.3.0")
+        Rails::Info.stub(:properties => [["CaptainKirkIs", "ClimbingTheMountain"]])
         response = get_via_rack "/"
-        response.should have_row("#rails_info", "Name", "Value")
+        response.should have_row("#RailsInfoPanel", "CaptainKirkIs", "ClimbingTheMountain")
       end
     end
   end