jspec 2.11.13 → 3.0.0

data/jspec.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.11.13"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2010-01-04}
   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 = ["README.rdoc", "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", "lib/jspec.shell.js", "lib/jspec.timers.js", "lib/jspec.xhr.js"]
-  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "bin/jspec", "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", "lib/jspec.shell.js", "lib/jspec.timers.js", "lib/jspec.xhr.js", "server/browsers.rb", "server/helpers.rb", "server/routes.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/helpers.js", "spec/jquery.js", "spec/server.rb", "spec/spec.dom.html", "spec/spec.fixtures.js", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.jquery.xhr.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", "spec/spec.xhr.js", "templates/default/History.rdoc", "templates/default/README.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/spec/server.rb", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html", "templates/rails/server.rb", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/spec.server.html"]
+  s.extra_rdoc_files = ["README.md", "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.growl.js", "lib/jspec.jquery.js", "lib/jspec.js", "lib/jspec.shell.js", "lib/jspec.timers.js", "lib/jspec.xhr.js"]
+  s.files = ["History.md", "Manifest", "README.md", "Rakefile", "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.growl.js", "lib/jspec.jquery.js", "lib/jspec.js", "lib/jspec.shell.js", "lib/jspec.timers.js", "lib/jspec.xhr.js", "spec/commands/example_command.rb", "spec/dom.html", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/node.js", "spec/rhino.js", "spec/ruby/bin/init_spec.rb", "spec/ruby/bin/install_spec.rb", "spec/ruby/bin/run_spec.rb", "spec/ruby/bin/shell_spec.rb", "spec/ruby/bin/spec_helper.rb", "spec/ruby/bin/update_spec.rb", "spec/server.html", "spec/server.rb", "spec/support/env.js", "spec/support/jquery.js", "spec/unit/helpers.js", "spec/unit/spec.fixtures.js", "spec/unit/spec.grammar-less.js", "spec/unit/spec.grammar.js", "spec/unit/spec.jquery.js", "spec/unit/spec.jquery.xhr.js", "spec/unit/spec.js", "spec/unit/spec.matchers.js", "spec/unit/spec.modules.js", "spec/unit/spec.shared-behaviors.js", "spec/unit/spec.utils.js", "spec/unit/spec.xhr.js", "src/browsers.rb", "src/helpers.rb", "src/installables.rb", "src/project.rb", "src/routes.rb", "src/server.rb", "support/js.jar", "templates/default/History.md", "templates/default/Readme.md", "templates/default/lib/yourlib.js", "templates/default/spec/commands/example_command.rb", "templates/default/spec/dom.html", "templates/default/spec/rhino.js", "templates/default/spec/server.html", "templates/default/spec/server.rb", "templates/default/spec/unit/spec.helper.js", "templates/default/spec/unit/spec.js", "templates/rails/commands/example_commands.rb", "templates/rails/dom.html", "templates/rails/rhino.js", "templates/rails/server.html", "templates/rails/server.rb", "templates/rails/unit/spec.helper.js", "templates/rails/unit/spec.js", "jspec.gemspec"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jspec}
   s.rubygems_version = %q{1.3.5}

data/lib/jspec.css

@@ -114,12 +114,12 @@ body.jspec {
   background: url(images/sprites.png) 3px -7px no-repeat;
 }
 #jspec-report td.fail {
-  background: url(images/sprites.png) 3px -47px no-repeat;
+  background: url(images/sprites.png) 3px -158px no-repeat;
   font-weight: bold;
   color: #FC0D0D;
 }
 #jspec-report td.requires-implementation {
-  background: url(images/sprites.png) 3px -87px no-repeat;
+  background: url(images/sprites.png) 3px -333px no-repeat;
 }
 #jspec-report tr.description td {
   margin-top: 25px;

data/lib/jspec.growl.js

