fiveruns_tuneup 0.8.10 → 0.8.11

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.8.11. Signup and login for the TuneUp hosted service is now only required if the user wants to share a run (privately or publicly).
+
 v0.8.10. Fixed TextMate links to be xhtml strict 1.0 compliant.
 
 v0.8.9. Fixed broken rendering of TuneUp stack information when serving xhtml strict pages with a content-type of application/xhtml+xml.

data/Manifest

@@ -28,6 +28,7 @@ lib/fiveruns/tuneup/custom_methods.rb
 lib/fiveruns/tuneup/environment.rb
 lib/fiveruns/tuneup/instrumentation/action_controller/base.rb
 lib/fiveruns/tuneup/instrumentation/action_view/base.rb
+lib/fiveruns/tuneup/instrumentation/action_view/partial_template.rb
 lib/fiveruns/tuneup/instrumentation/active_record/base.rb
 lib/fiveruns/tuneup/instrumentation/cgi/session.rb
 lib/fiveruns/tuneup/instrumentation/utilities.rb
@@ -56,6 +57,6 @@ views/tuneup/_link.html.erb
 views/tuneup/_schema.html.erb
 views/tuneup/_sql.html.erb
 views/tuneup/_step.html.erb
-views/tuneup/panel/_registered.html.erb
-views/tuneup/panel/_unregistered.html.erb
+views/tuneup/panel/_register.html.erb
+views/tuneup/panel/_show.html.erb
 views/tuneup/sandbox.html.erb

data/assets/stylesheets/tuneup.css

@@ -70,6 +70,7 @@ version: 2.5.1
 #tuneup #tuneup-data { position: relative;}
 #tuneup #tuneup-top { position: absolute; top: 0px; right: 10px; padding: 0; margin: 0 0 0 150px;  z-index: 11000; }
 #tuneup #tuneup-top #tuneup-save-link { float: right; line-height: 45px; vertical-align: bottom; text-align: center; font-weight: bold; padding: 0 9px 0 20px; background: url(/images/tuneup/pointer.gif) 0 50% no-repeat; }
+#tuneup #tuneup-back-to-run-link { float: right; line-height: 15px; vertical-align: bottom; text-align: center; padding: 8px; background-color: #333; -moz-border-radius: 5px; margin: 7px 10px 0px 0px; border: 1px solid black;}
 #tuneup #tuneup-summary {float: right; padding: 9px; width: 400px; padding-bottom: 17px; margin-top: 3px; text-align: center; color: #ddd; -moz-border-radius: 6px 6px 0 0; }
 
 #tuneup #tuneup-data:hover #tuneup-summary { /* h */

data/fiveruns_tuneup.gemspec

@@ -1,22 +1,22 @@
 
-# Gem::Specification for Fiveruns_tuneup-0.8.10
+# Gem::Specification for Fiveruns_tuneup-0.8.11
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{fiveruns_tuneup}
-  s.version = "0.8.10"
+  s.version = "0.8.11"
 
   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-07-02}
+  s.date = %q{2008-07-10}
   s.default_executable = %q{fiveruns_tuneup}
   s.description = %q{Instrumentation for the FiveRuns TuneUp product.}
   s.email = %q{dev@fiveruns.com}
   s.executables = ["fiveruns_tuneup"]
