oojspec 0.0.7 → 0.0.8

data/lib/assets/javascripts/oojspec.js.coffee

@@ -1,4 +1,6 @@
 # =require buster/all
+# =require_self
+# =require ./progress
 
 window.oojspec = new class OojspecRunner
   constructor: ->
@@ -8,12 +10,13 @@ window.oojspec = new class OojspecRunner
     @assertions = buster.assertions
     (logFormatter = buster.create buster.format).quoteStrings = false
     @assertions.format = buster.bind logFormatter, "ascii"
-    @assertions.on 'pass',    => @stats.tests++; @stats.assertions++
-    @assertions.on 'failure', => @stats.tests++; @stats.failures++
+    @assertions.on 'pass',    => @stats.assertions++
+    @assertions.on 'failure', => @stats.failures++
     #@runner.on 'context:start', => @stats.contexts++
-    @runner.on 'test:timeout', => @stats.timeouts++; @assertions.emit 'failure'
-    @runner.on 'test:error', => @stats.errors++
+    @runner.on 'test:timeout',  => @stats.timeouts++; @assertions.emit 'failure'
+    @runner.on 'test:error',    => @stats.errors++
     @runner.on 'test:deferred', => @stats.deferred++
+    @runner.on 'oojspec:examples:add', (count)=> @stats.tests += count
 
     @stats =
       contexts: 0
@@ -30,13 +33,13 @@ window.oojspec = new class OojspecRunner
   runSpecs: ->
     @reporter = buster.reporters.html.create detectCssPath: false
     @reporter.listen @runner
+    d.processDsl @runner for d in @descriptions
     @runner.emit 'suite:start', name: "Specs"
     @runNextDescription()
 
   runNextDescription: =>
     (@runner.emit 'suite:end', @stats; return) unless @descriptions.length
-    # TODO: think about non null contexts usage
-    @descriptions.shift().run @runner, @assertions, null, false, @runNextDescription
+    @descriptions.shift().run @assertions, @runNextDescription
 
   describe: (description, block)=>
     @stats.contexts++ # only root descriptions will be count
@@ -53,14 +56,23 @@ class Description
       @block = @description
       @description = @block.description or @block.name
 
-  run: (@runner, @assertions, @binding, @bare, @onFinish, @beforeBlocks = [], @afterBlocks = [])->
-    @runner.emit 'context:start', name: @description
+  processDsl: (@runner, @binding, @bare)->
     @dsl = new DescribeDsl
-    @doRun() unless (@block.runSpecs or @block.prototype?.runSpecs) and @throwOnInvalidBinding()
+    (@block.runSpecs or @block.prototype?.runSpecs) and @detectBindingError()
 
-  doRun: -> @runAround @beforeBlocks, @afterBlocks, @onDescriptionFinished, @processDescriptionBlock
+    @binding or= {}
+    @injectDsl() unless @bare
+    if @block.runSpecs or @block.prototype?.runSpecs
+      @binding.runSpecs @dsl
+    else
+      @block.call @binding, @dsl
+    @runner.emit 'oojspec:examples:add', @dsl._examplesCount_
+    @removeDsl() unless @bare
+    @bare or= @binding.bare
 
-  throwOnInvalidBinding: ->
+    d.processDsl @runner, @binding, @bare for d in @dsl._examples_ when d instanceof Description
+
+  detectBindingError: ->
     try
       @binding = if @block.prototype then new @block else @block
       if @binding and not (@bare = @block.bare)
@@ -68,10 +80,21 @@ class Description
           throw new Error("'#{reserved}' method is reserved for oojspec usage only")
     catch e
       e.name = "syntax error"
-      @runner.emit 'test:error', name: @description, error: e
-      @onDescriptionFinished(e)
-      return true
-    false
+      @bindingError = e
+
+  injectDsl: -> @binding[p] = v for p, v of @dsl; return
+
+  removeDsl: -> delete @binding[p] for p in RESERVED_FOR_DESCRIPTION_DSL; return
+
+  run: (@assertions, @onFinish, @beforeBlocks = [], @afterBlocks = [])->
+    @runner.emit 'context:start', name: @description
+    if @bindingError
+      @runner.emit 'test:error', name: @description, error: @bindingError
+      @onDescriptionFinished @bindingError
+    else
+      @doRun()
+
+  doRun: -> @runAround @beforeBlocks, @afterBlocks, @onDescriptionFinished, @processDescriptionBlock
 
   onDescriptionFinished: (error)=>
     if error and not error.handled
@@ -84,29 +107,16 @@ class Description
     new AroundBlock(befores, afters, block).run @runner, @assertions, @binding, @bare, onFinish
 
   processDescriptionBlock: (onFinish)=>
-    @binding or= {}
-    @injectDsl() unless @bare
-    if @block.runSpecs or @block.prototype?.runSpecs
-      @binding.runSpecs @dsl
-    else
-      @block.call @binding, @dsl
-    @removeDsl() unless @bare
-    @bare or= @binding.bare
     @runAround @dsl._beforeAllBlocks_, @dsl._afterAllBlocks_, onFinish, (@onExamplesFinished)=>
       @runNextStep()
 
