fiveruns_tuneup 0.8.8 → 0.8.9

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.8.9. Fixed broken rendering of TuneUp stack information when serving xhtml strict pages with a content-type of application/xhtml+xml.
+
 v0.8.8. Fixed login broken when serving pages as xhtml strict.  Filtered params logged to tuneup.log.  TuneUp partials now rendered with exlicit extensions (.html.erb).
 
 v0.8.7. Sandboxed javascript for non-Prototype apps (Thanks, Howard Rauscher). The tuneup.log now written explicitly to RAILS_ROOT/log.  Removed History.rdoc in favor of CHANGELOG.

data/fiveruns_tuneup.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Fiveruns_tuneup-0.8.8
+# Gem::Specification for Fiveruns_tuneup-0.8.9
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{fiveruns_tuneup}
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["FiveRuns Development Team"]
-  s.date = %q{2008-06-18}
+  s.date = %q{2008-06-27}
   s.default_executable = %q{fiveruns_tuneup}
   s.description = %q{Instrumentation for the FiveRuns TuneUp product.}
   s.email = %q{dev@fiveruns.com}

data/lib/fiveruns/tuneup/configuration.rb

@@ -2,6 +2,14 @@ module Fiveruns::Tuneup
   
   class Configuration
     
+    attr_writer :log_directory
+    def log_directory
+      @log_directory ||= begin
+        rails_log = RAILS_DEFAULT_LOGGER.instance_eval { @log.path rescue @logdev.filename }
+        File.dirname(rails_log)
+      end
+    end
+    
     def environments
       @environments ||= %w(development)
     end

data/lib/fiveruns/tuneup/environment.rb

@@ -15,7 +15,7 @@ module Fiveruns
       end
       
       def rails_version
-        ::Rails::VERSION::STRING rescue 'unknown Rails version'
+        Fiveruns::Tuneup::Version.rails.to_s
       end
       
       def application_name

data/lib/fiveruns/tuneup/instrumentation/action_view/base.rb

@@ -42,7 +42,12 @@ module Fiveruns
               options = args.first || {}
               path = case options
               when String
-                "Render #{options}"
+                # Pre-Rails 2.1, don't record this as it causes duplicate records 
+                if Fiveruns::Tuneup::Version.rails < Fiveruns::Tuneup::Version.new(2,1,0)
+                  record = false
+                else
+                  "Render #{options}"                  
+                end
               when :update
                 name = block.to_s.split('/').last.split(':').first rescue ''
                 "Render page update #{name}"
@@ -50,8 +55,13 @@ module Fiveruns
                 if options[:file]
                   "Render #{options[:file]}"
                 elsif options[:partial]
-                  # Don't record this as it causes duplicate records
-                  record = false
+                  # Pre-Rails 2.1, don't record this as it causes duplicate records                                      
+                  if Fiveruns::Tuneup::Version.rails < Fiveruns::Tuneup::Version.new(2,1,0)
+                    record = false
+                  else
+                    # TODO: normalize this partial path
+                    "Render partial #{options[:partial]}"
+                  end
                 elsif options[:inline]
                   "Render inline"
                 elsif options[:text]

data/lib/fiveruns/tuneup/version.rb

@@ -30,11 +30,20 @@ module Fiveruns
     # +tiny+ (or +patch+) number.
     class Version
     
+      include Comparable
+      
       # A convenience method for instantiating a new Version instance with the
       # given +major+, +minor+, and +tiny+ components.
       def self.[](major, minor, tiny)
         new(major, minor, tiny)
       end
+      
+      def self.rails
+        @rails ||= begin
+          # handle ::Rails::VERSION not being set
+          Version.new(::Rails::VERSION::MAJOR, ::Rails::VERSION::MINOR, ::Rails::VERSION::TINY) rescue Version.new(0,0,0)
+        end
+      end
 
       attr_reader :major, :minor, :tiny
 
@@ -66,7 +75,7 @@ module Fiveruns
 
       MAJOR = 0
       MINOR = 8