@@ -0,0 +1,115 @@
+
+// JSpec - Growl - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
+
+;(function(){
+  
+  Growl = {
+    
+    // --- Version
+    
+    version: '1.0.0',
+    
+    /**
+     * Execute the given _cmd_, returning an array of lines from stdout.
+     *
+     * Examples:
+     *
+     *   Growl.exec('growlnotify', '-m', msg)
+     *
+     * @param  {string ...} cmd
+     * @return {array}
+     * @api public
+     */
+
+    exec: function(cmd) {
+      var lines = [], line
+      with (JavaImporter(java.lang, java.io)) {
+        var proccess = Runtime.getRuntime().exec(Array.prototype.slice.call(arguments))
+        var stream = new DataInputStream(proccess.getInputStream())
+        while (line = stream.readLine())
+          lines.push(line + '')
+        stream.close()    
+      }
+      return lines
+    },
+    
+    /**
+     * Return the extension of the given _path_ or null.
+     *
+     * @param  {string} path
+     * @return {string}
+     * @api private
+     */
+    
+    extname: function(path) {
+      return path.lastIndexOf('.') != -1 ? 
+        path.slice(path.lastIndexOf('.') + 1, path.length) :
+          null
+    },
+
+    /**
+     * Version of the 'growlnotify' binary.
+     *
+     * @return {string}
+     * @api private
+     */
+
+    binVersion: function() {
+      try { return this.exec('growlnotify', '-v')[0].split(' ')[1] } catch (e) {}
+    },
+
+    /**
+     * Send growl notification _msg_ with _options_.
+     *
+     * Options:
+     *
+     *  - title   Notification title
+     *  - sticky  Make the notification stick (defaults to false)
+     *  - name    Application name (defaults to growlnotify)
+     *  - image
+     *    - path to an icon sets --iconpath
+     *    - path to an image sets --image
+     *    - capitalized word sets --appIcon
+     *    - filename uses extname as --icon
+     *    - otherwise treated as --icon
+     *
+     * Examples:
+     *
+     *   Growl.notify('New email')
+     *   Growl.notify('5 new emails', { title: 'Thunderbird' })
+     *
+     * @param {string} msg
+     * @param {options} hash
+     * @api public
+     */
+
+    notify: function(msg, options) {
+      options = options || {}
+      var args = ['growlnotify', '-m', msg]
+      if (!this.binVersion()) throw new Error('growlnotify executable is required')
+      if (image = options.image) {
+        var flag, ext = this.extname(image)
+        flag = flag || ext == 'icns' && 'iconpath'
+        flag = flag || /^[A-Z]/.test(image) && 'appIcon'
+        flag = flag || /^png|gif|jpe?g$/.test(ext) && 'image'
+        flag = flag || ext && (image = ext) && 'icon'
+        flag = flag || 'icon'
+        args.push('--' + flag, image)
+      }
+      if (options.sticky) args.push('--sticky')
+      if (options.name) args.push('--name', options.name)
+      if (options.title) args.push(options.title)
+      this.exec.apply(this, args)
+    }
+  }
+  
+  JSpec.include({
+    name: 'Growl',
+    reporting: function(options){
+      var stats = JSpec.stats
+      if (stats.failures) Growl.notify('failed ' + stats.failures + ' assertions', { title: 'JSpec'})
+      else Growl.notify('passed ' + stats.passes + ' assertions', { title: 'JSpec' })
+    }
+  })
+  
+})()

data/lib/jspec.jquery.js

