teabag 0.5.1 → 0.5.2

data/app/assets/javascripts/teabag/base/reporters/html/template.coffee

@@ -0,0 +1,41 @@
+Teabag.Reporters.HTML.template = """
+<div id="teabag-interface">
+  <div class="teabag-clearfix">
+    <div id="teabag-title">
+      <h1>Teabag</h1>
+      <ul>
+        <li>version: <b id="teabag-version"></b></li>
+        <li id="teabag-env-info"></li>
+      </ul>
+    </div>
+    <div id="teabag-progress"></div>
+    <ul id="teabag-stats">
+      <li>passes: <b id="teabag-stats-passes">0</b></li>
+      <li>failures: <b id="teabag-stats-failures">0</b></li>
+      <li>skipped: <b id="teabag-stats-skipped">0</b></li>
+      <li>duration: <b id="teabag-stats-duration">&infin;</b></li>
+    </ul>
+  </div>
+
+  <div id="teabag-controls" class="teabag-clearfix">
+    <div id="teabag-toggles">
+      <button id="teabag-use-catch" title="Toggle using try/catch wrappers when possible">Try/Catch</button>
+      <button id="teabag-build-full-report" title="Toggle building the full report">Full Report</button>
+      <button id="teabag-display-progress" title="Toggle displaying progress as tests run">Progress</button>
+    </div>
+    <div id="teabag-suites"></div>
+  </div>
+
+  <hr/>
+
+  <div id="teabag-filter">
+    <h1>Filtering</h1>
+    <ul id="teabag-filter-list"></ul>
+  </div>
+
+  <div id="teabag-report">
+    <ol id="teabag-report-failures"></ol>
+    <ol id="teabag-report-all"></ol>
+  </div>
+</div>
+"""

data/app/assets/javascripts/teabag/base/runner.coffee

@@ -6,7 +6,7 @@ class Teabag.Runner
     return if @constructor.run
     @constructor.run = true
     @fixturePath = "#{Teabag.root}/fixtures"
-    @params = @getParams()
+    @params = Teabag.params = @getParams()
     @setup()
 
 

data/app/assets/javascripts/teabag/jasmine.coffee

@@ -18,7 +18,6 @@ class Teabag.Runner extends Teabag.Runner
 
     # add the reporter and set the filter
     reporter = new (@getReporter())()
-    reporter.setFilter?(@params["grep"])
     env.addReporter(reporter)
 
     # add fixture support

data/app/assets/javascripts/teabag/mocha.coffee

@@ -15,7 +15,6 @@ class Teabag.Runner extends Teabag.Runner
   setup: ->
     # add the reporter and set the filter
     reporter = @getReporter()
-    reporter.filter = @params["grep"]
     env.setup(reporter: reporter)
 
 

data/app/assets/javascripts/teabag/mocha/reporters/html.coffee

@@ -2,7 +2,6 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.HTML
 
   constructor: (runner) ->
     super
-    @setFilter(Teabag.Reporters.HTML.filter)
     @reportRunnerStarting(runner)
     runner.on("fail", @reportSpecResults)
     runner.on("test end", @reportSpecResults)

data/app/assets/javascripts/teabag/qunit.coffee

@@ -11,8 +11,7 @@ class Teabag.Runner extends Teabag.Runner
 
 
   setup: ->
-    reporter = new (@getReporter())(env)
-    reporter.setFilter?(@params["grep"])
+    new (@getReporter())(env)
 
 
 

data/app/assets/javascripts/teabag/teabag.coffee