-      TINY  = 8
+      TINY  = 9
 
       # The current version as a Version instance
       CURRENT = new(MAJOR, MINOR, TINY)

data/lib/fiveruns/tuneup.rb

@@ -7,9 +7,7 @@ require File.dirname(__FILE__) << '/tuneup/step'
 
 module Fiveruns
   module Tuneup
-    
-    LOGGER = Logger.new(File.join(RAILS_ROOT || '', "log/tuneup.log"))
-        
+            
     class << self
       
       include Fiveruns::Tuneup::Urls
@@ -23,6 +21,13 @@ module Fiveruns
       attr_accessor :running
       attr_reader :trend
       
+      def logger
+        @logger ||= returning Logger.new(log_file) do |l|
+          RAILS_DEFAULT_LOGGER.info(log_format % "Logging in #{log_file}")
+          l.level = Logger::INFO
+        end
+      end
+      
       def run(controller, request)
         @running = (!controller.is_a?(TuneupController) && !request.xhr?)
         result = nil
@@ -90,10 +95,10 @@ module Fiveruns
           load_configuration_file
           if configuration.instrument?
             yield
-            log :info, "Starting..."
             install_instrumentation
             log :debug, "Using collector at #{collector_url}"
             log :debug, "Using frontend at #{frontend_url}"
+            log :info, "Started."
           else
             log :warn, "Not configured to run in #{RAILS_ENV} environment, aborting."
           end
@@ -101,14 +106,22 @@ module Fiveruns
       end
             
       def log(level, text)
-        message = "FiveRuns TuneUp (v#{Fiveruns::Tuneup::Version::STRING}): #{text}"
-        LOGGER.send(level, message)
+        message = log_format % text
+        logger.send(level, message)
         STDERR.puts message if level == :error
       end
       
       #######
       private
       #######
+      
+      def log_file
+        File.join(configuration.log_directory, "tuneup.log")
+      end
+      
+      def log_format
+        "FiveRuns TuneUp (v#{Fiveruns::Tuneup::Version::STRING}): %s"
+      end
             
       def configuration_file
         File.join(RAILS_ROOT, 'config/tuneup.rb')

data/lib/tuneup_helper.rb

@@ -83,7 +83,9 @@ module TuneupHelper #:nodoc:
   end
   
   def sql_link(step)
-    link_to_function(image_tag('/images/tuneup/magnify.png', :alt => 'Query'), :class => 'tuneup-sql tuneup-halo', :title => 'View Query') { |p| p[dom_id(step, :sql)].toggle }
+    link_to_function(image_tag('/images/tuneup/magnify.png', :alt => 'Query'), :class => 'tuneup-sql tuneup-halo', :title => 'View Query') do |page| 
+      page << %(TuneUpSandbox.$("#{dom_id(step, :sql)}").toggle(); return false;)
+    end
   end
   
   def link_to_schema(text, table, html_options={})

data/views/tuneup/_schema.html.erb

@@ -1,7 +1,7 @@
 <div id='tuneup-schema' style='display:none;'>
   <% Fiveruns::Tuneup.schemas.each do |table, schema| %>
     <div id='tuneup-schema-table-<%= table %>' class='tuneup-schema-table' style='display:none;'>
-      <h3>Schema for &ldquo;<%= table %>&rdquo;</h3>
+      <h3>Schema for '<%= table %>'</h3>
       <table>
         <tr>
           <th>Name</th><th>Type</th>

data/views/tuneup/panel/_registered.html.erb

@@ -1,4 +1,4 @@
 <div id='tuneup-panel'>
-  <%= render(:partial => 'data') if !tuneup_data.blank? && tuneup_collecting? %>
-  <%= render :partial => 'link' %>
+  <%= render(:partial => 'data.html.erb') if !tuneup_data.blank? && tuneup_collecting? %>
+  <%= render :partial => 'link.html.erb' %>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns_tuneup
 version: !ruby/object:Gem::Version 
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-18 00:00:00 -05:00
+date: 2008-06-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency