RubyGems - konacha - Versions diffs - 2.5.1 → 2.6.0 - Mend

konacha 2.5.1 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/History.md +4 -0
data/README.md +6 -0
data/Rakefile +17 -9
data/app/assets/javascripts/konacha/iframe.js +0 -4
data/konacha.gemspec +1 -1
data/vendor/assets/javascripts/chai.js +251 -64
data/vendor/assets/javascripts/mocha.js +103 -105
data/vendor/assets/stylesheets/mocha.css +15 -0
metadata +3 -9

data/History.md CHANGED

@@ -1,5 +1,9 @@
 # master
+# 2.6.0
+* Update mocha (1.9.0) and chai (1.5.0)
 # 2.5.1
 * Fix several Rails 4 beta compatibility issues.

data/README.md CHANGED

@@ -224,6 +224,12 @@ Sprocket's built in support for JavaScript template (`.jst`) files. Add a `spec/
 directory, place template files there (using any JS template language supported by Sprockets),
 require them in your spec or spec_helper, and render them into the `<body>`.
+Note that if you want to use EJS as in the following example, you need to add that gem to your Gemfile:
+```ruby
+gem "ejs"
+```
 For example, in `spec/javascripts/templates/hello.jst.ejs`:
 ```html

data/Rakefile CHANGED

@@ -6,15 +6,23 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new :spec
 desc 'Build and copy Mocha and Chai assets from submodules into vendor/assets'
-task :assets do
-  sh 'git submodule update --init' unless File.exist?('mocha/Makefile') || File.exist?('chai/Makefile')
-  sh 'cd mocha && npm install && make clean && make'
-  sh 'cd chai && npm install && make clean && make'
-  mkdir_p 'vendor/assets/javascripts'
-  mkdir_p 'vendor/assets/stylesheets'
-  cp 'mocha/mocha.js',  'vendor/assets/javascripts/'
-  cp 'mocha/mocha.css', 'vendor/assets/stylesheets/'
-  cp 'chai/chai.js',    'vendor/assets/javascripts/'
+task :assets => ['assets:build', 'assets:copy']
+namespace :assets do
+  task :build do
+    sh 'git submodule update --init' unless File.exist?('mocha/Makefile') || File.exist?('chai/Makefile')
+    sh 'cd mocha && npm install && make clean && make'
+    sh 'cd chai && npm install && make clean && make'
+  end
+  task :copy do
+    sh 'git submodule update --init' unless File.exist?('mocha/Makefile') || File.exist?('chai/Makefile')
+    mkdir_p 'vendor/assets/javascripts'
+    mkdir_p 'vendor/assets/stylesheets'
+    cp 'mocha/mocha.js',  'vendor/assets/javascripts/'
+    cp 'mocha/mocha.css', 'vendor/assets/stylesheets/'
+    cp 'chai/chai.js',    'vendor/assets/javascripts/'
+  end
 end
 task :default => :spec

data/app/assets/javascripts/konacha/iframe.js CHANGED

@@ -25,10 +25,6 @@ mocha.ui = function (name) {
 mocha.ui('bdd');
-// Disable leak detection by default. It doesn't seem to be reliable
-// with Konacha's iframe setup.
-mocha.ignoreLeaks();
 mocha.suite.beforeAll(function () {
   var contexts = parent.document.getElementsByClassName("test-context");
   for (var i = 0; i < contexts.length; ++i) {

data/konacha.gemspec CHANGED

@@ -17,7 +17,7 @@ the asset pipeline and engines.}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "2.5.1"
+  gem.version       = "2.6.0"
   gem.license       = "MIT"
   gem.add_dependency "railties", ">= 3.1", "< 5"

data/vendor/assets/javascripts/chai.js CHANGED

@@ -38,7 +38,7 @@
   require.relative = function (parent) {
     return function(p){
-      if ('.' != p[0]) return require(p);
+      if ('.' != p.charAt(0)) return require(p);
       var path = parent.split('/')
         , segs = p.split('/');
@@ -63,7 +63,7 @@
   require.register("chai.js", function(module, exports, require){
     /*!
      * chai
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -74,7 +74,7 @@
      * Chai version
      */
-    exports.version = '1.4.2';
+    exports.version = '1.5.0';
     /*!
      * Primary `Assertion` prototype
@@ -147,7 +147,7 @@
     /*!
      * chai
      * http://chaijs.com
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -194,6 +194,20 @@
     Assertion.includeStack = false;
+    /*!
+     * ### Assertion.showDiff
+     *
+     * User configurable property, influences whether or not
+     * the `showDiff` flag should be included in the thrown
+     * AssertionErrors. `false` will always be `false`; `true`
+     * will be true when the assertion has requested a diff
+     * be shown.
+     *
+     * @api public
+     */
+    Assertion.showDiff = true;
     Assertion.addProperty = function (name, fn) {
       util.addProperty(this.prototype, name, fn);
     };
@@ -231,6 +245,7 @@
     Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
       var ok = util.test(this, arguments);
       if (true !== showDiff) showDiff = false;
+      if (true !== Assertion.showDiff) showDiff = false;
       if (!ok) {
         var msg = util.getMessage(this, arguments)
@@ -268,7 +283,7 @@
     /*!
      * chai
      * http://chaijs.com
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -352,7 +367,7 @@
        *
        * The `a` and `an` assertions are aliases that can be
        * used either as language chains or to assert a value's
-       * type (as revealed by `Object.prototype.toString`).
+       * type.
        *
        *     // typeof
        *     expect('test').to.be.a('string');
@@ -370,15 +385,14 @@
        * @api public
        */
-      function an(type, msg) {
+      function an (type, msg) {
         if (msg) flag(this, 'message', msg);
+        type = type.toLowerCase();
         var obj = flag(this, 'object')
-          , klassStart = type.charAt(0).toUpperCase()
-          , klass = klassStart + type.slice(1)
-          , article = ~[ 'A', 'E', 'I', 'O', 'U' ].indexOf(klassStart) ? 'an ' : 'a ';
+          , article = ~[ 'a', 'e', 'i', 'o', 'u' ].indexOf(type.charAt(0)) ? 'an ' : 'a ';
         this.assert(
-            '[object ' + klass + ']' === toString.call(obj)
+            type === _.type(obj)
           , 'expected #{this} to be ' + article + type
           , 'expected #{this} not to be ' + article + type
         );
@@ -663,12 +677,13 @@
        *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
        *
        * @name eql
+       * @alias eqls
        * @param {Mixed} value
        * @param {String} message _optional_
        * @api public
        */
-      Assertion.addMethod('eql', function (obj, msg) {
+      function assertEql(obj, msg) {
         if (msg) flag(this, 'message', msg);
         this.assert(
             _.eql(obj, flag(this, 'object'))
@@ -678,7 +693,10 @@
           , this._obj
           , true
         );
-      });
+      }
+      Assertion.addMethod('eql', assertEql);
+      Assertion.addMethod('eqls', assertEql);
       /**
        * ### .above(value)
@@ -760,7 +778,7 @@
           this.assert(
               len >= n
             , 'expected #{this} to have a length at least #{exp} but got #{act}'
-            , 'expected #{this} to not have a length below #{exp}'
+            , 'expected #{this} to have a length below #{exp}'
             , n
             , len
           );
@@ -856,7 +874,7 @@
           this.assert(
               len <= n
             , 'expected #{this} to have a length at most #{exp} but got #{act}'
-            , 'expected #{this} to not have a length above #{exp}'
+            , 'expected #{this} to have a length above #{exp}'
             , n
             , len
           );
@@ -1301,35 +1319,50 @@
           if (desiredError) {
             this.assert(
                 err === desiredError
-              , 'expected #{this} to throw ' + _.inspect(desiredError) + ' but ' + _.inspect(err) + ' was thrown'
-              , 'expected #{this} to not throw ' + _.inspect(desiredError)
+              , 'expected #{this} to throw #{exp} but #{act} was thrown'
+              , 'expected #{this} to not throw #{exp}'
+              , desiredError
+              , err
             );
             return this;
           }
           // next, check constructor
           if (constructor) {
             this.assert(
                 err instanceof constructor
-              , 'expected #{this} to throw ' + name + ' but ' + _.inspect(err) + ' was thrown'
-              , 'expected #{this} to not throw ' + name + ' but ' + _.inspect(err) + ' was thrown');
+              , 'expected #{this} to throw #{exp} but #{act} was thrown'
+              , 'expected #{this} to not throw #{exp} but #{act} was thrown'
+              , name
+              , err
+            );
             if (!errMsg) return this;
           }
           // next, check message
-          if (err.message && errMsg && errMsg instanceof RegExp) {
+          var message = 'object' === _.type(err) && "message" in err
+            ? err.message
+            : '' + err;
+          if ((message != null) && errMsg && errMsg instanceof RegExp) {
             this.assert(
-                errMsg.exec(err.message)
-              , 'expected #{this} to throw error matching ' + errMsg + ' but got ' + _.inspect(err.message)
-              , 'expected #{this} to throw error not matching ' + errMsg
+                errMsg.exec(message)
+              , 'expected #{this} to throw error matching #{exp} but got #{act}'
+              , 'expected #{this} to throw error not matching #{exp}'
+              , errMsg
+              , message
             );
             return this;
-          } else if (err.message && errMsg && 'string' === typeof errMsg) {
+          } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
             this.assert(
-                ~err.message.indexOf(errMsg)
+                ~message.indexOf(errMsg)
               , 'expected #{this} to throw error including #{exp} but got #{act}'
               , 'expected #{this} to throw error not including #{act}'
               , errMsg
-              , err.message
+              , message
             );
             return this;
           } else {
             thrown = true;
@@ -1337,16 +1370,23 @@
           }
         }
-        var expectedThrown = name ? name : desiredError ? _.inspect(desiredError) : 'an error';
         var actuallyGot = ''
+          , expectedThrown = name !== null
+            ? name
+            : desiredError
+              ? '#{exp}' //_.inspect(desiredError)
+              : 'an error';
         if (thrown) {
-          actuallyGot = ' but ' + _.inspect(thrownError) + ' was thrown'
+          actuallyGot = ' but #{act} was thrown'
         }
         this.assert(
             thrown === true
           , 'expected #{this} to throw ' + expectedThrown + actuallyGot
           , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
+          , desiredError
+          , thrownError
         );
       };
@@ -1379,7 +1419,7 @@
         if (msg) flag(this, 'message', msg);
         var obj = flag(this, 'object')
           , itself = flag(this, 'itself')
-          , context = ('function' === typeof obj && !itself)
+          , context = ('function' === _.type(obj) && !itself)
             ? obj.prototype[method]
             : obj[method];
@@ -1428,8 +1468,8 @@
         var obj = flag(this, 'object');
         this.assert(
             matcher(obj)
-          , 'expected #{this} to satisfy ' + _.inspect(matcher)
-          , 'expected #{this} to not satisfy' + _.inspect(matcher)
+          , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
+          , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
           , this.negate ? false : true
           , matcher(obj)
         );
@@ -1466,7 +1506,7 @@
   require.register("chai/error.js", function(module, exports, require){
     /*!
      * chai
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -1530,7 +1570,7 @@
   require.register("chai/interface/assert.js", function(module, exports, require){
     /*!
      * chai
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2520,7 +2560,7 @@
   require.register("chai/interface/expect.js", function(module, exports, require){
     /*!
      * chai
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2536,7 +2576,7 @@
   require.register("chai/interface/should.js", function(module, exports, require){
     /*!
      * chai
-     * Copyright(c) 2011-2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2616,7 +2656,7 @@
   require.register("chai/utils/addChainableMethod.js", function(module, exports, require){
     /*!
      * Chai - addChainingMethod utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2626,6 +2666,18 @@
     var transferFlags = require('./transferFlags');
+    /*!
+     * Module variables
+     */
+    // Check whether `__proto__` is supported
+    var hasProtoSupport = '__proto__' in Object;
+    // Without `__proto__` support, this module will need to add properties to a function.
+    // However, some Function.prototype methods cannot be overwritten,
+    // and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
+    var excludeNames = /^(?:length|name|arguments|caller)$/;
     /**
      * ### addChainableMethod (ctx, name, method, chainingBehavior)
      *
@@ -2667,16 +2719,20 @@
               return result === undefined ? this : result;
             };
-            // Re-enumerate every time to better accomodate plugins.
-            var asserterNames = Object.getOwnPropertyNames(ctx);
-            asserterNames.forEach(function (asserterName) {
-              var pd = Object.getOwnPropertyDescriptor(ctx, asserterName)
-                , functionProtoPD = Object.getOwnPropertyDescriptor(Function.prototype, asserterName);
-              // Avoid trying to overwrite things that we can't, like `length` and `arguments`.
-              if (functionProtoPD && !functionProtoPD.configurable) return;
-              if (asserterName === 'arguments') return; // @see chaijs/chai/issues/69
-              Object.defineProperty(assert, asserterName, pd);
-            });
+            // Use `__proto__` if available
+            if (hasProtoSupport) {
+              assert.__proto__ = this;
+            }
+            // Otherwise, redefine all properties (slow!)
+            else {
+              var asserterNames = Object.getOwnPropertyNames(ctx);
+              asserterNames.forEach(function (asserterName) {
+                if (!excludeNames.test(asserterName)) {
+                  var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
+                  Object.defineProperty(assert, asserterName, pd);
+                }
+              });
+            }
             transferFlags(this, assert);
             return assert;
@@ -2690,7 +2746,7 @@
   require.register("chai/utils/addMethod.js", function(module, exports, require){
     /*!
      * Chai - addMethod utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2731,7 +2787,7 @@
   require.register("chai/utils/addProperty.js", function(module, exports, require){
     /*!
      * Chai - addProperty utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2778,6 +2834,8 @@
     module.exports = _deepEqual;
+    var getEnumerableProperties = require('./getEnumerableProperties');
     // for the browser
     var Buffer;
     try {
@@ -2862,8 +2920,8 @@
         return _deepEqual(a, b, memos);
       }
       try {
-        var ka = Object.keys(a),
-            kb = Object.keys(b),
+        var ka = getEnumerableProperties(a),
+            kb = getEnumerableProperties(b),
             key;
       } catch (e) {//happens when one is a string literal and the other isn't
         return false;
@@ -2901,7 +2959,7 @@
   require.register("chai/utils/flag.js", function(module, exports, require){
     /*!
      * Chai - flag utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2937,7 +2995,7 @@
   require.register("chai/utils/getActual.js", function(module, exports, require){
     /*!
      * Chai - getActual utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -2957,10 +3015,39 @@
   }); // module: chai/utils/getActual.js
+  require.register("chai/utils/getEnumerableProperties.js", function(module, exports, require){
+    /*!
+     * Chai - getEnumerableProperties utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+    /**
+     * ### .getEnumerableProperties(object)
+     *
+     * This allows the retrieval of enumerable property names of an object,
+     * inherited or not.
+     *
+     * @param {Object} object
+     * @returns {Array}
+     * @name getEnumerableProperties
+     * @api public
+     */
+    module.exports = function getEnumerableProperties(object) {
+      var result = [];
+      for (var name in object) {
+        result.push(name);
+      }
+      return result;
+    };
+  }); // module: chai/utils/getEnumerableProperties.js
   require.register("chai/utils/getMessage.js", function(module, exports, require){
     /*!
      * Chai - message composition utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3013,7 +3100,7 @@
   require.register("chai/utils/getName.js", function(module, exports, require){
     /*!
      * Chai - getName utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3037,7 +3124,7 @@
   require.register("chai/utils/getPathValue.js", function(module, exports, require){
     /*!
      * Chai - getPathValue utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * @see https://github.com/logicalparadox/filtr
      * MIT Licensed
      */
@@ -3140,6 +3227,45 @@
   }); // module: chai/utils/getPathValue.js
+  require.register("chai/utils/getProperties.js", function(module, exports, require){
+    /*!
+     * Chai - getProperties utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+    /**
+     * ### .getProperties(object)
+     *
+     * This allows the retrieval of property names of an object, enumerable or not,
+     * inherited or not.
+     *
+     * @param {Object} object
+     * @returns {Array}
+     * @name getProperties
+     * @api public
+     */
+    module.exports = function getProperties(object) {
+      var result = Object.getOwnPropertyNames(subject);
+      function addProperty(property) {
+        if (result.indexOf(property) === -1) {
+          result.push(property);
+        }
+      }
+      var proto = Object.getPrototypeOf(subject);
+      while (proto !== null) {
+        Object.getOwnPropertyNames(proto).forEach(addProperty);
+        proto = Object.getPrototypeOf(proto);
+      }
+      return result;
+    };
+  }); // module: chai/utils/getProperties.js
   require.register("chai/utils/index.js", function(module, exports, require){
     /*!
      * chai
@@ -3159,6 +3285,12 @@
     exports.test = require('./test');
+    /*!
+     * type utility
+     */
+    exports.type = require('./type');
     /*!
      * message utility
      */
@@ -3251,6 +3383,8 @@
     // https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
     var getName = require('./getName');
+    var getProperties = require('./getProperties');
+    var getEnumerableProperties = require('./getEnumerableProperties');
     module.exports = inspect;
@@ -3291,7 +3425,7 @@
         return html;
       }
     };
     // Returns true if object is a DOM element.
     var isDOMElement = function (object) {
       if (typeof HTMLElement === 'object') {
@@ -3327,8 +3461,8 @@
       }
       // Look up the keys of the object.
-      var visibleKeys = Object.keys(value);
-      var keys = ctx.showHidden ? Object.getOwnPropertyNames(value) : visibleKeys;
+      var visibleKeys = getEnumerableProperties(value);
+      var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
       // Some type of object without properties can be shortcutted.
       // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
@@ -3567,7 +3701,7 @@
   require.register("chai/utils/objDisplay.js", function(module, exports, require){
     /*!
      * Chai - flag utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3594,7 +3728,11 @@
         , type = Object.prototype.toString.call(obj);
       if (str.length >= 40) {
-        if (type === '[object Array]') {
+        if (type === '[object Function]') {
+          return !obj.name || obj.name === ''
+            ? '[Function]'
+            : '[Function: ' + obj.name + ']';
+        } else if (type === '[object Array]') {
           return '[ Array(' + obj.length + ') ]';
         } else if (type === '[object Object]') {
           var keys = Object.keys(obj)
@@ -3615,7 +3753,7 @@
   require.register("chai/utils/overwriteMethod.js", function(module, exports, require){
     /*!
      * Chai - overwriteMethod utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3670,7 +3808,7 @@
   require.register("chai/utils/overwriteProperty.js", function(module, exports, require){
     /*!
      * Chai - overwriteProperty utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3728,7 +3866,7 @@
   require.register("chai/utils/test.js", function(module, exports, require){
     /*!
      * Chai - test utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3758,7 +3896,7 @@
   require.register("chai/utils/transferFlags.js", function(module, exports, require){
     /*!
      * Chai - transferFlags utility
-     * Copyright(c) 2012 Jake Luer <jake@alogicalparadox.com>
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
      * MIT Licensed
      */
@@ -3803,6 +3941,55 @@
   }); // module: chai/utils/transferFlags.js
+  require.register("chai/utils/type.js", function(module, exports, require){
+    /*!
+     * Chai - type utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+    /*!
+     * Detectable javascript natives
+     */
+    var natives = {
+        '[object Arguments]': 'arguments'
+      , '[object Array]': 'array'
+      , '[object Date]': 'date'
+      , '[object Function]': 'function'
+      , '[object Number]': 'number'
+      , '[object RegExp]': 'regexp'
+      , '[object String]': 'string'
+    };
+    /**
+     * ### type(object)
+     *
+     * Better implementation of `typeof` detection that can
+     * be used cross-browser. Handles the inconsistencies of
+     * Array, `null`, and `undefined` detection.
+     *
+     *     utils.type({}) // 'object'
+     *     utils.type(null) // `null'
+     *     utils.type(undefined) // `undefined`
+     *     utils.type([]) // `array`
+     *
+     * @param {Mixed} object to detect type of
+     * @name type
+     * @api private
+     */
+    module.exports = function (obj) {
+      var str = Object.prototype.toString.call(obj);
+      if (natives[str]) return natives[str];
+      if (obj === null) return 'null';
+      if (obj === undefined) return 'undefined';
+      if (obj === Object(obj)) return 'object';
+      return typeof obj;
+    };
+  }); // module: chai/utils/type.js
   require.alias("./chai.js", "chai");
   return require('chai');

data/vendor/assets/javascripts/mocha.js CHANGED

@@ -1,6 +1,5 @@
 ;(function(){
 // CommonJS require()
 function require(p){
@@ -32,11 +31,11 @@ require.register = function (path, fn){
 require.relative = function (parent) {
     return function(p){
       if ('.' != p.charAt(0)) return require(p);
       var path = parent.split('/')
         , segs = p.split('/');
       path.pop();
       for (var i = 0; i < segs.length; i++) {
         var seg = segs[i];
         if ('..' == seg) path.pop();
@@ -52,9 +51,9 @@ require.register("browser/debug.js", function(module, exports, require){
 module.exports = function(type){
   return function(){
   }
 };
 }); // module: browser/debug.js
 require.register("browser/diff.js", function(module, exports, require){
@@ -805,7 +804,6 @@ Hook.prototype.error = function(err){
   this._error = err;
 };
 }); // module: hook.js
 require.register("interfaces/bdd.js", function(module, exports, require){
@@ -819,7 +817,7 @@ var Suite = require('../suite')
 /**
  * BDD-style interface:
- *
+ *
  *      describe('Array', function(){
  *        describe('#indexOf()', function(){
  *          it('should return -1 when not present', function(){
@@ -831,7 +829,7 @@ var Suite = require('../suite')
  *          });
  *        });
  *      });
- *
+ *
  */
 module.exports = function(suite){
@@ -876,7 +874,7 @@ module.exports = function(suite){
      * and callback `fn` containing nested suites
      * and/or tests.
      */
     context.describe = context.context = function(title, fn){
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
@@ -956,19 +954,19 @@ var Suite = require('../suite')
 /**
  * TDD-style interface:
- *
+ *
  *     exports.Array = {
  *       '#indexOf()': {
  *         'should return -1 when the value is not present': function(){
- *
+ *
  *         },
  *
  *         'should return the correct index when the value is present': function(){
- *
+ *
  *         }
  *       }
  *     };
- *
+ *
  */
 module.exports = function(suite){
@@ -1006,6 +1004,7 @@ module.exports = function(suite){
     }
   }
 };
 }); // module: interfaces/exports.js
 require.register("interfaces/index.js", function(module, exports, require){
@@ -1028,27 +1027,27 @@ var Suite = require('../suite')
 /**
  * QUnit-style interface:
- *
+ *
  *     suite('Array');
- *
+ *
  *     test('#length', function(){
  *       var arr = [1,2,3];
  *       ok(arr.length == 3);
  *     });
- *
+ *
  *     test('#indexOf()', function(){
  *       var arr = [1,2,3];
  *       ok(arr.indexOf(1) == 0);
  *       ok(arr.indexOf(2) == 1);
  *       ok(arr.indexOf(3) == 2);
  *     });
- *
+ *
  *     suite('String');
- *
+ *
  *     test('#length', function(){
  *       ok('foo'.length == 3);
  *     });
- *
+ *
  */
 module.exports = function(suite){
@@ -1091,7 +1090,7 @@ module.exports = function(suite){
     /**
      * Describe a "suite" with the given `title`.
      */
     context.suite = function(title){
       if (suites.length > 1) suites.shift();
       var suite = Suite.create(suites[0], title);
@@ -1129,7 +1128,7 @@ var Suite = require('../suite')
  *          suiteSetup(function(){
  *
  *          });
- *
+ *
  *          test('should return -1 when not present', function(){
  *
  *          });
@@ -1549,7 +1548,7 @@ Mocha.prototype.run = function(fn){
   var options = this.options;
   var runner = new exports.Runner(suite);
   var reporter = new this._reporter(runner);
-  runner.ignoreLeaks = options.ignoreLeaks;
+  runner.ignoreLeaks = false !== options.ignoreLeaks;
   runner.asyncOnly = options.asyncOnly;
   if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);
@@ -1710,7 +1709,7 @@ exports.colors = {
 /**
  * Default symbol map.
  */
 exports.symbols = {
   ok: '✓',
   err: '✖',
@@ -2334,8 +2333,6 @@ function HTML(runner, root) {
   });
   runner.on('test end', function(test){
-    window.scrollTo(0, document.body.scrollHeight);
     // TODO: add to stats
     var percent = stats.tests / this.total * 100 | 0;
     if (progress) progress.update(percent).draw(ctx);
@@ -3080,7 +3077,7 @@ exports = module.exports = Min;
 function Min(runner) {
   Base.call(this, runner);
   runner.on('start', function(){
     // clear screen
     process.stdout.write('\u001b[2J');
@@ -3100,10 +3097,10 @@ F.prototype = Base.prototype;
 Min.prototype = new F;
 Min.prototype.constructor = Min;
 }); // module: reporters/min.js
 require.register("reporters/nyan.js", function(module, exports, require){
 /**
  * Module dependencies.
  */
@@ -3249,44 +3246,39 @@ NyanCat.prototype.drawRainbow = function(){
 NyanCat.prototype.drawNyanCat = function(status) {
   var self = this;
   var startWidth = this.scoreboardWidth + this.trajectories[0].length;
-  [0, 1, 2, 3].forEach(function(index) {
-    write('\u001b[' + startWidth + 'C');
-    switch (index) {
-      case 0:
-        write('_,------,');
-        write('\n');
-        break;
-      case 1:
-        var padding = self.tick ? '  ' : '   ';
-        write('_|' + padding + '/\\_/\\ ');
-        write('\n');
-        break;
-      case 2:
-        var padding = self.tick ? '_' : '__';
-        var tail = self.tick ? '~' : '^';
-        var face;
-        switch (status) {
-          case 'pass':
-            face = '( ^ .^)';
-            break;
-          case 'fail':
-            face = '( o .o)';
-            break;
-          default:
-            face = '( - .-)';
-        }
-        write(tail + '|' + padding + face + ' ');
-        write('\n');
-        break;
-      case 3:
-        var padding = self.tick ? ' ' : '  ';
-        write(padding + '""  "" ');
-        write('\n');
-        break;
-    }
-  });
+  var color = '\u001b[' + startWidth + 'C';
+  var padding = '';
+  write(color);
+  write('_,------,');
+  write('\n');
+  write(color);
+  padding = self.tick ? '  ' : '   ';
+  write('_|' + padding + '/\\_/\\ ');
+  write('\n');
+  write(color);
+  padding = self.tick ? '_' : '__';
+  var tail = self.tick ? '~' : '^';
+  var face;
+  switch (status) {
+    case 'pass':
+      face = '( ^ .^)';
+      break;
+    case 'fail':
+      face = '( o .o)';
+      break;
+    default:
+      face = '( - .-)';
+  }
+  write(tail + '|' + padding + face + ' ');
+  write('\n');
+  write(color);
+  padding = self.tick ? ' ' : '  ';
+  write(padding + '""  "" ');
+  write('\n');
   this.cursorUp(this.numberOfLines);
 };
@@ -3746,7 +3738,7 @@ function XUnit(runner) {
   runner.on('pass', function(test){
     tests.push(test);
   });
   runner.on('fail', function(test){
     tests.push(test);
   });
@@ -3763,7 +3755,7 @@ function XUnit(runner) {
     }, false));
     tests.forEach(test);
-    console.log('</testsuite>');
+    console.log('</testsuite>');
   });
 }
@@ -4065,8 +4057,7 @@ var EventEmitter = require('browser/events').EventEmitter
   , Test = require('./test')
   , utils = require('./utils')
   , filter = utils.filter
-  , keys = utils.keys
-  , noop = function(){};
+  , keys = utils.keys;
 /**
  * Non-enumerable globals.
@@ -4118,6 +4109,15 @@ function Runner(suite) {
   this.globals(this.globalProps().concat(['errno']));
 }
+/**
+ * Wrapper for setImmediate, process.nextTick, or browser polyfill.
+ *
+ * @param {Function} fn
+ * @api private
+ */
+Runner.immediately = global.setImmediate || process.nextTick;
 /**
  * Inherit from `EventEmitter.prototype`.
  */
@@ -4246,7 +4246,7 @@ Runner.prototype.fail = function(test, err){
   if ('string' == typeof err) {
     err = new Error('the string "' + err + '" was thrown, throw an Error :)');
   }
   this.emit('fail', test, err);
 };
@@ -4303,7 +4303,7 @@ Runner.prototype.hook = function(name, fn){
     });
   }
-  process.nextTick(function(){
+  Runner.immediately(function(){
     next(0);
   });
 };
@@ -4546,14 +4546,16 @@ Runner.prototype.run = function(fn){
   var self = this
     , fn = fn || function(){};
+  function uncaught(err){
+    self.uncaught(err);
+  }
   debug('start');
   // callback
   this.on('end', function(){
     debug('end');
-    process.removeListener('uncaughtException', function(err){
-      self.uncaught(err);
-    });
+    process.removeListener('uncaughtException', uncaught);
     fn(self.failures);
   });
@@ -4565,9 +4567,7 @@ Runner.prototype.run = function(fn){
   });
   // uncaught exception
-  process.on('uncaughtException', function(err){
-    self.uncaught(err);
-  });
+  process.on('uncaughtException', uncaught);
   return this;
 };
@@ -5005,7 +5005,7 @@ exports.indexOf = function(arr, obj, start){
 /**
  * Array#reduce (<=IE8)
- *
+ *
  * @param {Array} array
  * @param {Function} fn
  * @param {Object} initial value
@@ -5238,34 +5238,6 @@ process.exit = function(status){};
 process.stdout = {};
 global = window;
-/**
- * next tick implementation.
- */
-process.nextTick = (function(){
-  // postMessage behaves badly on IE8
-  if (window.ActiveXObject || !window.postMessage) {
-    return function(fn){ fn() };
-  }
-  // based on setZeroTimeout by David Baron
-  // - http://dbaron.org/log/20100309-faster-timeouts
-  var timeouts = []
-    , name = 'mocha-zero-timeout'
-  window.addEventListener('message', function(e){
-    if (e.source == window && e.data == name) {
-      if (e.stopPropagation) e.stopPropagation();
-      if (timeouts.length) timeouts.shift()();
-    }
-  }, true);
-  return function(fn){
-    timeouts.push(fn);
-    window.postMessage(name, '*');
-  }
-})();
 /**
  * Remove uncaughtException listener.
  */
@@ -5298,6 +5270,32 @@ process.on = function(e, fn){
   var Mocha = window.Mocha = require('mocha'),
       mocha = window.mocha = new Mocha({ reporter: 'html' });
+  var immediateQueue = []
+    , immediateTimeout;
+  function timeslice() {
+    var immediateStart = new Date().getTime();
+    while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
+      immediateQueue.shift()();
+    }
+    if (immediateQueue.length) {
+      immediateTimeout = setTimeout(timeslice, 0);
+    } else {
+      immediateTimeout = null;
+    }
+  }
+  /**
+   * High-performance override of Runner.immediately.
+   */
+  Mocha.Runner.immediately = function(callback) {
+    immediateQueue.push(callback);
+    if (!immediateTimeout) {
+      immediateTimeout = setTimeout(timeslice, 0);
+    }
+  };
   /**
    * Override ui to ensure that the ui functions are initialized.
    * Normally this would happen in Mocha.prototype.loadFiles.

data/vendor/assets/stylesheets/mocha.css CHANGED

@@ -224,8 +224,23 @@ body {
   padding-top: 11px;
 }
+#mocha-stats canvas {
+  width: 40px;
+  height: 40px;
+}
 code .comment { color: #ddd }
 code .init { color: #2F6FAD }
 code .string { color: #5890AD }
 code .keyword { color: #8A6343 }
 code .number { color: #2F6FAD }
+@media screen and (max-device-width: 480px) {
+  body {
+    padding: 60px 0px;
+  }
+  #stats {
+    position: absolute;
+  }
+}

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -326,21 +326,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -79528298761712315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -79528298761712315
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key:
 specification_version: 3
 summary: Unit-test your Rails JavaScript with the mocha test framework and chai assertion