-  s.extra_rdoc_files = ["bin/fiveruns_tuneup", "CHANGELOG", "lib/bumpspark_helper.rb", "lib/fiveruns/tuneup/asset_tags.rb", "lib/fiveruns/tuneup/configuration.rb", "lib/fiveruns/tuneup/custom_methods.rb", "lib/fiveruns/tuneup/environment.rb", "lib/fiveruns/tuneup/instrumentation/action_controller/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/base.rb", "lib/fiveruns/tuneup/instrumentation/active_record/base.rb", "lib/fiveruns/tuneup/instrumentation/cgi/session.rb", "lib/fiveruns/tuneup/instrumentation/utilities.rb", "lib/fiveruns/tuneup/multipart.rb", "lib/fiveruns/tuneup/runs.rb", "lib/fiveruns/tuneup/schema.rb", "lib/fiveruns/tuneup/step.rb", "lib/fiveruns/tuneup/urls.rb", "lib/fiveruns/tuneup/version.rb", "lib/fiveruns/tuneup.rb", "lib/fiveruns_tuneup.rb", "lib/tuneup_config.rb", "lib/tuneup_controller.rb", "lib/tuneup_helper.rb", "README.rdoc", "tasks/assets.rake"]
-  s.files = ["assets/images/arrows.gif", "assets/images/edit.png", "assets/images/fade.png", "assets/images/fade_down.png", "assets/images/head.gif", "assets/images/logo.gif", "assets/images/logo_clear.png", "assets/images/magnify.png", "assets/images/pip.gif", "assets/images/pointer.gif", "assets/images/schema.png", "assets/images/signin.gif", "assets/images/spinner.gif", "assets/images/warning.gif", "assets/javascripts/init.js", "assets/javascripts/prototype.js", "assets/javascripts/tuneup.js", "assets/stylesheets/tuneup.css", "bin/fiveruns_tuneup", "CHANGELOG", "CONTRIBUTORS", "init.rb", "install.rb", "lib/bumpspark_helper.rb", "lib/fiveruns/tuneup/asset_tags.rb", "lib/fiveruns/tuneup/configuration.rb", "lib/fiveruns/tuneup/custom_methods.rb", "lib/fiveruns/tuneup/environment.rb", "lib/fiveruns/tuneup/instrumentation/action_controller/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/base.rb", "lib/fiveruns/tuneup/instrumentation/active_record/base.rb", "lib/fiveruns/tuneup/instrumentation/cgi/session.rb", "lib/fiveruns/tuneup/instrumentation/utilities.rb", "lib/fiveruns/tuneup/multipart.rb", "lib/fiveruns/tuneup/runs.rb", "lib/fiveruns/tuneup/schema.rb", "lib/fiveruns/tuneup/step.rb", "lib/fiveruns/tuneup/urls.rb", "lib/fiveruns/tuneup/version.rb", "lib/fiveruns/tuneup.rb", "lib/fiveruns_tuneup.rb", "lib/tuneup_config.rb", "lib/tuneup_controller.rb", "lib/tuneup_helper.rb", "Manifest", "rails/init.rb", "Rakefile", "README.rdoc", "tasks/assets.rake", "test/test_helper.rb", "test/tuneup_test.rb", "uninstall.rb", "views/tuneup/_data.html.erb", "views/tuneup/_flash.html.erb", "views/tuneup/_link.html.erb", "views/tuneup/_schema.html.erb", "views/tuneup/_sql.html.erb", "views/tuneup/_step.html.erb", "views/tuneup/panel/_registered.html.erb", "views/tuneup/panel/_unregistered.html.erb", "views/tuneup/sandbox.html.erb", "fiveruns_tuneup.gemspec"]
+  s.extra_rdoc_files = ["bin/fiveruns_tuneup", "CHANGELOG", "lib/bumpspark_helper.rb", "lib/fiveruns/tuneup/asset_tags.rb", "lib/fiveruns/tuneup/configuration.rb", "lib/fiveruns/tuneup/custom_methods.rb", "lib/fiveruns/tuneup/environment.rb", "lib/fiveruns/tuneup/instrumentation/action_controller/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/partial_template.rb", "lib/fiveruns/tuneup/instrumentation/active_record/base.rb", "lib/fiveruns/tuneup/instrumentation/cgi/session.rb", "lib/fiveruns/tuneup/instrumentation/utilities.rb", "lib/fiveruns/tuneup/multipart.rb", "lib/fiveruns/tuneup/runs.rb", "lib/fiveruns/tuneup/schema.rb", "lib/fiveruns/tuneup/step.rb", "lib/fiveruns/tuneup/urls.rb", "lib/fiveruns/tuneup/version.rb", "lib/fiveruns/tuneup.rb", "lib/fiveruns_tuneup.rb", "lib/tuneup_config.rb", "lib/tuneup_controller.rb", "lib/tuneup_helper.rb", "README.rdoc", "tasks/assets.rake"]
+  s.files = ["assets/images/arrows.gif", "assets/images/edit.png", "assets/images/fade.png", "assets/images/fade_down.png", "assets/images/head.gif", "assets/images/logo.gif", "assets/images/logo_clear.png", "assets/images/magnify.png", "assets/images/pip.gif", "assets/images/pointer.gif", "assets/images/schema.png", "assets/images/signin.gif", "assets/images/spinner.gif", "assets/images/warning.gif", "assets/javascripts/init.js", "assets/javascripts/prototype.js", "assets/javascripts/tuneup.js", "assets/stylesheets/tuneup.css", "bin/fiveruns_tuneup", "CHANGELOG", "CONTRIBUTORS", "init.rb", "install.rb", "lib/bumpspark_helper.rb", "lib/fiveruns/tuneup/asset_tags.rb", "lib/fiveruns/tuneup/configuration.rb", "lib/fiveruns/tuneup/custom_methods.rb", "lib/fiveruns/tuneup/environment.rb", "lib/fiveruns/tuneup/instrumentation/action_controller/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/base.rb", "lib/fiveruns/tuneup/instrumentation/action_view/partial_template.rb", "lib/fiveruns/tuneup/instrumentation/active_record/base.rb", "lib/fiveruns/tuneup/instrumentation/cgi/session.rb", "lib/fiveruns/tuneup/instrumentation/utilities.rb", "lib/fiveruns/tuneup/multipart.rb", "lib/fiveruns/tuneup/runs.rb", "lib/fiveruns/tuneup/schema.rb", "lib/fiveruns/tuneup/step.rb", "lib/fiveruns/tuneup/urls.rb", "lib/fiveruns/tuneup/version.rb", "lib/fiveruns/tuneup.rb", "lib/fiveruns_tuneup.rb", "lib/tuneup_config.rb", "lib/tuneup_controller.rb", "lib/tuneup_helper.rb", "Manifest", "rails/init.rb", "Rakefile", "README.rdoc", "tasks/assets.rake", "test/test_helper.rb", "test/tuneup_test.rb", "uninstall.rb", "views/tuneup/_data.html.erb", "views/tuneup/_flash.html.erb", "views/tuneup/_link.html.erb", "views/tuneup/_schema.html.erb", "views/tuneup/_sql.html.erb", "views/tuneup/_step.html.erb", "views/tuneup/panel/_register.html.erb", "views/tuneup/panel/_show.html.erb", "views/tuneup/sandbox.html.erb", "fiveruns_tuneup.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/fiveruns/fiveruns_tuneup}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fiveruns_tuneup", "--main", "README.rdoc"]

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

