jspec 2.11.5 → 2.11.6

data/History.rdoc

@@ -1,4 +1,14 @@
 
+=== 2.11.6 / 2009-10-12
+
+* Added Tony to contributor list
+* Removed JSpec.paramsFor()
+* Removed module contexts [#72]
+* Fixed some css styling issues in IE8 [#71]
+* Fixed; DOM formatter supporting \r\n \r \n for EOL in the body source [Thanks Tony]
+* Fixed "Access is denied" error in IE
+* Fixed some css support for older browsers [Thanks Tony]
+
 === 2.11.5 / 2009-10-10
 
 * Fixed dependencies (created by github's gem builder removal)

data/README.rdoc

@@ -793,6 +793,7 @@ JSpec more enjoyable, and bug free ;)
 * Lawrence Pit
 * mpd@jesters-court.ne
 * kevin.gisi@gmail.com
+* tony_t_tubbs@yahoo.com
 * enno84@gmx.net
 * fnando
 

data/bin/jspec

@@ -12,7 +12,7 @@ require 'server/server'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.11.5'
+program :version, '2.11.6'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 

data/jspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.11.5"
+  s.version = "2.11.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-12}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.css

@@ -2,10 +2,11 @@ body.jspec {
   margin: 45px 0;
   font: 12px "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
   background: #efefef url(images/bg.png) top left repeat-x;
+  text-align: center;
 }
 #jspec {
   margin: 0 auto;
-  padding-top: 25px;
+  padding-top: 30px;
   width: 1008px;
   background: url(images/vr.png) top left repeat-y;
   text-align: left;
@@ -30,8 +31,8 @@ body.jspec {
   background: url(images/loading.gif) 50% 50% no-repeat;
 }
 #jspec-title {
-  position: relative;
-  top: 35px;
+  position: absolute;
+  top: 15px;
   left: 20px;
   width: 160px;
   font-size: 22px;
@@ -74,7 +75,6 @@ body.jspec {
   color: #FA1616;
 }
 #jspec-report table {
-  width: 100%;
   font-size: 11px;
   border-collapse: collapse;
 }
@@ -90,7 +90,8 @@ body.jspec {
   margin: 0;
   padding: 0 0 5px 25px;
 }
-#jspec-report tr:not(.body):hover + tr.body {
+#jspec-report tr.even:hover + tr.body, 
+#jspec-report tr.odd:hover + tr.body {
   display: block;
 }
 #jspec-report tr td:first-child em {
@@ -98,7 +99,8 @@ body.jspec {
   font-weight: normal;
   color: #7B8D9B;
 }
-#jspec-report tr:not(.description):hover {
+#jspec-report tr.even:hover, 
+#jspec-report tr.odd:hover {
   text-shadow: 1px 1px 1px #fff;
   background: #F2F5F7;
 }

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.11.5',
+    version   : '2.11.6',
     cache     : {},
     suites    : [],
     modules   : [],
@@ -143,7 +143,7 @@
           return JSpec.
             escape(JSpec.contentsOf(body)).
             replace(/^ */gm, function(a){ return (new Array(Math.round(a.length / 3))).join(' ') }).