@@ -0,0 +1,32 @@
+class TeabagInterface
+
+  constructor: ->
+    @files = $u("#teabag-suite-list .file a")
+    @input = $u("#teabag-filter-input")[0]
+    @input.value = ""
+    @input.onkeyup = @filter
+
+
+  filter: =>
+    for file in @files
+      if LiquidMetal.score(file.innerHTML, @input.value) > 0
+        file.parentNode.style.display = "block"
+      else
+        file.parentNode.style.display = "none"
+
+
+window.onload = -> new TeabagInterface()
+
+`
+/*!
+ * LiquidMetal
+ * Copyright (c) 2009, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
+ */
+var LiquidMetal=function(){var l=0.0;var m=1.0;var n=0.8;var o=0.9;var p=0.85;return{score:function(a,b){if(b.length==0)return n;if(b.length>a.length)return l;var c=this.buildScoreArray(a,b);var d=0.0;for(var i=0;i<c.length;i++){d+=c[i]}return(d/c.length)},buildScoreArray:function(a,b){var d=new Array(a.length);var e=a.toLowerCase();var f=b.toLowerCase().split("");var g=-1;var h=false;for(var i=0;i<f.length;i++){var c=f[i];var j=e.indexOf(c,g+1);if(j<0)return fillArray(d,l);if(j==0)h=true;if(isNewWord(a,j)){d[j-1]=1;fillArray(d,p,g+1,j-1)}else if(isUpperCase(a,j)){fillArray(d,p,g+1,j)}else{fillArray(d,l,g+1,j)}d[j]=m;g=j}var k=h?o:n;fillArray(d,k,g+1);return d}};function isUpperCase(a,b){var c=a.charAt(b);return("A"<=c&&c<="Z")}function isNewWord(a,b){var c=a.charAt(b-1);return(c==" "||c=="\t")}function fillArray(a,b,c,d){c=Math.max(c||0,0);d=Math.min(d||a.length,a.length);for(var i=c;i<d;i++){a[i]=b}return a}}();
+
+/*!
+ * uSelector
+ * author: Fabio Miranda Costa | github: fabiomcosta | twitter: @fabiomiranda | license: MIT-style license
+ */
+(function(h,i){var f,c,j,k,m={},e,l,q=/^\s+|\s+$/g,r=!!i.querySelectorAll,g=function(d,b,a){f=a||[];e=b||g.context;if(r)try{n(e.querySelectorAll(d));return f}catch(v){}l=e.ownerDocument||e;d=d.replace(q,"");for(c={};d=d.replace(/([#.:])?([^#.:]*)/,s););d=(b=c.id)&&c.tag||c.classes||c.pseudos||!b&&(c.classes||c.pseudos)?t:o;if(b){if(a=b=l.getElementById(b))if(!(a=l===e))a:{a=b;do if(a===e){a=true;break a}while(a=a.parentNode);a=false}a&&d([b])}else d(e.getElementsByTagName(c.tag||"*"));return f},u=function(d){if(c.tag){var b=d.nodeName.toUpperCase();if(c.tag=="*"){if(b<"@")return false}else if(b!=c.tag)return false}if(c.id&&d.getAttribute("id")!=c.id)return false;if(j=c.classes){var a=" "+d.className+" ";for(b=j.length;b--;)if(a.indexOf(" "+j[b]+" ")<0)return false}if(k=c.pseudos)for(b=k.length;b--;){a=m[k[b]];if(!(a&&a.call(g,d)))return false}return true},s=function(d,b,a){if(b)if(b=="#")c.id=a;else if(b==".")if(c.classes)c.classes.push(a);else c.classes=[a];else{if(b==":")if(c.pseudos)c.pseudos.push(a);else c.pseudos=[a]}else c.tag=a.toUpperCase();return""},p=Array.prototype.slice,n=function(d){f=p.call(d,0)},o=function(d){for(var b=0,a;a=d[b++];)f.push(a)};try{p.call(i.documentElement.childNodes,0)}catch(w){n=o}var t=function(d){for(var b=0,a;a=d[b++];)u(a)&&f.push(a)};g.pseudos=m;g.context=i;h.uSelector=g;h.$u||(h.$u=g)})(this,document);
+`

data/app/assets/stylesheets/teabag.css

@@ -7,19 +7,19 @@ body {
 
 /* Base Reporter
  *---------------------------------------------------------------------------*/
-#teabag-html-reporter {
+#teabag-interface {
   padding: 45px 50px 0;
-  min-width: 440px;
+  min-width: 430px;
   border-top: 3px solid #18c2e8;
   color: #000;
 }
-#teabag-html-reporter hr {
+#teabag-interface hr {
   border: 0;
   background: #cfc8c4;
   height: 1px;
   margin: 20px 0;
 }
-#teabag-html-reporter .teabag-clearfix:after {
+#teabag-interface .teabag-clearfix:after {
   content: ".";
   display: block;
   clear: both;
@@ -27,10 +27,10 @@ body {
   line-height: 0;
   height: 0;
 }
-html[xmlns] #teabag-html-reporter .teabag-clearfix {
+html[xmlns] #teabag-interface .teabag-clearfix {
   display: block;
 }
-* html #teabag-html-reporter .teabag-clearfix {
+* html #teabag-interface .teabag-clearfix {
   height: 1%;
 }
 
@@ -58,6 +58,13 @@ html[xmlns] #teabag-html-reporter .teabag-clearfix {
 #teabag-title b {
   font-weight: 400;
 }
+#teabag-title a {
+  text-decoration: none;
+  color: #000;
+}
+#teabag-title a:hover {
+  text-decoration: underline;
+}
 
 /* Progress indicator
  *---------------------------------------------------------------------------*/
@@ -195,26 +202,23 @@ html[xmlns] #teabag-html-reporter .teabag-clearfix {
   position: relative;
   top: -1px;
   height: 21px;