@@ -55,13 +55,7 @@ module Fiveruns
                 if options[:file]
                   "Render #{options[:file]}"
                 elsif options[:partial]
-                  # 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
+                  record = false
                 elsif options[:inline]
                   "Render inline"
                 elsif options[:text]

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

@@ -0,0 +1,28 @@
+module Fiveruns
+  module Tuneup
+    module Instrumentation
+      module ActionView
+        module PartialTemplate       
+          
+          def self.included(base)
+            Fiveruns::Tuneup.instrument base, InstanceMethods
+          end
+          
+          def self.relevant?
+            Fiveruns::Tuneup::Version.rails < Fiveruns::Tuneup::Version.new(2,1,0) ? false : true
+          end
+          
+          module InstanceMethods
+
+            def render_with_fiveruns_tuneup(*args, &block)
+              Fiveruns::Tuneup.step "Render partial #{path}", :view do
+                render_without_fiveruns_tuneup(*args, &block)
+              end
+            end
+            
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiveruns/tuneup/instrumentation/utilities.rb

@@ -160,8 +160,11 @@ module Fiveruns
           Dir[File.join(instrumentation_path, '/*/**/*.rb')].each do |filename|
             constant_path = filename[(instrumentation_path.size + 1)..-4]
             constant_name = path_to_constant_name(constant_path)
-            if (constant = constant_name.constantize rescue nil)
-              instrumentation = "Fiveruns::Tuneup::Instrumentation::#{constant_name}".constantize
+            
+            instrumentation = "Fiveruns::Tuneup::Instrumentation::#{constant_name}".constantize            
+            next if instrumentation.respond_to?(:relevant?) && !instrumentation.relevant?
+              
+            if (constant = constant_name.constantize rescue nil)             
               constant.__send__(:include, instrumentation)
             else
               log :debug, "#{constant_name} not found; skipping instrumentation."

