teaspoon 0.9.1 → 1.0.0

data/app/assets/javascripts/teaspoon/{base/reporters → reporters}/html/failure_view.coffee

@@ -1,3 +1,5 @@
+#= require teaspoon/reporters/html/base_view
+
 class Teaspoon.Reporters.HTML.FailureView extends Teaspoon.Reporters.BaseView
 
   constructor: (@spec) ->

data/app/assets/javascripts/teaspoon/reporters/html/progress_view.coffee

@@ -0,0 +1,18 @@
+#= require teaspoon/reporters/html/base_view
+
+class Teaspoon.Reporters.HTML.ProgressView extends Teaspoon.Reporters.BaseView
+
+  @create: (displayProgress = true) ->
+    return new Teaspoon.Reporters.HTML.ProgressView() unless displayProgress
+    if Teaspoon.Reporters.HTML.RadialProgressView.supported
+      new Teaspoon.Reporters.HTML.RadialProgressView()
+    else
+      new Teaspoon.Reporters.HTML.SimpleProgressView()
+
+
+  build: ->
+    @el = @createEl("div", "teaspoon-indicator teaspoon-logo")
+
+
+  update: ->
+    # do nothing

data/app/assets/javascripts/teaspoon/{base/reporters/html/progress_view.coffee → reporters/html/radial_progress_view.coffee}

@@ -1,37 +1,4 @@
-class Teaspoon.Reporters.HTML.ProgressView extends Teaspoon.Reporters.BaseView
-
-  @create: (displayProgress = true) ->
-    return new Teaspoon.Reporters.HTML.ProgressView() unless displayProgress
-    if Teaspoon.Reporters.HTML.RadialProgressView.supported
-      new Teaspoon.Reporters.HTML.RadialProgressView()
-    else
-      new Teaspoon.Reporters.HTML.SimpleProgressView()
-
-
-  build: ->
-    @el = @createEl("div", "teaspoon-indicator teaspoon-logo")
-
-
-  update: ->
-    # do nothing
-
-
-
-class Teaspoon.Reporters.HTML.SimpleProgressView extends Teaspoon.Reporters.HTML.ProgressView
-
-  build: ->
-    @el = @createEl("div", "simple-progress")
-    @el.innerHTML = """
-      <em id="teaspoon-progress-percent">0%</em>
-      <span id="teaspoon-progress-span" class="teaspoon-indicator"></span>
-    """
-
-
-  update: (total, run) ->
-    percent = if total then Math.ceil((run * 100) / total) else 0
-    @setHtml("progress-percent", "#{percent}%")
-
-
+#= require teaspoon/reporters/html/progress_view
 
 class Teaspoon.Reporters.HTML.RadialProgressView extends Teaspoon.Reporters.HTML.ProgressView
 

data/app/assets/javascripts/teaspoon/reporters/html/simple_progress_view.coffee

@@ -0,0 +1,15 @@
+#= require teaspoon/reporters/html/progress_view
+
+class Teaspoon.Reporters.HTML.SimpleProgressView extends Teaspoon.Reporters.HTML.ProgressView
+
+  build: ->
+    @el = @createEl("div", "simple-progress")
+    @el.innerHTML = """
+      <em id="teaspoon-progress-percent">0%</em>
+      <span id="teaspoon-progress-span" class="teaspoon-indicator"></span>
+    """
+
+
+  update: (total, run) ->
+    percent = if total then Math.ceil((run * 100) / total) else 0
+    @setHtml("progress-percent", "#{percent}%")

data/app/assets/javascripts/teaspoon/{base/reporters → reporters}/html/spec_view.coffee

@@ -1,3 +1,5 @@
+#= require teaspoon/reporters/html/base_view
+
 class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
 
   viewId = 0
@@ -23,7 +25,7 @@ class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
     if parent.viewId
       @views.suites[parent.viewId]
     else
