oojspec 0.0.6 → 0.0.7

data/README.md

@@ -23,6 +23,8 @@ I'd rather prefer to write:
 assert(seats.length)
 ```
 
+For a more in-depth introduction, please check-out [this article](http://rosenfeld.herokuapp.com/en/articles/programming/2012-07-20-client-side-code-testing-with-oojspec).
+
 # Examples
 
 [Here is how it looks like](http://oojspec.herokuapp.com/)
@@ -154,7 +156,7 @@ By default this gem will expose `oojspec.describe` to the `window` object so tha
 directly from the top-level, but you can disable this exposition if you prefer:
 
 ```ruby
-config.sandbox_assets.options[:skipt_oojspec_expose] = true
+config.sandbox_assets.options[:skip_oojspec_expose] = true
 ```
 
 # What about non-Rails applications?

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

@@ -1,8 +1,8 @@
 # =require buster/all
-# =require_tree ./oojspec
 
 window.oojspec = new class OojspecRunner
   constructor: ->
+    @timeout = 1000 # 1s - default timeout
     @runner = buster.create buster.eventEmitter
     @descriptions = []
     @assertions = buster.assertions
@@ -56,26 +56,22 @@ class Description
   run: (@runner, @assertions, @binding, @bare, @onFinish, @beforeBlocks = [], @afterBlocks = [])->
     @runner.emit 'context:start', name: @description
     @dsl = new DescribeDsl
-    if @block.runSpecs or @block.prototype?.runSpecs
-      @runWithContext()
-    else
-      @doRun()
+    @doRun() unless (@block.runSpecs or @block.prototype?.runSpecs) and @throwOnInvalidBinding()
 
   doRun: -> @runAround @beforeBlocks, @afterBlocks, @onDescriptionFinished, @processDescriptionBlock
 
-  runWithContext: ->
+  throwOnInvalidBinding: ->
     try
       @binding = if @block.prototype then new @block else @block
       if @binding and not (@bare = @block.bare)
-        for reserved in RESERVED
-          if @binding[reserved]
-            throw new Error("'#{reserved}' method is reserved for oojspec usage only")
-          @binding[reserved] = @dsl[reserved]
-      @doRun()
+        for reserved in RESERVED when @binding[reserved]
+          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
 
   onDescriptionFinished: (error)=>
     if error and not error.handled
@@ -88,14 +84,21 @@ 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
-      binding = @binding or @dsl
-      @block.call binding, @dsl
+      @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()
@@ -254,7 +257,7 @@ class Example
     else
       @waitsFor step...
 
-  waitsFor: (@condition, timeout=1000, @description)->
+  waitsFor: (@condition, timeout = @binding?.timeout or oojspec.timeout, @description)->
     @deadline = timeout + new Date().getTime()
     @keepTryingCondition()
 

data/lib/oojspec/version.rb

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

data/vendor/assets/javascripts/buster/html.js

@@ -18,7 +18,7 @@
         create: function (opt) {
             var reporter = buster.create(this);
             opt = opt || {};
-            reporter.contexts = [];
+            reporter._listStack = [];
             reporter.doc = getDoc(opt);
             var cssPath = opt.cssPath;
             if (!cssPath && opt.detectCssPath !== false) {
@@ -60,7 +60,8 @@
                 "context:start": "contextStart", "context:end": "contextEnd",
                 "test:success": "testSuccess", "test:failure": "testFailure",
                 "test:error": "testError", "test:timeout": "testTimeout",
-                "test:deferred": "testDeferred", "suite:end": "addStats"
+                "test:deferred": "testDeferred", "suite:start": "startTimer",
+                "suite:end": "addStats"
             });
 
             if (runner.console) {
@@ -71,17 +72,20 @@
         },
 
         contextStart: function (context) {
-            if (this.contexts.length == 0) {
-                this.root.appendChild(el(this.doc, "h2", { text: context.name }));
+            var container = this.root;
+            if (this._list) {
+                container = el(this.doc, "li");
+                this._list.appendChild(container);
             }
-
-            this.startedAt = new Date();
-            this.contexts.push(context.name);
+            container.appendChild(el(this.doc, "h2", { text: context.name }));
+            this._list = el(this.doc, "ul");
+            container.appendChild(this._list);
+            this._listStack.unshift(this._list);
         },
 
         contextEnd: function (context) {
-            this.contexts.pop();
-            this._list = null;
+            this._listStack.shift()
+            this._list = this._listStack[0];
         },
 
         testSuccess: function (test) {
@@ -145,6 +149,10 @@
                 stats.tests > 0 && stats.assertions > 0;
         },
 
+        startTimer: function () {
+            this.startedAt = new Date();
+        },
+
         addStats: function (stats) {
             var diff = (new Date() - this.startedAt) / 1000;
 
@@ -182,6 +190,7 @@
         list: function () {
             if (!this._list) {
                 this._list = el(this.doc, "ul", { className: "test-results" });
+                this._listStack.unshift(this._list);
                 this.root.appendChild(this._list);
             }
 
@@ -270,11 +279,10 @@
     function addListItem(tagName, test, className) {
         var prefix = tagName ? "<" + tagName + ">" : "";
         var suffix = tagName ? "</" + tagName + ">" : "";
-        var name = this.contexts.slice(1).join(" ") + " " + test.name;
 
         var item = el(this.doc, "li", {
             className: className,
-            text: prefix + name.replace(/^\s+|\s+$/, "") + suffix
+            text: prefix + test.name + suffix
         });
 
         this.list().appendChild(item);

data/vendor/assets/stylesheets/buster/buster-test.css

@@ -105,11 +105,11 @@ body.buster-test {
 .buster-test h6,
 .buster-test p {
     font-weight: normal;
-    margin: 0 0 1em;
+    margin: 0.2em 0;
 }
 
 .buster-test ul {
-    margin: 0 0 1em 15px;
+    margin: 0.2em 0 0.2em 15px;
 }
 
 /* Masthead */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oojspec
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -52,7 +52,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/views/oojspec/runner.html.erb
-- lib/assets/javascripts/oojspec/reporter/html-multi-level.js.coffee
 - lib/assets/javascripts/oojspec.js.coffee
 - lib/assets/stylesheets/oojspec.css.erb
 - lib/tasks/oojspec_tasks.rake
@@ -86,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1002749213417623209
+      hash: 3773166015855678549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1002749213417623209
+      hash: 3773166015855678549
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/assets/javascripts/oojspec/reporter/html-multi-level.js.coffee

@@ -1,44 +0,0 @@
-h = buster.reporters.html
-h._lists = []
-
-# original private function defined in Buster.js. Re-writing it here in CS
-el = (doc, tagName, properties) ->
-  e = doc.createElement(tagName)
-  for prop, value of properties
-    e.setAttribute prop, value if prop is "http-equiv"
-    prop = "innerHTML" if prop == "text"
-    e[prop] = value
-  e
-
-oldCreate = h.create # patch create
-h.create = ->
-  reporter = oldCreate.apply this, arguments
-  reporter._lists = []
-  reporter
-
-h.contextStart = (context)->
-  container = @root
-  @_list.appendChild container = el(@doc, "li") if @_list
-  container.appendChild el(@doc, "h2", text: context.name)
-  container.appendChild @_list = el(@doc, "ul")
-  @_lists.unshift @_list
-
-# fix Buster.js time reporting
-oldListen = h.listen
-h.listen = (runner)->
-  result = oldListen.apply this, arguments
-  runner.bind this, 'suite:start': 'suiteStart'
-  result
-
-# doesn't currently exist in original reporter
-h.suiteStart = -> @startedAt = new Date()
-
-h.list = ->
-  unless @_list = @_lists[0]
-    @_lists.unshift @_list = el(this.doc, "ul", className: "test-results")
-    @root.appendChild(@_list)
-  @_list
-
-h.contextEnd = (context)->
-  @_lists.shift()
-  @_list = @_lists[0]