-  injectDsl: -> @binding[p] = v for p, v of @dsl; return
-
-  removeDsl: -> delete @binding[p] for p in RESERVED_FOR_DESCRIPTION_DSL; return
-
   runNextStep: =>
     (@onExamplesFinished(); return) unless @dsl._examples_.length
     nextStep = @dsl._examples_.shift()
     (@reportDeferred(nextStep.description); @runNextStep(); return) if nextStep.pending
     nextTick =
       if nextStep instanceof Description then =>
-        nextStep.run @runner, @assertions, @binding, @bare, @runNextStep, \
-          @dsl._beforeBlocks_, @dsl._afterBlocks_
+        nextStep.run @assertions, @runNextStep, @dsl._beforeBlocks_, @dsl._afterBlocks_
       else => # ExampleWithHooks
         nextStep.run @runner, @assertions, @binding, @bare, @onExampleFinished
     setTimeout nextTick, 0
@@ -138,6 +148,7 @@ class DescribeDsl
     @_afterBlocks_ = []
     @_afterAllBlocks_ = []
     @_examples_ = []
+    @_examplesCount_ = 0 # only examples, not describes
     # aliases:
     @it = @specify = @example
     @context = @describe
@@ -151,8 +162,11 @@ class DescribeDsl
     @_examples_.push new Description(description, block, @_beforeBlocks_, @_afterBlocks_)
   example:   (description, block)=>
     throw new Error("Examples must have a description and a block") unless description and block
+    @_examplesCount_++
     @_examples_.push new ExampleWithHooks(description, @_beforeBlocks_, @_afterBlocks_, block)
-  pending:   (description)=> @_examples_.push {description, pending: true}
+  pending:   (description)=>
+    @_examplesCount_++
+    @_examples_.push {description, pending: true}
 
 class AroundBlock
   constructor: (@beforeBlocks, @afterBlocks, @block)->

data/lib/assets/javascripts/progress.js.coffee

@@ -0,0 +1,36 @@
+new class ProgressStats
+  constructor: (@eh = oojspec.runner)->
+    @total = @count = 0
+    @eh.on 'suite:start', @createElements
+    @eh.on 'oojspec:examples:add', (count)=> @total += count
+    @eh.on 'test:success',  => @addSuccess '. '
+    @eh.on 'test:deferred', => @addSuccess 'd '
+    @eh.on 'test:failure', => @addError 'F '
+    @eh.on 'test:error',   => @addError 'E '
+    @eh.on 'test:timeout', => @addError 'T '
+
+  createElements: =>
+    @numericProgress = @addDivTo 'numeric-progress', document.body
+    @progressBar = @addDivTo 'progress-bar', document.body
+    @progress = @addDivTo 'progress', @progressBar
+
+  addDivTo: (id, to)->
+    div = document.createElement 'div'
+    div.id = id
+    to.appendChild div
+    div
+
+  addSuccess: (text)->
+    el = @addAssertElement text
+    el.className = 'deferred' if text is 'd '
+
+  addError: (text)-> e = @addAssertElement text; e.className = @progress.className = 'fail'
+
+  addAssertElement: (text)->
+    @count++
+    e = document.createElement('span')
+    e.textContent = text
+    @progress.appendChild e
+    @progress.style.width = @count / @total * 100 + '%'
+    @numericProgress.textContent = "#{@count} / #{@total}"
+    e

data/lib/assets/stylesheets/oojspec/progress.css

@@ -0,0 +1,25 @@
+/* Progress bar */
+#progress-bar {
+  background-color: yellow;
+  padding: 0;
+}
+
+#progress {
+  color: darkgreen;
+  font-weight: bold;
+  background-color: lightgreen;
+  position: relative;
+  width: 0;
+}
+
+#progress.fail {
+  background-color: lightpink;
+}
+
+#progress > span.fail {
+  color: red;
+}
+
+#progress > span.deferred {
+  color: yellow;
+}

data/lib/assets/stylesheets/oojspec.css.erb

@@ -1,21 +1,9 @@
-/* =require buster/buster-test */
+/*
+=require buster/buster-test
+=require_tree ./oojspec
+*/
+
 /* override background image for supporting IE7 */
 .buster-test h1 .buster-logo {
   background-image: url(<%= asset_path "buster/logo.png" %>);
 }
-
-/* override margin to use 0.2em on top and bottom instead of 1em at bottom only. */
-.buster-test h1,
-.buster-test h2,
-.buster-test h3,
-.buster-test h4,
-.buster-test h5,
-.buster-test h6,
-.buster-test p {
-  margin: 0.2em 0;
-}
-
-/* was 0 0 1em 15px */
-.buster-test ul {
-    margin: 0.2em 0 0.2em 15px;
-}

data/lib/oojspec/version.rb

@@ -1,3 +1,3 @@
 module Oojspec
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oojspec
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -52,8 +52,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/views/oojspec/runner.html.erb
+- lib/assets/javascripts/progress.js.coffee
 - lib/assets/javascripts/oojspec.js.coffee
 - lib/assets/stylesheets/oojspec.css.erb
+- lib/assets/stylesheets/oojspec/progress.css
 - lib/tasks/oojspec_tasks.rake
 - lib/oojspec/engine.rb
 - lib/oojspec/version.rb
@@ -85,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3773166015855678549
+      hash: -2878099860768326426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3773166015855678549
+      hash: -2878099860768326426
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24