@@ -47,7 +47,7 @@ JSpec
     },
 
     have_classes : function(actual) {
-      return !JSpec.any(JSpec.argumentsToArray(arguments, 1), function(arg){
+      return !JSpec.any(JSpec.toArray(arguments, 1), function(arg){
         return !JSpec.does(actual, 'have_class', arg)
       })
     },

data/lib/jspec.js

@@ -1,20 +1,20 @@
 
 // JSpec - Core - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
-(function(){
+;(function(){
 
   JSpec = {
-
-    version   : '2.11.13',
+    version   : '3.1.0',
+    assert    : true,
     cache     : {},
     suites    : [],
     modules   : [],
     allSuites : [],
     matchers  : {},
     stubbed   : [],
+    options   : {},
     request   : 'XMLHttpRequest' in this ? XMLHttpRequest : null,
     stats     : { specs: 0, assertions: 0, failures: 0, passes: 0, specsFinished: 0, suitesFinished: 0 },
-    options   : { profile: false },
 
     /**
      * Default context in which bodies are evaluated.
@@ -51,15 +51,12 @@
       },
       
       /**
-       * Load fixture at _path_. This utility function
-       * supplies the means to resolve, and cache fixture contents
-       * via the DOM or Rhino.
+       * Load fixture at _path_.
        *
        * Fixtures are resolved as:
        *
        *  - <path>
-       *  - fixtures/<path>
-       *  - fixtures/<path>.html
+       *  - <path>.html
        *
        * @param  {string} path
        * @return {string}
@@ -69,18 +66,14 @@
       fixture : function(path) {
         if (JSpec.cache[path]) return JSpec.cache[path]
         return JSpec.cache[path] = 
-          JSpec.tryLoading(path) ||
-          JSpec.tryLoading('fixtures/' + path) ||
-          JSpec.tryLoading('fixtures/' + path + '.html') ||
-          JSpec.tryLoading('spec/' + path) ||
-          JSpec.tryLoading('spec/fixtures/' + path) ||
-          JSpec.tryLoading('spec/fixtures/' + path + '.html')
+          JSpec.tryLoading(JSpec.options.fixturePath + '/' + path) ||
+          JSpec.tryLoading(JSpec.options.fixturePath + '/' + path + '.html')
       }
     },
 
     // --- Objects
     
-    formatters : {
+    reporters : {
       
       /**
        * Report to server.
@@ -123,7 +116,7 @@
       },
 
       /**
-       * Default formatter, outputting to the DOM.
+       * Default reporter, outputting to the DOM.
        *
        * Options:
        *   - reportToId    id of element to output reports to, defaults to 'jspec'
@@ -149,6 +142,7 @@
         report.innerHTML = '<div id="jspec-report" class="' + classes + '"><div class="heading"> \
         <span class="passes">Passes: <em>' + results.stats.passes + '</em></span>                \
         <span class="failures">Failures: <em>' + results.stats.failures + '</em></span>          \
+        <span class="passes">Duration: <em>' + results.duration + '</em> ms</span>          \
         </div><table class="suites">' + map(results.allSuites, function(suite) {
           var displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
           if (displaySuite && suite.hasSpecs())
@@ -170,7 +164,7 @@
       },
       
       /**
-       * Terminal formatter.
+       * Terminal reporter.
        *
        * @api public
        */
@@ -178,7 +172,8 @@
        Terminal : function(results, options) {
          failuresOnly = option('failuresOnly')
          print(color("\n Passes: ", 'bold') + color(results.stats.passes, 'green') + 
-              color(" Failures: ", 'bold') + color(results.stats.failures, 'red') + "\n")
+               color(" Failures: ", 'bold') + color(results.stats.failures, 'red') +
+               color(" Duration: ", 'bold') + color(results.duration, 'green') + " ms \n")
               
          function indent(string) {
            return string.replace(/^(.)/gm, '  $1')
@@ -208,7 +203,7 @@
        },
 
       /**
-       * Console formatter.
+       * Console reporter.
        *
        * @api public
        */
@@ -246,7 +241,8 @@
         // Report assertion results
         
         report : function() {
-          this.passed ? JSpec.stats.passes++ : JSpec.stats.failures++
+          if (JSpec.assert) 
+            this.passed ? JSpec.stats.passes++ : JSpec.stats.failures++
           return this
         },
         
@@ -270,7 +266,7 @@
       // Proxy
       
       object[method] = function(){
-        args = argumentsToArray(arguments)
+        args = toArray(arguments)
         result = old.apply(object, args)
         self.calls.push({ args : args, result : result })
         return result
@@ -302,7 +298,7 @@
         // Proxy arguments passed
         
         with_args : function() {
-          this.expectedArgs = argumentsToArray(arguments)
+          this.expectedArgs = toArray(arguments)
           return this
         },
         
@@ -312,7 +308,7 @@
           return any(this.calls, function(call){
             return self.expectedResult.an_instance_of ?
                      call.result.constructor != self.expectedResult.an_instance_of:
-                       hash(self.expectedResult) != hash(call.result)
+                       !equal(self.expectedResult, call.result)
           })
         },
         
@@ -322,7 +318,7 @@
           return any(this.calls, function(call){
             return self.expectedResult.an_instance_of ?
                      call.result.constructor == self.expectedResult.an_instance_of:
-                       hash(self.expectedResult) == hash(call.result)
+                       equal(self.expectedResult, call.result)
           })
         },
         
@@ -346,7 +342,7 @@
               if (arg == null) return call.args[i] == null
               return arg.an_instance_of ?
                        call.args[i].constructor != arg.an_instance_of:
-                         hash(arg) != hash(call.args[i])
+                         !equal(arg, call.args[i])
                        
             })
           })
@@ -359,7 +355,7 @@
             return any(self.expectedArgs, function(i, arg){
               return arg.an_instance_of ?
                        call.args[i].constructor == arg.an_instance_of:
-                         hash(arg) == hash(call.args[i])
+                         equal(arg, call.args[i])
                        
             })
           })