data/lib/fiveruns/tuneup/version.rb

@@ -75,7 +75,7 @@ module Fiveruns
 
       MAJOR = 0
       MINOR = 8
-      TINY  = 10
+      TINY  = 11
 
       # The current version as a Version instance
       CURRENT = new(MAJOR, MINOR, TINY)

data/lib/tuneup_controller.rb

@@ -13,6 +13,7 @@ class TuneupController < ActionController::Base
   end
       
   def show
+    session['fiveruns_tuneup_last_uri'] = params[:uri]
     debug_rjs = response.template.debug_rjs
     response.template.debug_rjs = false
     ActionController::Base.silence do
@@ -29,6 +30,14 @@ class TuneupController < ActionController::Base
     redirect_to :action => 'show'
   end
   
+  def register
+    render(:update) do |p| 
+      p['tuneup-panel'].hide
+      p.insert_html(:bottom, 'tuneup-content', :partial => 'tuneup/panel/register.html.erb')
+    end
+  end
+  
+  
   def signin
     if api_key = retrieve_api_key
       @config['api_key'] = api_key
@@ -36,7 +45,8 @@ class TuneupController < ActionController::Base
     end
     render :update do |page|
       if api_key
-        page << tuneup_reload_panel
+        page.replace('tuneup-save-link', link_to_upload)
+        page << redisplay_last_run(false)
       else
         page << tuneup_show_flash(:error,
                   :header => "TuneUp encountered an error",
@@ -93,7 +103,7 @@ class TuneupController < ActionController::Base
   
   def collect(state)
     Fiveruns::Tuneup.collecting = state
-    render(:update) { |p| p['tuneup-panel'].replace(render(:partial => 'tuneup/panel/registered.html.erb')) }
+    render(:update) { |p| p['tuneup-panel'].replace(render(:partial => 'tuneup/panel/show.html.erb')) }
   end
 
   def find_config

data/lib/tuneup_helper.rb

@@ -68,9 +68,23 @@ module TuneupHelper #:nodoc:
   end
   
   def link_to_upload
-     %|<a onclick="new TuneUpSandbox.Ajax.Request('/tuneup/upload?uri=#{CGI.escape(params[:uri])}', {asynchronous:true, evalScripts:true, onComplete:function(request){ TuneUp.Spinner.stop(); TuneUpSandbox.$('tuneup-top').show();}, onLoading:function(request){TuneUpSandbox.$('tuneup-top').hide(); TuneUp.Spinner.start()}}); return false;" id="tuneup-save-link" href="#">Share this Run</a>|
+    if @config.state == :registered
+      %|<a onclick="new TuneUpSandbox.Ajax.Request('/tuneup/upload?uri=#{CGI.escape(session['fiveruns_tuneup_last_uri'])}', {asynchronous:true, evalScripts:true, onComplete:function(request){ TuneUp.Spinner.stop(); TuneUpSandbox.$('tuneup-top').show();}, onLoading:function(request){TuneUpSandbox.$('tuneup-top').hide(); TuneUp.Spinner.start()}}); return false;" id="tuneup-save-link" href="#">Share this Run</a>|
+    else
+      %|<a onclick="new TuneUpSandbox.Ajax.Request('/tuneup/register', {asynchronous:true, evalScripts:true}); return false;" id="tuneup-save-link" href="#">Login to Share this Run</a>|
+    end
+  end
+  
+  def link_to_show
+    %|<a id="tuneup-back-to-run-link" onclick="#{redisplay_last_run} return false;" href="#">&lt;&lt;&lt; Back to Run</a>|
   end
   
+  def redisplay_last_run(namespaced=true)
+    namespace_js = lambda { |fun| namespaced ? "TuneUpSandbox.#{fun}" : fun }
+    "#{namespace_js['$']}('tuneup-panel').show(); #{namespace_js['$']}('tuneup-signin-form').remove();"
+  end
+
+  
   def additional_step_links(step)
     returning '' do |text|
       text << sql_link(step) if step.sql
@@ -159,7 +173,7 @@ module TuneupHelper #:nodoc:
   def tuneup_reload_panel
     update_page do |page|
       page['tuneup-flash'].removeClassName('tuneup-show');
-      page['tuneup-content'].replace_html(render(:partial => "tuneup/panel/#{@config.state}.html.erb"))
+      page['tuneup-content'].replace_html(render(:partial => "tuneup/panel/show.html.erb"))
       page << 'TuneUp.adjustAbsoluteElements(_document.body);'
       page << 'TuneUp.adjustFixedElements();'
     end

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

@@ -0,0 +1,14 @@
+<form id='tuneup-signin-form' onsubmit="new TuneUpSandbox.Ajax.Request('/tuneup/signin', {asynchronous:true, evalScripts:true, onComplete:function(request){TuneUp.Spinner.stop()}, onLoading:function(request){TuneUp.Spinner.start()}, parameters:TuneUpSandbox.Form.serialize(this)}); return false;" method="post" action="/tuneup/signin">
+  <p class='tuneup-full'>
+    <%= link_to_show %>
+    <label for='email'>Email</label>
+    <%= text_field_tag :email, nil, :size => 20 %>
+  
+    <label for='password'>Password</label>
+    <%= password_field_tag %>
+  
+    <button><%= image_tag '/images/tuneup/signin.gif', :alt => 'Sign In' %></button>
+    or  
+    <%= link_to "Sign Up for an Account", tuneup_signup_url, :target => '_blank' %>
+  </p>
+</form>

data/views/tuneup/panel/{_registered.html.erb → _show.html.erb}

@@ -1,4 +1,5 @@
 <div id='tuneup-panel'>
+<% puts "blank data? #{tuneup_data.blank?}       collecting? #{tuneup_collecting?}" %>
   <%= 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.10
+  version: 0.8.11
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-02 00:00:00 -05:00
+date: 2008-07-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ extra_rdoc_files:
 - lib/fiveruns/tuneup/environment.rb
 - lib/fiveruns/tuneup/instrumentation/action_controller/base.rb
 - lib/fiveruns/tuneup/instrumentation/action_view/base.rb
+- lib/fiveruns/tuneup/instrumentation/action_view/partial_template.rb
 - lib/fiveruns/tuneup/instrumentation/active_record/base.rb
 - lib/fiveruns/tuneup/instrumentation/cgi/session.rb
 - lib/fiveruns/tuneup/instrumentation/utilities.rb
@@ -84,6 +85,7 @@ files:
 - lib/fiveruns/tuneup/environment.rb
 - lib/fiveruns/tuneup/instrumentation/action_controller/base.rb
 - lib/fiveruns/tuneup/instrumentation/action_view/base.rb
+- lib/fiveruns/tuneup/instrumentation/action_view/partial_template.rb
 - lib/fiveruns/tuneup/instrumentation/active_record/base.rb
 - lib/fiveruns/tuneup/instrumentation/cgi/session.rb
 - lib/fiveruns/tuneup/instrumentation/utilities.rb
@@ -112,8 +114,8 @@ files:
 - views/tuneup/_schema.html.erb
 - views/tuneup/_sql.html.erb
 - views/tuneup/_step.html.erb
-- views/tuneup/panel/_registered.html.erb
-- views/tuneup/panel/_unregistered.html.erb
+- views/tuneup/panel/_register.html.erb
+- views/tuneup/panel/_show.html.erb
 - views/tuneup/sandbox.html.erb
 - fiveruns_tuneup.gemspec
 has_rdoc: true

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

@@ -1,13 +0,0 @@
-<form onsubmit="new TuneUpSandbox.Ajax.Request('/tuneup/signin', {asynchronous:true, evalScripts:true, onComplete:function(request){TuneUp.Spinner.stop()}, onLoading:function(request){TuneUp.Spinner.start()}, parameters:TuneUpSandbox.Form.serialize(this)}); return false;" method="post" action="/tuneup/signin">
-  <p class='tuneup-full'>
-    <label for='email'>Email</label>
-    <%= text_field_tag :email, nil, :size => 20 %>
-  
-    <label for='password'>Password</label>
-    <%= password_field_tag %>
-  
-    <button><%= image_tag '/images/tuneup/signin.gif', :alt => 'Sign In' %></button>
-    or  
-    <%= link_to "Sign Up for an Account", tuneup_signup_url %>
-  </p>
-</form>