-  max-width: 100px;
+  max-width: 150px;
   margin: 0;
   border: 1px solid #B3B3B3;
   outline: none;
 }
-
-#teabag-controls #teabag-filter {
-  margin-right: 220px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-weight: 200;
-  color: #7b4f49;
-}
-#teabag-controls #teabag-filter button {
-  visibility: hidden;
-}
-#teabag-controls #teabag-filter.teabag-filtered button {
-  visibility: visible;
+#teabag-controls input {
+  margin: 0;
+  padding: 2px 8px;
+  zoom: 1;
+  border: 1px solid #B3B3B3;
+  outline: none;
+  font-size: 12px;
+  border-radius: 0.4em;
+  background-color: #fff;
+  width: 100%;
 }
+
 #teabag-controls #teabag-toggles {
   float: right;
 }
@@ -233,6 +237,41 @@ html[xmlns] #teabag-html-reporter .teabag-clearfix {
   position: relative;
 }
 
+/* Filter
+ *---------------------------------------------------------------------------*/
+#teabag-filter {
+  font-weight: 200;
+  display: none;
+}
+#teabag-filter.teabag-filtered {
+  display: block;
+}
+#teabag-filter h1 {
+  float: right;
+  height: 15px;
+  margin: -11px 15px 0 0;
+  padding: 0 4px;
+  background: #f4f3ee;
+  text-align: right;
+  font-size: 17px;
+  font-weight: 200;
+  color: #7b4f49;
+}
+#teabag-filter ul {
+  margin: 0;
+  padding: 3px 10px 6px;
+  list-style: none;
+  border: 1px solid #cfc8c4;
+  border-radius: 3px;
+}
+#teabag-filter li {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 100%;
+}
+
+
 /* Reporting
  *---------------------------------------------------------------------------*/
 #teabag-report a {
@@ -283,7 +322,6 @@ html[xmlns] #teabag-html-reporter .teabag-clearfix {
   background: #ff3f3c;
 }
 
-
 #teabag-report #teabag-report-all {
   margin: 0;
   padding: 0;
@@ -325,10 +363,10 @@ html[xmlns] #teabag-html-reporter .teabag-clearfix {
 
 /* State Overrides
  *---------------------------------------------------------------------------*/
-body.teabag-failed #teabag-html-reporter {
+body.teabag-failed #teabag-interface {
   border-top: 3px solid #ff3f3c;
 }
-body.teabag-passed #teabag-html-reporter {
+body.teabag-passed #teabag-interface {
   border-top: 3px solid #51e431;
 }
 body.teabag-failed #teabag-progress .teabag-indicator {
@@ -350,11 +388,41 @@ body.teabag-passed #teabag-progress .teabag-indicator {
   background: #fff;
 }
 
