visionmedia-jspec 2.5.0 → 2.5.1

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 2.5.1 / 2009-07-07
+
+* Added intermediate node.js support
+* Fixed; grammar now allows foo.bar.baz.stub() etc to convert to stub(foo.bar.baz)
+
 === 2.5.0 / 2009-07-03
 
 * Added contrib in README (thanks to anyone who has helped)

data/Manifest

@@ -26,6 +26,7 @@ spec/spec.jquery.js
 spec/spec.js
 spec/spec.matchers.js
 spec/spec.modules.js
+spec/spec.node.js
 spec/spec.rhino.js
 spec/spec.server.html
 spec/spec.shared-behaviors.js

data/README.rdoc

@@ -12,6 +12,7 @@ and much more.
 * Framework / DOM independent
 * Modular via JSpec Module's and hooks
 * Rhino support
+* Node.js support
 * Async support
 * Ruby JavaScript testing server
 * Nested describes
@@ -563,6 +564,18 @@ Run with:
 * Tabs may cause a parse error. To prevent this use 'soft tabs' (setting in your IDE/Editor)
   or use JSpec's grammar-less alternative (mentioned above).
   
+* The preprocessor is not (yet) capable of multiline conversions. For example the following is invalid
+  
+  object.stub('getContentsOfURL').and_return(function(url){
+    return 'html'
+  })
+  
+  In cases such as this, you may always revert to utilizing JSpec in a grammar-less form as follows:
+  
+  stub(object, 'getContentsOfURL').and_return(function(url){
+    return 'html'
+  })
+  
 == More Information
 
 * Featured article in JSMag: http://www.jsmag.com/main.issues.description/id=21/

data/bin/jspec

@@ -11,7 +11,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.5.0'
+program :version, '2.5.1'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-07-03}
+  s.date = %q{2009-07-07}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["jspec"]
   s.extra_rdoc_files = ["bin/jspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "README.rdoc"]
-  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
+  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.5.0',
+    version   : '2.5.1',
     suites    : [],
     modules   : [],
     allSuites : [],
@@ -1072,8 +1072,9 @@
        object[type + method] = object[method]
        object[method] = function(){}
        return {
-         and_return : function(result) {
-           object[method] = function(){ return result }
+         and_return : function(value) {
+           if (typeof value == 'function') object[method] = value
+           else object[method] = function(){ return value }
          }
       }
      },
@@ -1217,7 +1218,7 @@
     preprocess : function(input) {
       input = hookImmutable('preprocessing', input)
       return input.
-        replace(/(\w+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
+        replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
         replace(/\sit\s+(.*?)$/gm, ' it($1, function(){').
         replace(/^(?: *)(before_each|after_each|before|after)(?= |\n|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
@@ -1444,14 +1445,15 @@
     },
 
     /**
-     * Load a files contents.
+     * Load a _file_'s contents.
      *
      * @param  {string} file
+     * @param  {function} callback
      * @return {string}
      * @api public
      */
 
-    load : function(file) {
+    load : function(file, callback) {
       if (any(hook('loading', file), haveStopped)) return
       if (this.hasXhr()) {
         var request = this.xhr()
@@ -1460,9 +1462,9 @@
         if (request.readyState == 4) return request.responseText
       }
       else if ('readFile' in main)
-        return readFile(file)
+        return callback ? readFile(file, callback) : readFile(file)
       else
-        error('cannot load ' + file)
+        error("failed to load `" + file + "'")
     },
 
     /**
@@ -1475,7 +1477,12 @@
 
     exec : function(file) {
       if (any(hook('executing', file), haveStopped)) return this
-      eval('with (JSpec){' + this.preprocess(this.load(file)) + '}')
+      if ('node' in main)
+        this.load(file, function(contents){
+          eval('with (JSpec){ ' + JSpec.preprocess(contents) + ' }')
+        })
+      else
+        eval('with (JSpec){' + this.preprocess(this.load(file)) + '}')
       return this
     }
   }

data/spec/spec.jquery.js

@@ -10,7 +10,7 @@ describe 'jQuery'
       dom.should.have_text 'test'
     end
   end
-  
+
   describe 'element() / elements()'
     it 'should alias jQuery'
       element.should.be jQuery

data/spec/spec.node.js

@@ -0,0 +1,44 @@
+
+__loading__ = []
+__loadDelay__ = 1000
+
+readFile = function(path, callback) {
+  __loading__.push(path)
+  var promise = node.fs.cat(path, "utf8")
+  promise.addErrback(function(){ throw "failed to read file `" + path + "'" })
+  promise.addCallback(function(contents){
+    setTimeout(function(){
+      if (__loading__[0] == path)
+        __loading__.shift(), callback(contents)
+      else
+        setTimeout(arguments.callee, 50)
+    }, 50)
+  })  
+}
+
+load = function(path) {
+  readFile(path, function(contents){
+    eval(contents)
+  })
+}
+
+load('lib/jspec.js')
+load('spec/modules.js')
+load('spec/spec.grammar-less.js')
+
+setTimeout(function(){
+  JSpec
+  .exec('spec/spec.grammar.js')
+  .exec('spec/spec.js')
+  .exec('spec/spec.matchers.js')
+  .exec('spec/spec.utils.js')
+  .exec('spec/spec.shared-behaviors.js')
+  .exec('spec/spec.modules.js')
+  setTimeout(function(){ 
+    JSpec.run({ formatter : JSpec.formatters.Terminal, failuresOnly : true })
+    setTimeout(function() {
+      JSpec.report()
+    }, __loadDelay__ / 3)
+  }, __loadDelay__ / 3)
+}, __loadDelay__ / 3)
+

data/spec/spec.utils.js

@@ -61,6 +61,24 @@ describe 'Utility'
         destub(object)
         object[' super cool '].should.be_null
       end
+      
+      it 'should stub sub properties using the JSpec grammar'
+        object = { foo : { bar : {}}}
+        object.foo.bar.stub('kitten').and_return('meow')
+        object.foo.bar.kitten().should.eql 'meow'
+        object.foo.bar.destub()
+        object.foo.bar.should.not.respond_to('kitten')
+      end
+      
+      it 'should allow functions to be passed as a method'
+        stub(object, 'post').and_return(function(url, callback){
+          if (url == 'http://jspec.info')
+            callback('is awesome')
+        })
+        object.post('http://jspec.info', function(text){
+          text.should_eql 'is awesome'
+        })
+      end
     end
     
     describe 'destub()'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-07 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - spec/spec.js
 - spec/spec.matchers.js
 - spec/spec.modules.js
+- spec/spec.node.js
 - spec/spec.rhino.js
 - spec/spec.server.html
 - spec/spec.shared-behaviors.js