@@ -380,7 +376,8 @@
         // Report assertion results
         
         report : function() {
-          this.passed ? ++JSpec.stats.passes : ++JSpec.stats.failures
+          if (JSpec.assert) 
+            this.passed ? ++JSpec.stats.passes : ++JSpec.stats.failures
           return this
         },
         
@@ -506,14 +503,14 @@
         
         pass : function(message) {
           this.assertions.push({ passed: true, message: message })
-          ++JSpec.stats.passes
+          if (JSpec.assert) ++JSpec.stats.passes
         },
         
         // Add failing assertion
         
         fail : function(message) {
           this.assertions.push({ passed: false, message: message })
-          ++JSpec.stats.failures
+          if (JSpec.assert) ++JSpec.stats.failures
         },
                 
         // Run deferred assertions
@@ -679,7 +676,7 @@
     /**
      * Include _object_ which may be a hash or Module instance.
      *
-     * @param  {has, Module} object
+     * @param  {hash, Module} object
      * @return {JSpec}
      * @api public
      */
@@ -690,7 +687,7 @@
       if ('init' in module) module.init()
       if ('utilities' in module) extend(this.defaultContext, module.utilities)
       if ('matchers' in module) this.addMatchers(module.matchers)
-      if ('formatters' in module) extend(this.formatters, module.formatters)
+      if ('reporters' in module) extend(this.reporters, module.reporters)
       if ('DSLs' in module)
         each(module.DSLs, function(name, methods){
           JSpec.DSLs[name] = JSpec.DSLs[name] || {}
@@ -711,7 +708,7 @@
      */
     
     hook : function(name, args) {
-      args = argumentsToArray(arguments, 1)
+      args = toArray(arguments, 1)
       return inject(JSpec.modules, [], function(results, module){
         if (typeof module[name] == 'function')
           results.push(JSpec.evalHook(module, name, args))
@@ -805,7 +802,7 @@
      * @api public
      */
     
-    argumentsToArray : function(arguments, offset) {
+    toArray : function(arguments, offset) {
       return Array.prototype.slice.call(arguments, offset || 0)
     },
     
@@ -842,7 +839,9 @@
       return 'expected ' + puts(actual) + ' to ' + 
                (negate ? 'not ' : '') + 
                   name.replace(/_/g, ' ') +
-                    ' ' + puts.apply(this, expected.slice(1))
+                    ' ' + (expected.length > 1 ?
+                      puts.apply(this, expected.slice(1)) :
+                        '')
     },
     
     /**
@@ -907,34 +906,35 @@
        return (value = query(key)) !== null ? value :
                 JSpec.options[key] || null
      },
-
-    /**
-     * Generates a hash of the object passed.
-     *
-     * @param  {object} object
-     * @return {string}
-     * @api private
-     */
-
-    hash : function(object) {
-      if (object == null) return 'null'
-      if (object == undefined) return 'undefined'
-      function serialize(prefix) {
-        return inject(object, prefix + ':', function(buffer, key, value){
-          return buffer += hash(value)
-        })
-      }
-      switch (object.constructor) {
-        case Array : return serialize('a')
-        case RegExp: return 'r:' + object.toString()
-        case Number: return 'n:' + object.toString()
-        case String: return 's:' + object.toString()
-        case Object: return 'o:' + inject(object, [], function(array, key, value){
-          array.push([key, hash(value)])
-        }).sort()
-        default: return object.toString()
-      }
-    },
+     
+     /**
+      * Check if object _a_, is equal to object _b_.
+      *
+      * @param  {object} a
+      * @param  {object} b
+      * @return {bool}
+      * @api private
+      */
+     
+     equal: function(a, b) {
+       if (typeof a != typeof b) return
+       if (a === b) return true
+       if (a instanceof RegExp)
+         return a.toString() === b.toString()
+       if (a instanceof Date)
+         return Number(a) === Number(b)
+       if (typeof a != 'object') return
+       if (a.length !== undefined)
+         if (a.length !== b.length) return
+         else
+           for (var i = 0, len = a.length; i < len; ++i)
+             if (!equal(a[i], b[i]))
+               return
+       for (var key in a)
+         if (!equal(a[key], b[key]))
+           return
+       return true
+     },
 
     /**
      * Return last element of an array.
@@ -957,30 +957,35 @@
      */
 
     puts : function(object) {
-      if (arguments.length > 1) {
-        return map(argumentsToArray(arguments), function(arg){
+      if (arguments.length > 1)
+        return map(toArray(arguments), function(arg){
           return puts(arg)
         }).join(', ')
-      }
-      if (object === undefined) return ''
+      if (object === undefined) return 'undefined'
       if (object === null) return 'null'
       if (object === true) return 'true'
       if (object === false) return 'false'
       if (object.an_instance_of) return 'an instance of ' + object.an_instance_of.name
-      if (object.jquery && object.selector.length > 0) return 'selector ' + puts(object.selector) + ''
+      if (object.jquery && object.selector.length > 0) return 'selector ' + puts(object.selector)
       if (object.jquery) return object.get(0).outerHTML
       if (object.nodeName) return object.outerHTML
       switch (object.constructor) {
-        case String: return "'" + object + "'"
-        case Number: return object
         case Function: return object.name || object 
+        case String: 
+          return '"' + object
+            .replace(/"/g,  '\\"')
+            .replace(/\n/g, '\\n')
+            .replace(/\t/g, '\\t')
+            + '"'
         case Array: 
           return inject(object, '[', function(b, v){
             return b + ', ' + puts(v)
           }).replace('[,', '[') + ' ]'
         case Object:
+          object.__hit__ = true
           return inject(object, '{', function(b, k, v) {
-            return b + ', ' + puts(k) + ' : ' + puts(v)
+            if (k == '__hit__') return b
+            return b + ', ' + k + ': ' + (v && v.__hit__ ? '<circular reference>' : puts(v))
           }).replace('{,', '{') + ' }'
         default: 
           return object.toString()
@@ -1024,7 +1029,7 @@
       */
      
      does : function(actual, matcher, expected) {
-       var assertion = new JSpec.Assertion(JSpec.matchers[matcher], actual, argumentsToArray(arguments, 2))
+       var assertion = new JSpec.Assertion(JSpec.matchers[matcher], actual, toArray(arguments, 2))
        return assertion.run().result
      },
 
@@ -1042,7 +1047,7 @@
 
     expect : function(actual) {
       assert = function(matcher, args, negate) {
-        var expected = argumentsToArray(args, 1)
+        var expected = toArray(args, 1)
         matcher.negate = negate  
         assertion = new JSpec.Assertion(matcher, actual, expected, negate)
         hook('beforeAssertion', assertion)
@@ -1114,17 +1119,20 @@
      /**
       * Iterate an object, invoking the given callback.
       *
-      * @param  {hash, array, string} object
+      * @param  {hash, array} object
       * @param  {function} callback
       * @return {JSpec}
       * @api public
       */
 
      each : function(object, callback) {
-       if (typeof object == 'string') object = object.split(' ')
-       for (key in object) 
-         if (object.hasOwnProperty(key))
-           callIterator(callback, key, object[key])
+       if (object.constructor == Array)
+         for (var i = 0, len = object.length; i < len; ++i)
+           callIterator(callback, i, object[i])
+       else
+         for (var key in object) 
+           if (object.hasOwnProperty(key))
+             callIterator(callback, key, object[key])
      },
 
      /**
@@ -1326,7 +1334,7 @@
       var context = this.context || this.defaultContext
       var contents = this.contentsOf(body)
       hook('evaluatingBody', dsl, matchers, context, contents)
-      try { eval('with (dsl){ with (context) { with (matchers) { ' + contents + ' }}}') }
+      try { with (dsl){ with (context) { with (matchers) { eval(contents) }}} }
       catch(e) { error(errorMessage, e) }
     },
 
@@ -1344,7 +1352,7 @@
       return input.
         replace(/\t/g, '  ').
         replace(/\r\n|\n|\r/g, '\n').
-        replace(/__END__[^]*/, '').
+        split('__END__')[0].
         replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
         replace(/^\s+it\s+(.*?)$/gm, ' it($1, function(){').
@@ -1381,8 +1389,9 @@
      */
 
     report : function() {
+      this.duration = Number(new Date) - this.start
       hook('reporting', JSpec.options)
-      new (JSpec.options.formatter || JSpec.formatters.DOM)(JSpec, JSpec.options)
+      new (JSpec.options.reporter || JSpec.reporters.DOM)(JSpec, JSpec.options)
     },
 
     /**
@@ -1397,9 +1406,8 @@
     run : function(options) {
       if (any(hook('running'), haveStopped)) return this
       if (options) extend(this.options, options)
-      if (option('profile')) console.group('Profile')
+      this.start = Number(new Date)
       each(this.suites, function(suite) { JSpec.runSuite(suite) })
-      if (option('profile')) console.groupEnd()
       return this
     },
     
@@ -1462,10 +1470,8 @@
 
     runSpec : function(spec) {
       this.currentSpec = spec
-      if (option('profile')) console.time(spec.description)
       try { this.evalBody(spec.body) }
       catch (e) { fail(e) }
-      if (option('profile')) console.timeEnd(spec.description)
       spec.runDeferredAssertions()
       destub()
       this.stats.specsFinished++
@@ -1588,8 +1594,7 @@
      */
     
     tryLoading : function(file) {
-      try { return JSpec.load(file) }
-      catch (e) {}
+      try { return JSpec.load(file) } catch (e) {}
     },
 
     /**
@@ -1638,14 +1643,15 @@
   var main = this
   var find = JSpec.any
   var utils = 'haveStopped stub hookImmutable hook destub map any last pass fail range each option inject select \
-               error escape extend puts hash query strip color does addMatchers callIterator argumentsToArray'.split(/\s+/)
-  while (utils.length) util = utils.shift(), eval('var ' + util + ' = JSpec.' + util)
+               error escape extend puts query strip color does addMatchers callIterator toArray equal'.split(/\s+/)
+  while (utils.length) eval('var ' + utils[0] + ' = JSpec.' + utils.shift())
   if (!main.setTimeout) main.setTimeout = function(callback){ callback() }
 
   // --- Matchers
 
   addMatchers({
     equal              : "===",
+    eql                : "equal(actual, expected)",
     be                 : "alias equal",
     be_greater_than    : ">",
     be_less_than       : "<",
@@ -1664,13 +1670,6 @@
     have_length        : "actual.length == expected",
     be_within          : "actual >= expected[0] && actual <= last(expected)",
     have_length_within : "actual.length >= expected[0] && actual.length <= last(expected)",
-
-    eql : function(actual, expected) {
-      return actual.constructor == Array ||
-               actual instanceof Object ? 
-                 hash(actual) == hash(expected):
-                   actual == expected
-    },
     
     receive : { defer : true, match : function(actual, method, times) {
       proxy = new JSpec.ProxyAssertion(actual, method, times, this.negate)
@@ -1701,7 +1700,7 @@
             break
           
           case Array: 
-            state = any(actual, function(value){ return hash(value) == hash(arg) })
+            state = any(actual, function(value){ return equal(value, arg) })
             break
         }
         if (!state) return false
@@ -1715,9 +1714,9 @@
         this.e = e
         var assert = function(arg) {
           switch (arg.constructor) {
-            case RegExp   : return arg.test(e)
+            case RegExp   : return arg.test(e.message || e.toString())
             case String   : return arg == (e.message || e.toString())
-            case Function : return (e.name || 'Error') == arg.name
+            case Function : return e instanceof arg || e.name == arg.name
           }
         }
         return message ? assert(expected) && assert(message) :
@@ -1771,6 +1770,4 @@
     }
   })
   
-  if ('exports' in main) exports.JSpec = JSpec
-
 })()