+/* Suite List
+ *---------------------------------------------------------------------------*/
+#teabag-suite-list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+#teabag-suite-list ul {
+  margin: 0 0 20px 0;
+  padding: 0 0 0 20px;
+  /*background: rgba(200, 184, 161, 0.1);*/
+}
+#teabag-suite-list a {
+  text-decoration: none;
+  color: #482b25;
+}
+#teabag-suite-list a:hover {
+  text-decoration: underline;
+}
+#teabag-suite-list h1 {
+  margin: 0 0 -1px 0;
+  font-weight: 400;
+  font-size: 20px;
+  border-bottom: 1px dotted #cfc8c4;
+}
+#teabag-suite-list h4 {
+  margin: 0;
+  font-weight: 200;
+}
+
 /* Responsive
  *---------------------------------------------------------------------------*/
 @media (max-width: 540px) {
-  body {
-    padding: 25px 5px;
+  #teabag-interface {
+    padding: 15px 5px;
   }
   #teabag-progress {
     margin-right: 15px;

data/app/controllers/teabag/spec_controller.rb

@@ -7,7 +7,11 @@ class Teabag::SpecController < ActionController::Base
     rescue_from Exception, with: :javascript_exception
   end
 
-  def index
+  def suites
+    @suites = Teabag.configuration.suites.keys.map { |suite| Teabag::Suite.new(suite: suite) }
+  end
+
+  def runner
     @suite = Teabag::Suite.new(params)
   end
 

data/app/views/teabag/spec/suites.html.erb

@@ -0,0 +1,40 @@
+<!DOCTYPE>
+<html>
+  <head>
+    <title>Teabag :: Suites</title>
+    <meta name="viewport" content="width=device-width, user-scalable=no">
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag_for_teabag *(@suites.first.present? ? @suites.first.stylesheets : "teabag") %>
+    <%= javascript_include_tag_for_teabag "teabag-teabag" %>
+  </head>
+  <body>
+    <div id="teabag-interface">
+      <div class="teabag-clearfix">
+        <div id="teabag-title">
+          <h1>Teabag</h1>
+          <ul>
+            <li>version: <b><%= Teabag::VERSION %></b></li>
+            <li><a href="http://github.com/modeset/teabag" target="blank">http://github.com/modeset/teabag</a></li>
+          </ul>
+        </div>
+        <div id="teabag-progress"><div class="teabag-indicator modeset-logo"></div></div>
+      </div>
+      <div id="teabag-controls" class="teabag-clearfix">
+        <input type="text" id="teabag-filter-input" placeholder="filter files"/>
+      </div>
+      <hr/>
+      <ul id="teabag-suite-list">
+        <% for suite in @suites %>
+          <li class="suite">
+            <h1><%= link_to suite.name, suite.link %></h1>
+            <ul class="file">
+              <% for file in suite.spec_files %>
+                <h4><%= link_to file[:name], suite.link(file: file[:path]) %></h4>
+              <% end %>
+            </ul>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </body>
+</html>

data/config/routes.rb

@@ -1,4 +1,5 @@
 Teabag::Engine.routes.draw do
-  get "/fixtures/*filename", to: "spec#fixtures", via: :get
-  get "/(:suite)", to: "spec#index", via: :get, defaults: { suite: "default" }
+  get "/fixtures/*filename", to: "spec#fixtures"
+  get "/:suite", to: "spec#runner", defaults: { suite: "default" }
+  root to: "spec#suites"
 end

data/lib/teabag/console.rb

@@ -53,11 +53,11 @@ module Teabag
       parts = []
       parts << "grep=#{URI::encode(@options[:filter])}" if @options[:filter].present?
       @files.each { |file| parts << "file[]=#{URI::encode(file)}" }
-      "?#{parts.join('&')}"
+      "?#{parts.join('&')}" if parts.present?
     end
 
     def url(suite)
-      ["#{@server.url}#{Teabag.configuration.mount_at}", suite, filter].join("/")
+      ["#{@server.url}#{Teabag.configuration.mount_at}", suite, filter].compact.join("/")
     end
   end
 end

data/lib/teabag/drivers/phantomjs/runner.coffee

@@ -50,6 +50,7 @@ class @Runner
 
 
     onLoadFinished: (status) =>
+      return if @start
       @start = new Date().getTime()
       defined = @page.evaluate(-> window.Teabag)
       unless status == "success" && defined

data/lib/teabag/suite.rb

@@ -1,12 +1,12 @@
 module Teabag
   class Suite
 
-    attr_accessor :config
+    attr_accessor :config, :name
     delegate :stylesheets, :helper, to: :config
 
     def initialize(options = {})
       @options = options
-      @name = @options[:suite] || :default
+      @name = (@options[:suite] || :default).to_s
       @config = suite_configuration
     end
 
@@ -22,34 +22,44 @@ module Teabag
       [helper, specs].flatten
     end
 
-    def specs
-      files = specs_from_file
-      return files unless files.empty?
+    def suites
+      {all: Teabag.configuration.suites.keys, active: name}
+    end
 
-      Dir[config.matcher.present? ? Teabag.configuration.root.join(config.matcher) : ""].map do |filename|
-        asset_path_from_filename(File.expand_path(filename))
-      end
+    def spec_files
+      glob.map { |file| {path: file, name: asset_from_file(file)} }
     end
 
-    def suites
-      {all: Teabag.configuration.suites.keys, active: @name.to_s}
+    def link(params = {})
+      query = "?#{params.to_query}" if params.present?
+      [Teabag.configuration.mount_at, name, query].compact.join("/")
     end
 
     protected
 
-    def specs_from_file
-      Array(@options[:file]).map do |filename|
-        asset_path_from_filename(File.expand_path(Teabag.configuration.root.join(filename)))
-      end
+    def specs
+      files = specs_from_file
+      return files unless files.empty?
+      glob.map { |file| asset_from_file(file) }
+    end
+
+    def glob
+      Dir[config.matcher.present? ? Teabag.configuration.root.join(config.matcher) : ""]
     end
 
     def suite_configuration
-      config = Teabag.configuration.suites[@name.to_s]
+      config = Teabag.configuration.suites[name]
       raise Teabag::UnknownSuite unless config.present?
       Teabag::Configuration::Suite.new(&config)
     end
 
-    def asset_path_from_filename(original)
+    def specs_from_file
+      Array(@options[:file]).map do |filename|
+        asset_from_file(File.expand_path(Teabag.configuration.root.join(filename)))
+      end
+    end
+
+    def asset_from_file(original)
       filename = original
       Rails.application.config.assets.paths.each do |path|
         filename = filename.gsub(%r(^#{path}[\/|\\]), "")