-            replace("\n", '<br/>')
+            replace(/\r\n|\r|\n/gm, '<br/>')
         }
         
         report.innerHTML = '<div id="jspec-report" class="' + classes + '"><div class="heading"> \
@@ -726,14 +726,9 @@
      */
     
     evalHook : function(module, name, args) {
-      var context = this.context || this.defaultContext
-      var contents = this.contentsOf(module[name])
-      var params = this.paramsFor(module[name])
-      module.utilities = module.utilities || {}
-      params.unshift('context'); args.unshift(context)
-      hook('evaluatingHookBody', module, name, context)
-      try { return new Function(params.join(), 'with (this.utilities) { with (context) { with (JSpec) {  ' + contents + ' }}}').apply(module, args) }
-      catch(e) { error('Error in hook ' + module.name + "." + name + ': ', e) }
+      hook('evaluatingHookBody', module, name)
+      try { return module[name].apply(module, args) }
+      catch(e) { error('Error in hook ' + module.name + '.' + name + ': ', e) }
     },
     
     /**
@@ -1311,18 +1306,6 @@
     contentsOf : function(body) {
       return body.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1]
     },
-    
-    /**
-     * Return param names for a function body.
-     *
-     * @param  {function} body
-     * @return {array}
-     * @api public
-     */
-    
-    paramsFor : function(body) {
-      return body.toString().match(/\((.*?)\)/)[1].match(/[\w]+/g) || []
-    },
 
     /**
      * Evaluate a JSpec capture body.
@@ -1549,12 +1532,33 @@
     /**
      * Instantiate an XMLHttpRequest.
      *
+     * Here we utilize IE's lame ActiveXObjects first which
+     * allow IE access serve files via the file: protocol, otherwise
+     * we then default to XMLHttpRequest.
+     *
      * @return {XMLHttpRequest, ActiveXObject}
      * @api private
      */
     
     xhr : function() {
-      return new (JSpec.request || ActiveXObject("Microsoft.XMLHTTP"))
+      return this.ieXhr() || new JSpec.request
+    },
+    
+    /**
+     * Return Microsoft piece of crap ActiveXObject.
+     *
+     * @return {ActiveXObject}
+     * @api public
+     */
+    
+    ieXhr : function() {
+      function object(str) {
+        try { return new ActiveXObject(str) } catch(e) {}
+      }
+      return object('Msxml2.XMLHTTP.6.0') ||
+        object('Msxml2.XMLHTTP.3.0') ||
+        object('Msxml2.XMLHTTP') ||
+        object('Microsoft.XMLHTTP')
     },
     
     /**
@@ -1601,7 +1605,7 @@
         request.send(null)
         if (request.readyState == 4 && 
            (request.status == 0 || 
-            parseInt(request.status.toString()[0]) == 2)) 
+            request.status.toString().charAt(0) == 2)) 
           return request.responseText
       }
       else

data/lib/jspec.xhr.js

@@ -167,7 +167,7 @@
     // --- Hooks
 
     afterSpec : function() {
-      this.utilities.unmockRequest()
+      unmockRequest()
     },
     
     // --- DSLs

data/spec/helpers.js

@@ -34,14 +34,10 @@ JSpec.include({
   randomHook : function(a, b) {
     return [a, b]
   },
-  beforeSpec  : function() { addedBeforeSpec  = true; doFoo()  },
+  beforeSpec  : function() { addedBeforeSpec  = true; this.utilities.doFoo()  },
   afterSpec   : function() { addedAfterSpec   = true  },
   beforeSuite : function() { addedBeforeSuite = true  },
   afterSuite  : function() { addedAfterSuite  = true  },
-  checkJSpecContext : function(){ return each },
-  checkContext : function() { return fixture('test') },
-  checkModuleContext : function() { return this.name },
-  checkUtilityContext : function() { return doFoo() },
   matchers : {
     be_foo_bar : function() {
       return true

data/spec/spec.modules.js

@@ -19,22 +19,6 @@ describe 'JSpec'
       it 'should run afterSuite'
         addedAfterSuite.should.be_true
       end
-    
-      it 'should run in context with JSpec'
-        hook('checkJSpecContext')[0].should.equal JSpec.each
-      end
-      
-      it 'should run in context to JSpecs default context'
-        hook('checkContext')[0].should.eql fixture('test')
-      end
-      
-      it 'should run in context to the module itself'
-        hook('checkModuleContext')[0].should.eql 'ExampleModule'
-      end
-      
-      it 'should run in context to the modules utilities'
-        hook('checkUtilityContext')[0].should.eql 'foo'
-      end
     end
     
     describe '.hook()'

data/spec/spec.utils.js

@@ -259,21 +259,4 @@ describe 'Utility'
     end
   end
   
-  describe 'paramsFor()'
-    it 'should return an array of function parameter names'
-      JSpec.paramsFor(function(foo, bar){}).should.eql ['foo', 'bar']
-    end
-    
-    it 'should return only the params for the root function'
-      foo = function(bar){
-        function baz(test) {}
-        var something = function(foo, bar){}
-      }
-      JSpec.paramsFor(foo).should.eql ['bar']
-    end
-    
-    it 'should return empty array when no params are present'
-      JSpec.paramsFor(function(){}).should.eql []
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jspec
 version: !ruby/object:Gem::Version 
-  version: 2.11.5
+  version: 2.11.6
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-12 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency