stopwatch 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,17 @@
+bundler_args: --binstubs
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+
+script: "bundle exec rspec spec"    
+
+notifications:
+  recipients:
+    - markmulder@gmail.com
+
+branches:
+  only:
+    - master
+

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.4
+  * Only inserts code if the content-type is text/html or application/xhtml+xml
+
 v0.0.3
   * Displays every partial that was rendered and the amount of queries it used
 

data/Gemfile

@@ -7,4 +7,8 @@ gem "ffi", "1.0.9"
 
 gem "rspec-rails", ">= 2.0.0.beta"
 
+gem "ruby-debug", :platform => :ruby_18
+gem "linecache19", :platform => :ruby_19
+gem "ruby-debug19", :platform => :ruby_19
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stopwatch (0.0.2)
+    stopwatch (0.0.3)
 
 GEM
   remote: http://rubygems.org/
@@ -33,34 +33,36 @@ GEM
       activemodel (= 3.0.7)
       activesupport (= 3.0.7)
     activesupport (3.0.7)
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    culerity (0.2.15)
+    columnize (0.3.4)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (1.0.9)
     i18n (0.5.0)
-    json_pure (1.5.1)
+    json_pure (1.5.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    nokogiri (1.5.0)
     polyglot (0.3.1)
     rack (1.2.3)
     rack-mount (0.6.14)
@@ -80,23 +82,39 @@ GEM
       activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
+    rbx-require-relative (0.0.5)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rspec-rails (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.0)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -104,7 +122,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -114,7 +132,10 @@ PLATFORMS
 DEPENDENCIES
   capybara
   ffi (= 1.0.9)
+  linecache19
   rails (= 3.0.7)
   rspec-rails (>= 2.0.0.beta)
+  ruby-debug
+  ruby-debug19
   sqlite3
   stopwatch!

data/lib/load_speed.rb

@@ -8,7 +8,7 @@ module Rack
       env.delete("HTTP_IF_NONE_MATCH")
       status, headers, response = @app.call(env)
 
-      if status == 200
+      if status == 200 && headers["Content-Type"] =~ /text\/html|application\/xhtml\+xml/
         body = ""
         response.each {|part| body << part}
         index = body.rindex("</body>")
@@ -25,10 +25,12 @@ module Rack
   protected
 
     def performance_code
-      events = "<table><tr><td>view</td><td>duration</td><td>queries</td></tr>"
-      StopwatchLog.events.each do |event|
+      events = "<table id='performance_table'><tr><td></td><td>duration (ms)</td><td>queries</td></tr>"
+      Stopwatch::Log.events.each do |event|
         events << "<tr><td>#{event.template}</td><td>#{event.duration}</td><td>#{event.query_count}</td></tr>"
       end
+      event = Stopwatch::Log.event
+      events << "<tr><td>#{event.payload[:path]}</td><td>#{event.duration}</td><td>#{Stopwatch::Log.query_count}</td></tr>"
       events << "</table>"
 
       html = <<-EOF
@@ -39,6 +41,7 @@ module Rack
     top: 0;
     right: 0;
     height: 25px;
+    width: 140px;
     overflow: hidden;
     background-color: #DE7A93;
     color: white;
@@ -54,10 +57,17 @@ module Rack
     width: auto;
     padding-bottom: 10px;
   }
+
+  table#performance_table {
+  }
+
+  table#performance_table td {
+    padding-right: 15px;
+  }
 </style>
 <div id="performance_code">
-  <strong>#{StopwatchLog.event.duration.to_i}</strong> ms
-  <strong>#{StopwatchLog.query_count}</strong> queries
+  <strong>#{Stopwatch::Log.event.duration.to_i}</strong> ms
+  <strong>#{Stopwatch::Log.query_count}</strong> queries
   #{events}
 </div>
 EOF

data/lib/stopwatch.rb

@@ -1,32 +1,39 @@
 require 'load_speed'
-require 'stopwatch_log'
-require 'stopwatch_event'
+require 'stopwatch/log'
+require 'stopwatch/event'
 
 module Stopwatch
   class Railtie < Rails::Railtie
     initializer "newplugin.initialize" do |app|
       app.config.middleware.use "Rack::LoadSpeed"
 
+      # Start processing
       ActiveSupport::Notifications.subscribe "start_processing.action_controller" do |*args|
-        StopwatchLog.reset_query_count
-        StopwatchLog.reset_events
+        Stopwatch::Log.reset_query_count
+        Stopwatch::Log.reset_sub_query_count
+        Stopwatch::Log.reset_events
       end
 
-      ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
-        StopwatchLog.event = ActiveSupport::Notifications::Event.new(*args)
+      # Every query
+      ActiveSupport::Notifications.subscribe "sql.active_record" do |name, start, finish, id, payload|
+        if payload[:name] != "CACHE"
+          Stopwatch::Log.increment_query_count
+          Stopwatch::Log.increment_sub_query_count
+        end
       end
 