-      view = new Teaspoon.Reporters.HTML.SuiteView(parent, @reporter)
+      view = new (Teaspoon.resolveClass("Reporters.HTML.SuiteView"))(parent, @reporter)
       @views.suites[view.suite.viewId] = view
 
 
@@ -40,7 +42,7 @@ class Teaspoon.Reporters.HTML.SpecView extends Teaspoon.Reporters.BaseView
     result = @spec.result()
     classes = ["state-#{state}"]
     classes.push("slow") if elapsed > Teaspoon.slow
-    @el.innerHTML += "<span>#{elapsed}ms</span>" unless state == "failed"
+    @el.innerHTML += "<span>#{elapsed}ms</span>" if state == "passed"
     @el.className = classes.join(" ")
-    @buildErrors() unless result.status == "passed"
+    @buildErrors() if result.status == "failed"
     @parentView.updateState?(state)

data/app/assets/javascripts/teaspoon/{base/reporters → reporters}/html/suite_view.coffee

@@ -1,3 +1,5 @@
+#= require teaspoon/reporters/html/base_view
+
 class Teaspoon.Reporters.HTML.SuiteView extends Teaspoon.Reporters.BaseView
 
   viewId = 0
@@ -6,7 +8,7 @@ class Teaspoon.Reporters.HTML.SuiteView extends Teaspoon.Reporters.BaseView
     @views = @reporter.views
     @suite.viewId = viewId += 1
     @views.suites[@suite.viewId] = @
-    @suite = new Teaspoon.Suite(@suite)
+    @suite = new (Teaspoon.resolveClass("Suite"))(@suite)
     super
 
 
@@ -23,7 +25,7 @@ class Teaspoon.Reporters.HTML.SuiteView extends Teaspoon.Reporters.BaseView
     if parent.viewId
       @views.suites[parent.viewId]
     else
-      view = new Teaspoon.Reporters.HTML.SuiteView(parent, @reporter)
+      view = new (Teaspoon.resolveClass("Reporters.HTML.SuiteView"))(parent, @reporter)
       @views.suites[view.suite.viewId] = view
 
 

data/app/assets/javascripts/teaspoon/{base/runner.coffee → runner.coffee}

@@ -20,13 +20,17 @@ class Teaspoon.Runner
 
   getReporter: ->
     if @params["reporter"]
-      Teaspoon.Reporters[@params["reporter"]]
+      @findReporter(@params["reporter"])
     else
       if window.navigator.userAgent.match(/PhantomJS/)
-        Teaspoon.Reporters.Console
+        @findReporter("Console")
       else
-        Teaspoon.Reporters.HTML
+        @findReporter("HTML")
 
 
   setup: ->
     # left for subclasses to implement
+
+
+  findReporter: (type) ->
+    Teaspoon.resolveClass("Reporters.#{type}")

data/app/assets/javascripts/teaspoon/teaspoon.coffee

