shenandoah 0.1.3 → 0.2.0

data/lib/shenandoah/javascript/browser/multirunner.js

@@ -0,0 +1,87 @@
+if (!window.shenandoah) { var shenandoah = {}; }
+
+(function ($) {
+  shenandoah.Multirunner = function (container_id, spec_urls) {
+    ////// PRIVATE
+
+    var runner = this;
+
+    function container(subselector) {
+      var sel = "#" + runner.container_id;
+      if (subselector) sel += ' ' + subselector;
+      return jQuery(sel);
+    }
+
+    ////// PUBLIC
+
+    this.container_id = container_id;
+    this.spec_urls = spec_urls;
+
+    this.run = function () {
+      this.frames = container("#frames iframe").get();
+      this.next();
+    }
+
+    this.next = function () {
+      if (this.frames && this.frames.length > 0) {
+        setTimeout(function () { jQuery(runner.frames.shift()).trigger('begin') }, 0);
+      } else {
+        var show = container('#specs li.failed').get(0) || container('#specs li').get(0);
+        jQuery(show).trigger('activate');
+      }
+    }
+
+    this.reset = function () {
+      container().empty();
+      this.frames = null;
+    }
+
+    ////// INITIALIZATION
+
+    if (!this.spec_urls || this.spec_urls.length === 0) {
+      container().append("<p>No specs selected to run</p>")
+    } else {
+      container().append("<ul id='specs'></ul>").append("<div id='frames'></div>");
+      jQuery(this.spec_urls).each(function (idx) {
+        container("#specs").append('<li class="spec inactive"><span class="name">' + this.replace(/\/spec\//, "") + '</span>&nbsp;<span class="count"></span></li>');
+        container("#frames").append('<iframe class="inactive" spec-url="' + this + '" src="about:blank"></iframe>');
+        var newLi = container("#specs li:last-child");
+        var newFrame = container("#frames iframe:last-child");
+        var both = jQuery(newLi.selector + ", " + newFrame.selector);
+
+        both.bind('activate', function () {
+          both.removeClass('inactive').addClass('active');
+        }).bind('deactivate', function () {
+          both.addClass('inactive').removeClass('active');
+        });
+
+        newFrame.bind("begin", null, function (evt, data) {
+          newLi.find('.count').empty().end().trigger('activate');
+          newFrame.attr('src', newFrame.attr('spec-url'));
+        });
+
+        newFrame.bind("complete", null, function (evt, data) {
+          newLi.find('.count').text(data.passed_count + " of " + data.total_count).end().
+            removeClass('passed').removeClass('failed').addClass(data.passed_count === data.total_count ? 'passed' : 'failed').
+            trigger('deactivate');
+          runner.next();
+        });
+
+        newLi.bind('click', function () {
+          container('#frames iframe').trigger('deactivate');
+          newFrame.trigger('activate');
+          return false;
+        });
+      });
+    }
+  };
+
+  $(document).ready(function () {
+    var specs = jQuery.parseQuery().spec;
+    if (specs && specs.constructor !== Array) {
+      specs = [specs];
+    }
+    new shenandoah.Multirunner('runner', specs).run();
+  });
+
+}(jQuery));

data/lib/shenandoah/javascript/common/jquery.parsequery.js

@@ -0,0 +1,19 @@
+/**
+ * A simple querystring parser.
+ * Example usage: var q = $.parseQuery(); q.fooreturns  "bar" if query contains "?foo=bar"; multiple values are added to an array. 
+ * Values are unescaped by default and plus signs replaced with spaces, or an alternate processing function can be passed in the params object .
+ * http://actingthemaggot.com/jquery
+ *
+ * Copyright (c) 2008 Michael Manning (http://actingthemaggot.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ **/
+jQuery.parseQuery = function(qs,options) {
+	var q = (typeof qs === 'string'?qs:window.location.search), o = {'f':function(v){return unescape(v).replace(/\+/g,' ');}}, options = (typeof qs === 'object' && typeof options === 'undefined')?qs:options, o = jQuery.extend({}, o, options), params = {};
+	jQuery.each(q.match(/^\??(.*)$/)[1].split('&'),function(i,p){
+		p = p.split('=');
+		p[1] = o.f(p[1]);
+		params[p[0]] = params[p[0]]?((params[p[0]] instanceof Array)?(params[p[0]].push(p[1]),params[p[0]]):[params[p[0]],p[1]]):p[1];
+	});
+	return params;
+}

data/lib/shenandoah/server.rb

@@ -1,5 +1,7 @@
 require 'sinatra'
 require 'haml'
+require 'sass'
+require 'compass'
 
 module Shenandoah
   # The server which enables in-browser execution of Screw.Unit specs in
@@ -12,18 +14,23 @@ module Shenandoah
   class Server < Sinatra::Base
     set :root, File.dirname(__FILE__) + "/server"
     set :port, 4410
+    set :sass, Compass.sass_engine_options
     enable :logging
 
     get '/' do
       section_map = options.locator.spec_files.
         collect { |t| t.sub(%r{^#{options.locator.spec_path}/?}, '') }.
         collect { |t| [File.dirname(t), File.basename(t).sub(/_spec.js$/, '.html')] }.
-        inject({}) { |h, (dir, file)| h[dir] ||= []; h[dir] << file; h }
+        inject({}) { |h, (dir, file)| h[dir] ||= []; h[dir] << IndexEntry.new(dir, file); h }
       @sections = section_map.collect { |dir, files| [dir, files.sort] }.sort
 
       haml :index
     end
 
+    get '/multirunner' do
+      haml :multirunner
+    end
+
     get '/main/*' do
       map_file(options.locator.main_path, params[:splat].first, "Main")
     end
@@ -32,27 +39,47 @@ module Shenandoah
       map_file(options.locator.spec_path, params[:splat].first, "Spec")
     end
 
-    get '/screw.css' do
-      screw_css = File.join(options.locator.spec_path, 'screw.css')
-      unless File.exist?(screw_css)
-        screw_css = File.join(File.dirname(__FILE__), 'css/screw.css')
+    get '/shenandoah.css' do
+      shenandoah_css = File.join(options.locator.spec_path, 'shenandoah.css')
+      if File.exist?(shenandoah_css)
+        send_file shenandoah_css
+      else
+        shenandoah_sass = File.join(options.locator.spec_path, 'shenandoah.sass')
+        unless File.exist?(shenandoah_sass)
+          shenandoah_sass = File.join(File.dirname(__FILE__), "css/shenandoah.sass")
+        end
+        content_type 'text/css'
+        last_modified File.stat(shenandoah_sass).mtime
+        sass File.read(shenandoah_sass)
       end
-      send_file screw_css
+    end
+
+    get '/screw.css' do
+      uri = '/shenandoah.css'
+      $stderr.puts "DEPRECATION NOTICE: Use #{uri} instead of /screw.css."
+      status 301
+      response['Location'] = uri
+      "This URI is deprecated.  Use <a href='#{uri}'>#{uri}</a>."
     end
 
     get '/shenandoah/browser-runner.js' do
+      maxtime, content = concatenate_files(runner_files)
+
       content_type 'text/javascript'
+      last_modified maxtime
+      content
+    end
 
-      last_modified runner_files.collect { |filename|
-        File.stat("#{File.dirname(__FILE__)}/#{filename}").mtime
-      }.max
+    get '/shenandoah/multirunner.js' do
+      maxtime, content = concatenate_files(multirunner_files)
 
-      runner_files.collect { |filename|
-        [
-          "\n//////\n////// #{filename}\n//////\n",
-          File.read("#{File.dirname(__FILE__)}/#{filename}")
-        ]
-      }.flatten
+      content_type 'text/javascript'
+      last_modified maxtime
+      content
+    end
+
+    get '/js/*' do
+      send_file File.join(File.dirname(__FILE__), "javascript/#{params[:splat].first}")
     end
 
     protected
@@ -67,6 +94,21 @@ module Shenandoah
       end
     end
 
+    def concatenate_files(files)
+      maxtime = files.collect { |filename|
+        File.stat("#{File.dirname(__FILE__)}/#{filename}").mtime
+      }.max
+
+      content = files.collect { |filename|
+        [
+          "\n//////\n////// #{filename}\n//////\n",
+          File.read("#{File.dirname(__FILE__)}/#{filename}")
+        ]
+      }.flatten
+
+      [maxtime, content]
+    end
+
     def runner_files # :nodoc:
       # Can't just use Dir[] because order is important
       [
@@ -81,8 +123,31 @@ module Shenandoah
         "javascript/common/smoke.mock.js",
         "javascript/common/smoke.stub.js",
         "javascript/common/screw.mocking.js",
-        "javascript/browser/runner.js"
+        "javascript/browser/runner.js",
+        "javascript/browser/multirunner-single.js"
       ]
     end
+
+    def multirunner_files # :nodoc
+      [
+        "javascript/common/jquery-1.3.2.js",
+        "javascript/common/jquery.parsequery.js",
+        "javascript/browser/multirunner.js"
+      ]
+    end
+
+    class IndexEntry < Struct.new(:section, :test_html)
+      def href
+        '/' + ["spec", section, test_html].reject { |s| s == '.' }.join('/')
+      end
+
+      def name
+        test_html.sub(/.html$/, '')
+      end
+
+      def <=>(other)
+        self.test_html <=> other.test_html
+      end
+    end
   end
 end

data/lib/shenandoah/server/views/index.haml

@@ -1,12 +1,22 @@
 %html
   %head
-    %link{ :rel => "stylesheet", :href => "/screw.css", :type => "text/css", :charset => "utf-8" }
-  %body
+    %script{ :src => '/js/common/jquery-1.3.2.js' }
+    %script{ :src => '/js/browser/index.js' }
+    %link{ :rel => "stylesheet", :href => "/shenandoah.css", :type => "text/css", :charset => "utf-8" }
+  %body#index
     - if options.respond_to?(:project_name) && options.project_name
       %h1= "Specs for #{options.project_name}"
-    - @sections.each do |section, tests|
-      %h2= section == '.' ? '[root]' : section
-      %ul
-        - tests.each do |test|
-          %li
-            %a{ :href => ["spec", section, test].reject { |s| s == '.' }.join('/') }= test.sub(/.html$/, '')
+    %label#select-all
+      %input{ :type => 'checkbox', :name => 'select-all' } 
+        %a select all
+    %form{ :method => 'GET', :action => '/multirunner' }
+      - @sections.each do |section, tests|
+        %h2= section == '.' ? '[root]' : section
+        %ul
+          - tests.each do |test|
+            %li
+              %label
+                %input{ :type => 'checkbox', :name => 'spec', :value => test.href }
+                %a{ :href => test.href }= test.name
+      #controls
+        %input{ :type => 'submit', :value => 'Run selected' }

data/lib/shenandoah/server/views/multirunner.haml

@@ -0,0 +1,6 @@
+%html
+  %head
+    %script{ :src => '/shenandoah/multirunner.js', :type => 'text/javascript' }
+    %link{ :rel => 'stylesheet', :href => '/shenandoah.css' }
+  %body
+    #runner

data/rails_generators/shen_spec/templates/fixture.html.erb

@@ -3,7 +3,7 @@
 
 <head>
   <title><%= file_name %>.js | JavaScript Testing Results</title>
-  <link rel="stylesheet" href="/screw.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="/shenandoah.css" type="text/css" charset="utf-8" />
   <script type="text/javascript" src="/shenandoah/browser-runner.js"></script>
 </head>
 

data/rails_generators/shenandoah/templates/application.html

@@ -3,7 +3,7 @@
 
 <head>
   <title>Application | JavaScript Testing Results</title>
-  <link rel="stylesheet" href="/screw.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="/shenandoah.css" type="text/css" charset="utf-8" />
   <script type="text/javascript" src="/shenandoah/browser-runner.js"></script>
 </head>
 

data/spec/rails_generators/shen_spec_generator_spec.rb

@@ -50,8 +50,8 @@ describe "shen_spec generator" do
             @html.should =~ %r{src="/shenandoah/browser-runner.js"}
           end
 
-          it "includes screw.css" do
-            @html.should =~ %r{href="/screw.css"}
+          it "includes shenandoah.css" do
+            @html.should =~ %r{href="/shenandoah.css"}
           end
         end
 

data/spec/rails_generators/shenandoah_generator_spec.rb

@@ -70,11 +70,11 @@ describe "shenandoah generator" do
             File.read(@path).should =~ %r{src="/shenandoah/browser-runner.js"}
           end
 
-          it "links to the served screw.css" do
-            File.read(@path).should =~ %r{href="/screw.css"}
+          it "links to the served shenandoah.css" do
+            File.read(@path).should =~ %r{href="/shenandoah.css"}
           end
         end
       end
     end
   end
-end
+end

data/spec/shenandoah/server_spec.rb

@@ -59,8 +59,13 @@ describe Shenandoah::Server do
       last_response.body.should =~ %r{function require_main\(}
     end
 
+    it "includes the multirunner code for a single test" do
+      last_response.body.should =~ %r{window.parent.jQuery\('iframe'\)}
+    end
+
     it "was last modified at the latest date of the combined files" do
       maxTime = Dir["#{File.dirname(__FILE__)}/../../lib/shenandoah/javascript/{browser,common}/*.js"].
+        reject { |filename| filename =~ /multirunner.js$/ || filename =~ /parsequery/i || filename =~ /index.js$/ }.
         collect { |filename| File.stat(filename).mtime }.max
       Time.httpdate(last_response.headers['Last-Modified']).should == maxTime
     end
@@ -114,37 +119,44 @@ describe Shenandoah::Server do
     end
   end
 
-  describe "/screw.css" do
+  describe "/shenandoah.css" do
     describe "by default" do
       before do
-        get '/screw.css'
-        @included = "#{File.dirname(__FILE__)}/../../lib/shenandoah/css/screw.css"
+        get '/shenandoah.css'
+        @sass = File.expand_path(
+          "lib/shenandoah/css/shenandoah.sass", File.dirname(__FILE__) + "/../..")
       end
 
       it "is available" do
         last_response.should be_ok
       end
 
-      it "is the included version" do
-        last_response.body.should == File.read(@included)
+      it "is the CSS version of the included shenandoah.sass" do
+        last_response.body.should include('#frames iframe {')
+        last_response.body.should include('.describes .describe {')
+      end
+
+      it "includes the compass reset styles directly" do
+        last_response.body.should_not include("@import url(compass/reset.css)")
+        last_response.body.should include("table, caption, tbody, tfoot, thead, tr, th, td")
       end
 
       it "has the correct last modified version" do
         Time.httpdate(last_response.headers['Last-Modified']).should ==
-          File.stat(@included).mtime
+          File.stat(@sass).mtime
       end
 
       it "is CSS" do
-        last_response.headers['Content-Type'].should == 'text/css'
+        last_response.content_type.should == 'text/css'
       end
     end
 
-    describe "when overridden" do
+    describe "when overridden with CSS" do
       before do
         app.set :locator,
           Shenandoah::DefaultLocator.new(:spec_path => self.tmpdir)
-        tmpfile "screw.css", ".passed { color: blue }"
-        get '/screw.css'
+        tmpfile "shenandoah.css", ".passed { color: blue }"
+        get '/shenandoah.css'
       end
 
       it "is available" do
@@ -157,13 +169,57 @@ describe Shenandoah::Server do
 
       it "has the correct last modified version" do
         Time.httpdate(last_response.headers['Last-Modified']).should ==
-          File.stat("#{self.tmpdir}/screw.css").mtime
+          File.stat("#{self.tmpdir}/shenandoah.css").mtime
       end
 
       it "is CSS" do
-        last_response.headers['Content-Type'].should == 'text/css'
+        last_response.content_type.should == 'text/css'
       end
     end
+
+    describe "when overridden with Sass" do
+      before do
+        app.set :locator,
+          Shenandoah::DefaultLocator.new(:spec_path => self.tmpdir)
+        tmpfile "shenandoah.sass", ".passed\n  color: blue"
+        get '/shenandoah.css'
+      end
+
+      it "is available" do
+        last_response.should be_ok
+      end
+
+      it "is the version from the spec dir" do
+        last_response.body.should == ".passed {\n  color: blue; }\n"
+      end
+
+      it "has the correct last modified version" do
+        Time.httpdate(last_response.headers['Last-Modified']).should ==
+          File.stat("#{self.tmpdir}/shenandoah.sass").mtime
+      end
+
+      it "is CSS" do
+        last_response.content_type.should == 'text/css'
+      end
+    end
+  end
+
+  describe "/screw.css" do
+    before do
+      get '/screw.css'
+    end
+
+    it "redirects" do
+      last_response.status.should == 301
+    end
+
+    it "points to /shenandoah.css" do
+      last_response['Location'].should == '/shenandoah.css'
+    end
+
+    it "includes a deprecation note" do
+      last_response.body.should == "This URI is deprecated.  Use <a href='/shenandoah.css'>/shenandoah.css</a>."
+    end
   end
 
   describe "/" do
@@ -173,6 +229,7 @@ describe Shenandoah::Server do
       app.set :locator,
         Shenandoah::DefaultLocator.new(:spec_path => File.join(self.tmpdir, 'spec'))
       tmpfile "spec/common_spec.js", "DC"
+      tmpfile "spec/application_spec.js", "DC"
       tmpfile "spec/some/thing_spec.js", "DC"
       get "/"
     end
@@ -202,15 +259,99 @@ describe Shenandoah::Server do
     end
 
     it "includes lists of links" do
-      last_response.body.should have_tag("ul a", :count => 2)
+      last_response.body.should have_tag("ul a", :count => 3)
     end
 
     it "includes a link to a spec in the root" do
-      last_response.body.should have_tag("a[@href='spec/common.html']", "common")
+      last_response.body.should have_tag("a[@href='/spec/common.html']", "common")
     end
 
     it "includes link to a spec in a subdirectory" do
-      last_response.body.should have_tag("a[@href='spec/some/thing.html']", "thing")
+      last_response.body.should have_tag("a[@href='/spec/some/thing.html']", "thing")
+    end
+
+    it "includes a checkbox for a spec in the root" do
+      last_response.body.should have_tag("input[@value='/spec/common.html']")
+    end
+
+    it "includes a checkbox for a spec in a subdirectory" do
+      last_response.body.should have_tag("input[@value='/spec/some/thing.html']")
+    end
+
+    it "includes a form to run the multirunner" do
+      last_response.body.should have_tag("form[@action='/multirunner']")
+    end
+
+    it "includes a submit button for the multirunner form" do
+      last_response.body.should have_tag("input[@type='submit']")
+    end
+  end
+
+  describe "/multirunner" do
+    include RspecHpricotMatchers
+
+    before do
+      get "/multirunner?spec=/spec/common.html"
+    end
+
+    it "is available" do
+      last_response.should be_ok
+    end
+
+    it "is html" do
+      last_response.content_type.should == 'text/html'
+    end
+
+    it "includes the multirunner script" do
+      last_response.body.should have_tag("script[@src='/shenandoah/multirunner.js']")
+    end
+
+    it "includes the container" do
+      last_response.body.should have_tag("div#runner")
+    end
+  end
+
+  describe "/shenandoah/multirunner.js" do
+    before do
+      get '/shenandoah/multirunner.js'
+    end
+
+    it "is available" do
+      last_response.should be_ok
+    end
+
+    it "is javascript" do
+      last_response.content_type.should == 'text/javascript'
+    end
+
+    it "contains the multirunner script" do
+      last_response.body.should =~ /shenandoah.Multirunner/
+    end
+
+    it "includes jQuery" do
+      last_response.body.should =~ %r{\* jQuery JavaScript Library v1\.3\.2}
+    end
+
+    it "includes parseQuery" do
+      last_response.body.should =~ %r{jQuery.parseQuery =}
+    end
+  end
+
+  describe "/js/common/jquery-1.3.2.js" do
+    before do
+      get '/js/common/jquery-1.3.2.js'
+    end
+
+    it "is available" do
+      last_response.should be_ok
+    end
+
+    it "is javascript" do
+      last_response.content_type.should == 'application/javascript'
+    end
+
+    it "includes jQuery" do
+      last_response.body.should =~ %r{\* jQuery JavaScript Library v1\.3\.2}
     end
   end
 end