-      ActiveSupport::Notifications.subscribe "sql.active_record" do |name, start, finish, id, payload|
-        StopwatchLog.increment_query_count if payload[:name] != "CACHE"
-        StopwatchLog.increment_sub_query_count if payload[:name] != "CACHE"
+      # Every partial render
+      ActiveSupport::Notifications.subscribe(/render/) do |name, start, finish, id, payload|
+        event = ActiveSupport::Notifications::Event.new(name, start, finish, id, payload)
+        stopwatch_event = Stopwatch::Event.new(event)
+        stopwatch_event.query_count = Stopwatch::Log.sub_query_count
+        Stopwatch::Log.events << stopwatch_event
+        Stopwatch::Log.reset_sub_query_count
       end
 
-      ActiveSupport::Notifications.subscribe "render_partial.action_view" do |*args|
-        event = ActiveSupport::Notifications::Event.new(*args)
-        stopwatch_event = StopwatchEvent.new(event)
-        stopwatch_event.query_count = StopwatchLog.sub_query_count
-        StopwatchLog.events << stopwatch_event
-        StopwatchLog.reset_sub_query_count
+      # End of processing
+      ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
+        Stopwatch::Log.event = ActiveSupport::Notifications::Event.new(*args)
       end
     end
   end

data/lib/stopwatch/event.rb

@@ -0,0 +1,21 @@
+module Stopwatch
+  class Event
+    attr_accessor :query_count
+
+    def initialize(event)
+      @event = event
+    end
+
+    def template
+      if @event.payload[:virtual_path]
+        @event.payload[:virtual_path]
+      else
+        @event.payload[:identifier].gsub(/.*\/app\/views\//, "")
+      end
+    end
+
+    def duration
+      @event.duration.round(2)
+    end
+  end
+end

data/lib/stopwatch/log.rb

@@ -0,0 +1,39 @@
+module Stopwatch
+  class Log
+    @@query_count = 0
+    @@sub_query_count = 0
+    @@events = []
+
+    cattr_accessor :event
+    cattr_accessor :events
+    cattr_accessor :query_count
+
+    def self.query_count
+      @@query_count
+    end
+
+    def self.sub_query_count
+      @@sub_query_count
+    end
+
+    def self.reset_query_count
+      @@query_count = 0
+    end
+
+    def self.reset_sub_query_count
+      @@sub_query_count = 0
+    end
+
+    def self.increment_query_count
+      @@query_count += 1
+    end
+
+    def self.increment_sub_query_count
+      @@sub_query_count += 1
+    end
+
+    def self.reset_events
+      @@events = []
+    end
+  end
+end

data/lib/stopwatch/version.rb

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

data/spec/dummy/app/controllers/welcome_controller.rb

@@ -1,4 +1,9 @@
 class WelcomeController < ApplicationController
   def index
   end
+
+  def javascript_test
+    headers['Content-Type'] = 'application/x-javascript'
+    render :file => "#{Rails.root}/public/javascripts/test.js", :layout => false
+  end
 end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
   root :to => "welcome#index"
+  match '/javascript_test', :to => "welcome#javascript_test"
 end

data/spec/dummy/public/javascripts/test.js

@@ -0,0 +1 @@
+str = "<body> this is a test</body>";

data/spec/integration/stopwatch_spec.rb

@@ -1,10 +1,15 @@
 require 'spec_helper'
 
 describe "Navigation" do
-  include Capybara
+  include Capybara::DSL
 
   it "renders the stopwatch box" do
     visit "/"
     page.should have_css("#performance_code")
   end
+
+  it "does not insert html" do
+    visit "/javascript_test"
+    page.should_not have_css("#performance_code")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stopwatch
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mark Mulder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -37,9 +38,9 @@ files:
 - Rakefile
 - lib/load_speed.rb
 - lib/stopwatch.rb
+- lib/stopwatch/event.rb
+- lib/stopwatch/log.rb
 - lib/stopwatch/version.rb
-- lib/stopwatch_event.rb
-- lib/stopwatch_log.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/welcome_controller.rb
@@ -66,6 +67,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/javascripts/test.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/integration/stopwatch_spec.rb
@@ -133,6 +135,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/javascripts/test.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/integration/stopwatch_spec.rb

data/lib/stopwatch_event.rb

@@ -1,15 +0,0 @@
-class StopwatchEvent
-  attr_accessor :query_count
-
-  def initialize(event)
-    @event = event
-  end
-
-  def template
-    @event.payload[:identifier].gsub(/.*\/app\/views\//, "")
-  end
-
-  def duration
-    @event.duration.round(2)
-  end
-end

data/lib/stopwatch_log.rb

@@ -1,36 +0,0 @@
-class StopwatchLog
-  @@query_count = 0
-  @@sub_query_count = 0
-  @@events = []
-
-  cattr_accessor :event
-  cattr_accessor :events
-
-  def self.query_count
-    @@query_count
-  end
-
-  def self.sub_query_count
-    @@sub_query_count
-  end
-
-  def self.reset_query_count
-    @@query_count = 0
-  end
-
-  def self.reset_sub_query_count
-    @@sub_query_count = 0
-  end
-
-  def self.increment_query_count
-    @@query_count += 1
-  end
-
-  def self.increment_sub_query_count
-    @@sub_query_count += 1
-  end
-
-  def self.reset_events
-    @@events = []
-  end
-end