@@ -1,32 +1,90 @@
-class TeaspoonInterface
-
-  constructor: ->
-    @files = $u("#teaspoon-suite-list .file a")
-    @input = $u("#teaspoon-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 TeaspoonInterface()
-
-`
-/*!
- * 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);
-`
+#= require_self
+#= require teaspoon/runner
+#= require teaspoon/fixture
+#= require teaspoon/hook
+#= require teaspoon/reporters/html
+#= require teaspoon/reporters/console
+
+class @Teaspoon
+  @defer:     false
+  @slow:      75
+  @root:      window.location.pathname.replace(/\/+(index\.html)?$/, "").replace(/\/[^\/]*$/, "")
+  @started:   false
+  @finished:  false
+  @Reporters: {}
+  @Date:      Date
+  @location:  window.location
+  @messages:  []
+
+  @execute: ->
+    unless Teaspoon.framework
+      throw "No framework registered. Expected a framework to register itself, but nothing has."
+
+    if Teaspoon.defer
+      Teaspoon.defer = false
+      return
+    Teaspoon.reload() if Teaspoon.started
+    Teaspoon.started = true
+    new (Teaspoon.resolveClass("Runner"))()
+
+
+  @reload: ->
+    window.location.reload()
+
+
+  @onWindowLoad: (method) ->
+    originalOnload = window.onload
+    window.onload = ->
+      originalOnload() if originalOnload && originalOnload.call
+      method()
+
+
+  @resolveDependenciesFromParams: (all = []) ->
+    deps = []
+    return all if (paths = Teaspoon.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
+
+    for path in paths
+      parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i)
+      continue if parts == null
+      file = parts[1].substr(parts[1].lastIndexOf("/") + 1)
+      for dep in all then deps.push(dep) if dep.indexOf(file) >= 0
+    deps
+
+
+  @log: ->
+    Teaspoon.messages.push(arguments[0])
+    try console.log(arguments...)
+    catch e
+      throw new Error("Unable to use console.log for logging")
+
+
+  @getMessages: ->
+    messages = Teaspoon.messages
+    Teaspoon.messages = []
+    messages
+
+
+  @setFramework: (namespace) ->
+    Teaspoon.framework = namespace
+    window.fixture = Teaspoon.resolveClass("Fixture")
+
+
+  # This checks if a framework has overridden a core class and if we should
+  # load that instead of the core base class.
+  @resolveClass: (klass) ->
+    if framework_override = Teaspoon.checkNamespace(Teaspoon.framework, klass)
+      return framework_override
+    else if teaspoon_core = Teaspoon.checkNamespace(Teaspoon, klass)
+      return teaspoon_core
+
+    throw "Could not find the class you're looking for: #{klass}"
+
+
+  @checkNamespace: (root, klass) ->
+    namespaces = klass.split('.')
+    scope = root
+
+    for namespace, i in namespaces
+      return false if !(scope = scope[namespace])
+
+    return scope

data/app/controllers/teaspoon/suite_controller.rb

@@ -1,4 +1,5 @@
 class Teaspoon::SuiteController < ActionController::Base
+  before_filter :check_env
   before_filter :prepend_fixture_paths
 
   layout false
@@ -23,6 +24,10 @@ class Teaspoon::SuiteController < ActionController::Base
 
   private
 
+  def check_env
+    Teaspoon::Environment.check_env!
+  end
+
   def prepend_fixture_paths
     Teaspoon.configuration.fixture_paths.each do |path|
       prepend_view_path Teaspoon.configuration.root.join(path)

data/app/views/teaspoon/suite/index.html.erb

@@ -4,7 +4,7 @@
     <title>Teaspoon :: Suites</title>
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <%= stylesheet_link_tag "teaspoon" %>
-    <%= javascript_include_tag "teaspoon-teaspoon" %>
+    <%= javascript_include_tag "teaspoon-filterer" %>
   </head>
   <body>
     <div id="teaspoon-interface">

data/lib/generators/teaspoon/install/install_generator.rb

@@ -1,88 +1,118 @@
+require "teaspoon/exceptions"
+require "rails/generators"
+
 module Teaspoon
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../", __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       desc "Installs the Teaspoon initializer into your application."
 
       class_option :framework,
                    type: :string,
                    aliases: "-t",
-                   default: "jasmine",
-                   desc:    "Specify which test framework to use (Available: jasmine, mocha, or qunit)"
+                   default: Teaspoon::Framework.default,
+                   desc: "Specify which test framework to use (Available: #{Teaspoon::Framework.available.keys.join(', ')})"
+
+      class_option :version,
+                   type: :string,
+                   aliases: "-v",
+                   default: nil,
+                   desc: "Specify the framework version to use (Depends on the framework)"
 
       class_option :coffee,
                    type: :boolean,
                    aliases: "-c",
                    default: false,
-                   desc:    "Generate a CoffeeScript spec helper instead of Javascript"
+                   desc: "Generate a CoffeeScript spec helper instead of Javascript"
 
-      class_option :no_comments,
+      class_option :documentation,
                    type: :boolean,
-                   aliases: "-q",
-                   default: false,
-                   desc:    "Install the teaspoon_env.rb without comments"
+                   aliases: ["-d"],
+                   default: true,
+                   desc: "Install the teaspoon_env.rb with comment documentation"
 
       class_option :partials,
                    type: :boolean,
                    aliases: "-p",
                    default: false,
-                   desc:    "Copy the boot and body partials"
+                   desc: "Copy the boot and body partials"
 
-      def validate_framework
-        return if frameworks.include?(options[:framework])
-        puts "Unknown framework -- available #{frameworks.join(', ')}"
-        exit(1)
+      def verify_framework_and_version
+        version.present?
+        framework
+      rescue
+        abort_with_message if behavior == :invoke
       end
 
       def copy_environment
-        if options[:no_comments]
-          copy_file "templates/#{framework}/env.rb",
-                    "#{framework_type}/teaspoon_env.rb"
-        else
-          template "templates/#{framework}/env_comments.rb.tt",
-                   "#{framework_type}/teaspoon_env.rb"
-        end
+        source = options[:documentation] ? "env_comments.rb.tt" : "env.rb.tt"
+        template source, "#{framework.install_path}/teaspoon_env.rb"
       end
 
       def create_structure
-        empty_directory "#{framework_type}/javascripts/support"
-        empty_directory "#{framework_type}/javascripts/fixtures"
+        empty_directory "#{framework.install_path}/javascripts/support"
+        empty_directory "#{framework.install_path}/javascripts/fixtures"
       end
 
-      def copy_spec_helper
-        copy_file "templates/#{framework}/#{framework_type}_helper.#{helper_ext}",
-                  "#{framework_type}/javascripts/#{framework_type}_helper.#{helper_ext}"
+      def install_framework_files
+        instance_eval(&framework.install_callback)
       end
 
       def copy_partials
         return unless options[:partials]
-        copy_file "templates/_boot.html.erb",
-                  "#{framework_type}/javascripts/fixtures/_boot.html.erb"
-        copy_file "templates/_body.html.erb",
-                  "#{framework_type}/javascripts/fixtures/_body.html.erb"
+        copy_file "_boot.html.erb", "#{framework.install_path}/javascripts/fixtures/_boot.html.erb"
+        copy_file "_body.html.erb", "#{framework.install_path}/javascripts/fixtures/_body.html.erb"
       end
 
-      def display_readme
+      def display_post_install
         readme "POST_INSTALL" if behavior == :invoke
       end
 
       private
 
+      def described_frameworks
+        Teaspoon::Framework.available.map do |framework, options|
+          klass = Teaspoon::Framework.fetch(framework)
+          "#{framework}: versions[#{klass.versions.join(', ')}]"
+        end
+      end
+
       def framework
-        options[:framework]
+        @framework ||= begin
+          framework = Teaspoon::Framework.fetch(options[:framework])
+          source_paths
+          @source_paths = framework.template_paths + @source_paths
+          framework
+        end
+      end
+
+      def suite
+        @suite ||= begin
+          config = Teaspoon::Configuration::Suite.new
+          framework.modify_config(config)
+          config
+        end
       end
 
-      def frameworks
-        %w{jasmine mocha qunit}
+      def version
+        @version ||= options[:version] ? determine_requested_version : framework.versions.last
       end
 
-      def helper_ext
-        (options[:coffee]) ? "coffee" : "js"
+      def determine_requested_version
+        return options[:version] if framework.versions.include?(options[:version])
+        raise Teaspoon::UnknownFrameworkVersion.new(name: framework.name, version: options[:version])
       end
 
-      def framework_type
-        (options[:framework] == "qunit") ? "test" : "spec"
+      def abort_with_message
+        if Teaspoon::Framework.available.empty?
+          readme "MISSING_FRAMEWORK"
+        else
+          message = "Unknown framework: #{options[:framework]}#{options[:version] ? "[#{options[:version]}]" : ''}"
+          message << "\n  Available: #{described_frameworks.join("\n             ")}"
+          say_status message, nil, :red
+        end
+        exit(1)
       end
     end
   end