Bump to v0.8.2.

Former-commit-id: edbb9d995a63ec8fd5a3b1a47ccda7b30c353b35

.gitignore

@@ -1,4 +1,3 @@
 *.custom.*
 .DS_Store
-dist/
 node_modules/

.jamignore

@@ -0,0 +1,14 @@
+*.custom.*
+.*
+build.js
+index.js
+build/
+doc/*.php
+node_modules/
+perf/*.sh
+test/*.sh
+test/test-build.js
+test/template/
+vendor/closure-compiler
+vendor/docdown
+vendor/uglifyjs

.npmignore

@@ -1,7 +1,5 @@
 *.custom.*
-*.min.*
 .*
-dist/
 doc/*.php
 node_modules/
 perf/*.html
@@ -11,7 +9,7 @@ test/*-ui.js
 test/*.sh
 vendor/backbone/
 vendor/docdown/
-vendor/qunit/qunit/*.css
-vendor/underscore/
-vendor/requirejs/
 vendor/firebug-lite/
+vendor/qunit/qunit/*.css
+vendor/requirejs/
+vendor/underscore/test/

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.6
+  - 0.8

README.md

@@ -1,15 +1,17 @@
-# Lo-Dash <sup>v0.4.0</sup>
+# Lo-Dash <sup>v0.8.2</sup>
+[![build status](https://secure.travis-ci.org/bestiejs/lodash.png)](http://travis-ci.org/bestiejs/lodash)
 
-A drop-in replacement for Underscore.js, from the devs behind [jsPerf.com](http://jsperf.com), that delivers [performance improvements](http://lodash.com/benchmarks), [bug fixes](https://github.com/bestiejs/lodash#closed-underscorejs-issues), and [additional features](https://github.com/bestiejs/lodash#features).
+A drop-in replacement<sup>[*](https://github.com/bestiejs/lodash/wiki/Drop-in-Disclaimer)</sup> for Underscore.js, from the devs behind [jsPerf.com](http://jsperf.com), delivering [performance](http://lodash.com/benchmarks), [bug fixes](https://github.com/bestiejs/lodash#resolved-underscorejs-issues), and [additional features](http://lodash.com/#features).
 
 Lo-Dash’s performance is gained by avoiding slower native methods, instead opting for simplified non-ES5 compliant methods optimized for common usage, and by leveraging function compilation to reduce the number of overall function calls.
 
 ## Download
 
- * [Development source](https://raw.github.com/bestiejs/lodash/v0.4.0/lodash.js)
- * [Production source](https://raw.github.com/bestiejs/lodash/v0.4.0/lodash.min.js)
- * CDN copies of ≤ [v0.3.2](http://cdnjs.cloudflare.com/ajax/libs/lodash.js/0.3.2/lodash.min.js) are available on [cdnjs](http://cdnjs.com/) thanks to [CloudFlare](http://www.cloudflare.com/)
- * For optimal performance, [create a custom build](https://github.com/bestiejs/lodash#custom-builds) with only the features you need
+ * [Development build](https://raw.github.com/bestiejs/lodash/v0.8.2/lodash.js)
+ * [Production build](https://raw.github.com/bestiejs/lodash/v0.8.2/lodash.min.js)
+ * [Underscore build](https://raw.github.com/bestiejs/lodash/v0.8.2/lodash.underscore.min.js) tailored for projects already using Underscore
+ * CDN copies of ≤ [v0.8.2](http://cdnjs.cloudflare.com/ajax/libs/lodash.js/0.8.2/lodash.min.js) are available on [cdnjs](http://cdnjs.com/) thanks to [CloudFlare](http://www.cloudflare.com/)
+ * For optimal file size, [create a custom build](https://github.com/bestiejs/lodash#custom-builds) with only the features you need
 
 ## Dive in
 
@@ -24,116 +26,170 @@ For a list of upcoming features, check out our [roadmap](https://github.com/best
 For more information check out these screencasts over Lo-Dash:
 
  * [Introducing Lo-Dash](https://vimeo.com/44154599)
- * [Optimizations and custom builds](https://vimeo.com/44154601)
+ * [Lo-Dash optimizations and custom builds](https://vimeo.com/44154601)
  * [Lo-Dash’s origin and why it’s a better utility belt](https://vimeo.com/44154600)
+ * [Unit testing in Lo-Dash](https://vimeo.com/45865290)
+ * [Lo-Dash’s approach to native method use](https://vimeo.com/48576012)
 
 ## Features
 
  * AMD loader support ([RequireJS](http://requirejs.org/), [curl.js](https://github.com/cujojs/curl), etc.)
- * [_.bind](http://lodash.com/docs#bind) supports *"lazy"* binding
- * [_.debounce](http://lodash.com/docs#debounce)’ed functions match [_.throttle](http://lodash.com/docs#throttle)’ed functions’ return value behavior
- * [_.forEach](http://lodash.com/docs#forEach) is chainable
+ * [_.clone](http://lodash.com/docs#clone) supports *“deep”* cloning
+ * [_.forEach](http://lodash.com/docs#forEach) is chainable and supports exiting iteration early
  * [_.forIn](http://lodash.com/docs#forIn) for iterating over an object’s own and inherited properties
  * [_.forOwn](http://lodash.com/docs#forOwn) for iterating over an object’s own properties
- * [_.groupBy](http://lodash.com/docs#groupBy), [_.sortedIndex](http://lodash.com/docs#sortedIndex), and [_.uniq](http://lodash.com/docs#uniq) accept a `thisArg` argument
- * [_.indexOf](http://lodash.com/docs#indexOf) and [_.lastIndexOf](http://lodash.com/docs#lastIndexOf) accept a `fromIndex` argument
- * [_.partial](http://lodash.com/docs#partial) for more functional fun
+ * [_.isPlainObject](http://lodash.com/docs#isPlainObject) checks if values are created by the `Object` constructor
+ * [_.lateBind](http://lodash.com/docs#lateBind) for late binding
+ * [_.merge](http://lodash.com/docs#merge) for a *“deep”* [_.extend](http://lodash.com/docs#extend)
+ * [_.partial](http://lodash.com/docs#partial) for partial application without `this` binding
+ * [_.pick](http://lodash.com/docs#pick) and [_.omit](http://lodash.com/docs#omit) accept `callback` and `thisArg` arguments
  * [_.template](http://lodash.com/docs#template) utilizes [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier debugging
  * [_.contains](http://lodash.com/docs#contains), [_.size](http://lodash.com/docs#size), [_.toArray](http://lodash.com/docs#toArray),
-   [and more…](http://lodash.com/docs "_.every, _.filter, _.find, _.forEach, _.groupBy, _.invoke, _.map, _.pluck, _.reduce, _.reduceRight, _.reject, _.some, _sortBy") accept strings
+   [and more…](http://lodash.com/docs "_.countBy, _.every, _.filter, _.find, _.forEach, _.groupBy, _.invoke, _.map, _.pluck, _.reduce, _.reduceRight, _.reject, _.some, _.sortBy, _.where") accept strings
 
 ## Support
 
-Lo-Dash has been tested in at least Chrome 5-20, Firefox 1.5-13, IE 6-9, Opera 9.25-12, Safari 3.0.4-5.1.7, Node.js 0.4.8-0.8.2, Narwhal 0.3.2, RingoJS 0.8, and Rhino 1.7RC3.
+Lo-Dash has been tested in at least Chrome 5~22, Firefox 1~16, IE 6-10, Opera 9.25-12, Safari 3-6, Node.js 0.4.8-0.8.11, Narwhal 0.3.2, RingoJS 0.8, and Rhino 1.7RC5.
 
 ## Custom builds
 
 Custom builds make it easy to create lightweight versions of Lo-Dash containing only the methods you need.
-We handle all the method dependency and alias mapping for you.
+To top it off, we handle all method dependency and alias mapping for you.
 
- * Backbone builds, containing all methods required by Backbone, may be created using the `backbone` modifier argument.
-~~~ bash
+ * Backbone builds, with only methods required by Backbone, may be created using the `backbone` modifier argument.
+```bash
 lodash backbone
-~~~
+```
+
+ * CSP builds, supporting default Content Security Policy restrictions, may be created using the `csp` modifier argument.
+```bash
+lodash csp
+```
 
  * Legacy builds, tailored for older browsers without [ES5 support](http://es5.github.com/), may be created using the `legacy` modifier argument.
-~~~ bash
+```bash
 lodash legacy
-~~~
+```
 
- * Mobile builds, with IE bug fixes and method compilation removed, may be created using the `mobile` modifier argument.
-~~~ bash
+ * Mobile builds, with IE < 9 bug fixes and method compilation removed, may be created using the `mobile` modifier argument.
+```bash
 lodash mobile
-~~~
+```
 
-Custom builds may be created in three ways:
+ * Strict builds, with `_.bindAll`, `_.defaults`, and `_.extend` in [strict mode](http://es5.github.com/#C), may be created using the `strict` modifier argument.
+```bash
+lodash strict
+```
 
- 1. Use the `category` argument to pass the categories of methods to include in the build.<br>
-    Valid categories are *"arrays"*, *"chaining"*, *"collections"*, *"functions"*, *"objects"*, and *"utilities"*.
-~~~ bash
+ * Underscore builds, tailored for projects already using Underscore, may be created using the `underscore` modifier argument.
+```bash
+lodash underscore
+```
+
+Custom builds may be created using the following commands:
+
+ * Use the `category` argument to pass comma separated categories of methods to include in the build.<br>
+   Valid categories (case-insensitive) are *“arrays”*, *“chaining”*, *“collections”*, *“functions”*, *“objects”*, and *“utilities”*.
+```bash
 lodash category=collections,functions
 lodash category="collections, functions"
-~~~
+```
 
- 2. Use the `include` argument to pass the names of methods to include in the build.
-~~~ bash
+ * Use the `exports` argument to pass comma separated names of ways to export the `LoDash` function.<br>
+   Valid exports are *“amd”*, *“commonjs”*, *“global”*, *“node”*, and *“none”*.
+```bash
+lodash exports=amd,commonjs,node
+lodash exports="amd, commonjs, node"
+```
+
+ * Use the `iife` argument to specify code to replace the immediately-invoked function expression that wraps Lo-Dash.
+```bash
+lodash iife="!function(window,undefined){%output%}(this)"
+```
+
+ * Use the `include` argument to pass comma separated method/category names to include in the build.
+```bash
 lodash include=each,filter,map
 lodash include="each, filter, map"
-~~~
+```
 
- 3. Use the `exclude` argument to pass the names of methods to exclude from the build.
-~~~ bash
-lodash exclude=union,uniq,zip
-lodash exclude="union, uniq, zip"
-~~~
+ * Use the `minus` argument to pass comma separated method/category names to remove from those included in the build.
+```bash
+lodash underscore minus=result,shuffle
+lodash underscore minus="result, shuffle"
+```
 
-All arguments, except `include` with `exclude` and `mobile` with `legacy`, may be combined.
+ * Use the `plus` argument to pass comma separated method/category names to add to those included in the build.
+```bash
+lodash backbone plus=random,template
+lodash backbone plus="random, template"
+```
 
-~~~ bash
-lodash backbone mobile category=functions include=pick,uniq
-lodash backbone legacy category=utilities exclude=first,last
-~~~
+ * Use the `template` argument to pass the file path pattern used to match template files to precompile
+```bash
+lodash template="./*.jst"
+```
+
+ * Use the `settings` argument to pass the template settings used when precompiling templates
+```bash
+lodash settings="{interpolate:/\\{\\{([\\s\\S]+?)\\}\\}/g}"
+```
+
+All arguments, except `legacy` with `csp` or `mobile`, may be combined.<br>
+Unless specified by `-o` or `--output`, all files created are saved to the current working directory.
+
+The following options are also supported:
+
+ * `-c`, `--stdout`&nbsp;&nbsp;&nbsp;&nbsp; Write output to standard output
+ * `-d`, `--debug`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Write only the debug output
+ * `-h`, `--help`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Display help information
+ * `-m`, `--minify`&nbsp;&nbsp;&nbsp;&nbsp; Write only the minified output
+ * `-o`, `--output`&nbsp;&nbsp;&nbsp;&nbsp; Write output to a given path/filename
+ * `-s`, `--silent`&nbsp;&nbsp;&nbsp;&nbsp; Skip status updates normally logged to the console
+ * `-V`, `--version`&nbsp;&nbsp; Output current version of Lo-Dash
 
 The `lodash` command-line utility is available when Lo-Dash is installed as a global package (i.e. `npm install -g lodash`).
 
-Custom builds are saved to `lodash.custom.js` and `lodash.custom.min.js`.
-
 ## Installation and usage
 
 In browsers:
 
-~~~ html
+```html
 <script src="lodash.js"></script>
-~~~
+```
 
 Using [npm](http://npmjs.org/):
 
-~~~ bash
+```bash
 npm install lodash
+
 npm install -g lodash
-~~~
+npm link lodash
+```
 
 In [Node.js](http://nodejs.org/) and [RingoJS v0.8.0+](http://ringojs.org/):
 
-~~~ js
+```js
 var _ = require('lodash');
-~~~
+```
 
-In [Narwhal](http://narwhaljs.org/) and [RingoJS v0.7.0-](http://ringojs.org/):
+**Note:** If Lo-Dash is installed globally, [run `npm link lodash`](http://blog.nodejs.org/2011/03/23/npm-1-0-global-vs-local-installation/) in your project’s root directory before attempting to `require` it.
 
-~~~ js
+In [RingoJS v0.7.0-](http://ringojs.org/):
+
+```js
 var _ = require('lodash')._;
-~~~
+```
 
 In [Rhino](http://www.mozilla.org/rhino/):
 
-~~~ js
+```js
 load('lodash.js');
-~~~
+```
 
 In an AMD loader like [RequireJS](http://requirejs.org/):
 
-~~~ js
+```js
 require({
   'paths': {
     'underscore': 'path/to/lodash'
@@ -142,46 +198,34 @@ require({
 ['underscore'], function(_) {
   console.log(_.VERSION);
 });
-~~~
+```
 
-## Closed Underscore.js issues <sup>(20+)</sup>
+## Resolved Underscore.js issues
 
- * Allow iteration of objects with a `length` property [[#148](https://github.com/documentcloud/underscore/issues/148), [#154](https://github.com/documentcloud/underscore/issues/154), [#252](https://github.com/documentcloud/underscore/issues/252), [#448](https://github.com/documentcloud/underscore/issues/448), [#659](https://github.com/documentcloud/underscore/issues/659), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L306-312)]
- * Ensure array-like objects with invalid `length` properties are treated like regular objects [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L257-263), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L607-621), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L840-843)]
- * Ensure *"Arrays"* methods allow falsey `array` arguments [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L908-947)]
- * Ensure *"Collections"* methods allow string `collection` arguments [[#247](https://github.com/documentcloud/underscore/issues/247), [#276](https://github.com/documentcloud/underscore/issues/276), [#561](https://github.com/documentcloud/underscore/pull/561), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L265-283), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L623-640), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L845-848)]
- * Ensure templates compiled with errors are inspectable [[#666](https://github.com/documentcloud/underscore/issues/666), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L737-744)]
- * Fix cross-browser object iteration bugs [[#376](https://github.com/documentcloud/underscore/issues/376), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L195-207), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L317-342), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L438-449), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L457-459), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L477-497), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L667-669)]
- * Handle arrays with `undefined` values correctly in IE < 9 [[#601](https://github.com/documentcloud/underscore/issues/601)]
- * Methods should work on pages with incorrectly shimmed native methods [[#7](https://github.com/documentcloud/underscore/issues/7), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L86-92)]
- * Register as an AMD module, but still export to global [[#431](https://github.com/documentcloud/underscore/pull/431), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L70-84)]
- * `_(…)` should return passed wrapper instances [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L104-107)]
- * `_.contains` should work with strings [[#667](https://github.com/documentcloud/underscore/pull/667), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L138-147)]
- * `_.escape` should return an empty string when passed `null` or `undefined` [[#407](https://github.com/documentcloud/underscore/issues/427), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L176-179)]
- * `_.forEach` should be chainable [[#142](https://github.com/documentcloud/underscore/issues/142), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L252-255)]
- * `_.groupBy` should add values to own, not inherited, properties [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L357-364)]
- * `_isNaN(new Number(NaN))` should return `true` [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L467-469)]
- * `_.reduceRight` should pass correct callback arguments when iterating objects [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L591-605)]
- * `_.size` should return the `length` of string values [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L650-652)]
- * `_.size` shouldn't error on falsey values [[#650](https://github.com/documentcloud/underscore/pull/650), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L654-661)]
- * `_.size` should work with `arguments` objects cross-browser [[#653](https://github.com/documentcloud/underscore/issues/653), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L663-665)]
- * `_.sortedIndex` should support arrays with high `length` values [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L707-716)]
- * `_.template` should not augment the `options` object [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L731-735)]
- * `_.throttle` should work when called in a tight loop [[#502](https://github.com/documentcloud/underscore/issues/502), [test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L791-801)]
- * `_.zipObject` should accept less than two arguments [[test](https://github.com/bestiejs/lodash/blob/v0.4.0/test/test.js#L870-872)]
+ * Add AMD loader support [[#431](https://github.com/documentcloud/underscore/pull/431), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L118-140)]
+ * Allow iteration of objects with a `length` property [[#799](https://github.com/documentcloud/underscore/pull/799), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L510-516)]
+ * Ensure *“Collections”* methods allow string `collection` arguments [[#247](https://github.com/documentcloud/underscore/issues/247), [#276](https://github.com/documentcloud/underscore/issues/276), [#561](https://github.com/documentcloud/underscore/pull/561), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L470-487)]
+ * Fix cross-browser object iteration bugs [[#60](https://github.com/documentcloud/underscore/issues/60), [#376](https://github.com/documentcloud/underscore/issues/376), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L523-547)]
+ * Methods should work on pages with incorrectly shimmed native methods [[#7](https://github.com/documentcloud/underscore/issues/7), [#742](https://github.com/documentcloud/underscore/issues/742), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L142-148)]
+ * `_.clone` should allow `deep` cloning [[#595](https://github.com/documentcloud/underscore/pull/595), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L214-225)]
+ * `_.contains` should work with strings [[#667](https://github.com/documentcloud/underscore/pull/667), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L267-276)]
+ * `_.extend` should recursively extend objects [[#379](https://github.com/documentcloud/underscore/pull/379), [#718](https://github.com/documentcloud/underscore/issues/718), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L968-990)]
+ * `_.forEach` should be chainable [[#142](https://github.com/documentcloud/underscore/issues/142), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L465-468)]
+ * `_.forEach` should allow exiting iteration early [[#211](https://github.com/documentcloud/underscore/issues/211), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L553-571)]
+ * `_.isEmpty` should support jQuery/MooTools DOM query collections [[#690](https://github.com/documentcloud/underscore/pull/690), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L712-717)]
+ * `_.isObject` should avoid V8 bug [#2291](http://code.google.com/p/v8/issues/detail?id=2291) [[#605](https://github.com/documentcloud/underscore/issues/605), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L772-784)]
+ * `_.keys` should work with `arguments` objects cross-browser [[#396](https://github.com/documentcloud/underscore/issues/396), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L865-867)]
+ * `_.range` should coerce arguments to numbers [[#634](https://github.com/documentcloud/underscore/issues/634), [#683](https://github.com/documentcloud/underscore/issues/683), [test](https://github.com/bestiejs/lodash/blob/v0.8.2/test/test.js#L1243-1246)]
 
 ## Optimized methods <sup>(50+)</sup>
 
  * `_.bind`
  * `_.bindAll`
- * `_.clone`
  * `_.compact`
  * `_.contains`, `_.include`
  * `_.defaults`
- * `_.defer`
  * `_.difference`
  * `_.each`
- * `_.escape`
  * `_.every`, `_.all`
  * `_.extend`
  * `_.filter`, `_.select`
@@ -192,11 +236,10 @@ require({
  * `_.groupBy`
  * `_.indexOf`
  * `_.intersection`
+ * `_.invert`
  * `_.invoke`
  * `_.isArguments`
  * `_.isDate`
- * `_.isEmpty`
- * `_.isEqual`
  * `_.isFinite`
  * `_.isFunction`
  * `_.isObject`
@@ -210,6 +253,8 @@ require({
  * `_.memoize`
  * `_.min`
  * `_.mixin`
+ * `_.omit`
+ * `_.pairs`
  * `_.pick`
  * `_.pluck`
  * `_.reduce`, `_.foldl`, `_.inject`
@@ -221,11 +266,11 @@ require({
  * `_.sortedIndex`
  * `_.template`
  * `_.throttle`
- * `_.times`
  * `_.toArray`
  * `_.union`
  * `_.uniq`, `_.unique`
  * `_.values`
+ * `_.where`
  * `_.without`
  * `_.wrap`
  * `_.zip`
@@ -233,27 +278,19 @@ require({
 
 ## Release Notes
 
-### <sup>v0.4.0</sup>
+### <sup>v0.8.2</sup>
 
- * Added `bin` and `scripts` entries to package.json
- * Added `legacy` build option
- * Added cross-browser support for passing strings to *"Collections"* methods
- * Added `_.zipObject`
- * Leveraged `_.indexOf`'s `fromIndex` in `_.difference` and `_.without`
- * Optimized compiled templates
- * Optimized inlining the `iteratorTemplate` for builds
- * Optimized object iteration for *"Collections"* methods
- * Optimized partially applied `_.bind` in V8
- * Made compiled templates more debuggable
- * Made `_.size` work with falsey values and consistent cross-browser with `arguments` objects
- * Moved `_.groupBy` and `_.sortBy` back to the *"Collections"* category
- * Removed `arguments` object from `_.range`
+ * Ensured `_.map` returns an array when passed a falsey collection
+ * Ensured `_.throttle` clears its timeout when `func` is called
+ * Made `_.max`, `_.min`, `_.shuffle` support iterating objects
+ * Reduced `createIterator`, `_.clone`, and `_.compact`
+ * Re-optimized `_.max`, `_.min`, and `_.sortedIndex`
 
 The full changelog is available [here](https://github.com/bestiejs/lodash/wiki/Changelog).
 
 ## BestieJS
 
-Lo-Dash is part of the BestieJS *"Best in Class"* module collection. This means we promote solid browser/environment support, ES5 precedents, unit testing, and plenty of documentation.
+Lo-Dash is part of the BestieJS *“Best in Class”* module collection. This means we promote solid browser/environment support, ES5 precedents, unit testing, and plenty of documentation.
 
 ## Author
 

build/minify.js

@@ -9,23 +9,19 @@
       spawn = require('child_process').spawn;
 
   /** The directory that is the base of the repository */
-  var basePath = path.join(__dirname, '../');
+  var basePath = fs.realpathSync(path.join(__dirname, '..'));
 
   /** The directory where the Closure Compiler is located */
   var closurePath = path.join(basePath, 'vendor', 'closure-compiler', 'compiler.jar');
 
-  /** The distribution directory */
-  var distPath = path.join(basePath, 'dist');
-
   /** Load other modules */
-  var preprocess = require(path.join(__dirname, 'pre-compile')),
-      postprocess = require(path.join(__dirname, 'post-compile')),
-      uglifyJS = require(path.join(basePath, 'vendor', 'uglifyjs', 'uglify-js'));
+  var preprocess = require('./pre-compile'),
+      postprocess = require('./post-compile'),
+      uglifyJS = require('../vendor/uglifyjs/uglify-js');
 
   /** Closure Compiler command-line options */
   var closureOptions = [
     '--compilation_level=ADVANCED_OPTIMIZATIONS',
-    '--language_in=ECMASCRIPT5_STRICT',
     '--warning_level=QUIET'
   ];
 
@@ -38,12 +34,40 @@
    * The exposed `minify` function minifies a given Lo-Dash `source` and invokes
    * the `onComplete` callback when finished.
    *
-   * @param {String} source The source to minify.
-   * @param {String} workingName The name to give temporary files creates during the minification process.
-   * @param {Function} onComplete A function called when minification has completed.
+   * @param {Array|String} [source=''] The source to minify or array of commands.
+   * @param {Object} [options={}] The options object.
    */
-  function minify(source, workingName, onComplete) {
-    new Minify(source, workingName, onComplete);
+  function minify(source, options) {
+    source || (source = '');
+    options || (options = {});
+
+    // juggle arguments
+    if (Array.isArray(source)) {
+      // convert commands to an options object
+      options = source;
+
+      var filePath = options[options.length - 1],
+          isSilent = options.indexOf('-s') > -1 || options.indexOf('--silent') > -1,
+          isTemplate = options.indexOf('-t') > -1 || options.indexOf('--template') > -1,
+          outputPath = path.join(path.dirname(filePath), path.basename(filePath, '.js') + '.min.js');
+
+      outputPath = options.reduce(function(result, value, index) {
+        if (/-o|--output/.test(value)) {
+          result = options[index + 1];
+          result = path.join(fs.realpathSync(path.dirname(result)), path.basename(result));
+        }
+        return result;
+      }, outputPath);
+
+      options = {
+        'isSilent': isSilent,
+        'isTemplate': isTemplate,
+        'outputPath': outputPath
+      };
+
+      source = fs.readFileSync(filePath, 'utf8');
+    }
+    new Minify(source, options);
   }
 
   /**
@@ -52,24 +76,27 @@
    * @private
    * @constructor
    * @param {String} source The source to minify.
-   * @param {String} workingName The name to give temporary files creates during the minification process.
-   * @param {Function} onComplete A function called when minification has completed.
+   * @param {Object} options The options object.
    */
-  function Minify(source, workingName, onComplete) {
-    // create the destination directory if it doesn't exist
-    if (!fs.existsSync(distPath)) {
-      // avoid errors when called as a npm executable
-      try {
-        fs.mkdirSync(distPath);
-      } catch(e) { }
+  function Minify(source, options) {
+    // juggle arguments
+    if (typeof source == 'object' && source) {
+      options = source || options;
+      source = options.source || '';
     }
-
     this.compiled = {};
     this.hybrid = {};
     this.uglified = {};
-    this.onComplete = onComplete;
-    this.source = source = preprocess(source);
-    this.workingName = workingName;
+    this.isSilent = !!options.isSilent;
+    this.isTemplate = !!options.isTemplate;
+    this.outputPath = options.outputPath;
+
+    source = preprocess(source, options);
+    this.source = source;
+
+    this.onComplete = options.onComplete || function(source) {
+      fs.writeFileSync(this.outputPath, source, 'utf8');
+    };
 
     // begin the minification process
     closureCompile.call(this, source, onClosureCompile.bind(this));
@@ -87,10 +114,19 @@
    * @param {Function} callback The function to call once the process completes.
    */
   function closureCompile(source, message, callback) {
+    var options = closureOptions.slice();
+
+    // use simple optimizations when minifying template files
+    if (this.isTemplate) {
+      options = options.map(function(value) {
+        return value.replace(/^(compilation_level)=.+$/, '$1=SIMPLE_OPTIMIZATIONS');
+      });
+    }
+
     // the standard error stream, standard output stream, and Closure Compiler process
     var error = '',
         output = '',
-        compiler = spawn('java', ['-jar', closurePath].concat(closureOptions));
+        compiler = spawn('java', ['-jar', closurePath].concat(options));
 
     // juggle arguments
     if (typeof message == 'function') {
@@ -98,10 +134,12 @@
       message = null;
     }
 
-    console.log(message == null
-      ? 'Compressing ' + this.workingName + ' using the Closure Compiler...'
-      : message
-    );
+    if (!this.isSilent) {
+      console.log(message == null
+        ? 'Compressing ' + path.basename(this.outputPath, '.js') + ' using the Closure Compiler...'
+        : message
+      );
+    }
 
     compiler.stdout.on('data', function(data) {
       // append the data to the output stream
@@ -149,10 +187,12 @@
       message = null;
     }
 
-    console.log(message == null
-      ? 'Compressing ' + this.workingName + ' using UglifyJS...'
-      : message
-    );
+    if (!this.isSilent) {
+      console.log(message == null
+        ? 'Compressing ' + path.basename(this.outputPath, '.js') + ' using UglifyJS...'
+        : message
+      );
+    }
 
     try {
       result = ugly.gen_code(
@@ -203,9 +243,12 @@
     if (exception) {
       throw exception;
     }
+    if (!this.isSilent) {
+      console.log('Done. Size: %d bytes.', result.length);
+    }
+
     // store the gzipped result and report the size
     this.compiled.gzip = result;
-    console.log('Done. Size: %d bytes.', result.length);
 
     // next, minify the source using only UglifyJS
     uglify.call(this, this.source, onUglify.bind(this));
@@ -238,11 +281,13 @@
     if (exception) {
       throw exception;
     }
-    var message = 'Compressing  ' + this.workingName + ' using hybrid minification...';
+    if (!this.isSilent) {
+      console.log('Done. Size: %d bytes.', result.length);
+    }
+    var message = 'Compressing  ' + path.basename(this.outputPath, '.js') + ' using hybrid minification...';
 
     // store the gzipped result and report the size
     this.uglified.gzip = result;
-    console.log('Done. Size: %d bytes.', result.length);
 
     // next, minify the Closure Compiler minified source using UglifyJS
     uglify.call(this, this.compiled.source, message, onHybrid.bind(this));
@@ -275,9 +320,11 @@
     if (exception) {
       throw exception;
     }
+    if (!this.isSilent) {
+      console.log('Done. Size: %d bytes.', result.length);
+    }
     // store the gzipped result and report the size
     this.hybrid.gzip = result;
-    console.log('Done. Size: %d bytes.', result.length);
 
     // finish by choosing the smallest compressed file
     onComplete.call(this);
@@ -291,24 +338,8 @@
   function onComplete() {
     var compiled = this.compiled,
         hybrid = this.hybrid,
-        name = this.workingName,
         uglified = this.uglified;
 
-    // avoid errors when called as a npm executable
-    try {
-      // save the Closure Compiled version to disk
-      fs.writeFileSync(path.join(distPath, name + '.compiler.js'), compiled.source);
-      fs.writeFileSync(path.join(distPath, name + '.compiler.js.gz'), compiled.gzip);
-
-      // save the Uglified version to disk
-      fs.writeFileSync(path.join(distPath, name + '.uglify.js'), uglified.source);
-      fs.writeFileSync(path.join(distPath, name + '.uglify.js.gz'), uglified.gzip);
-
-      // save the hybrid minified version to disk
-      fs.writeFileSync(path.join(distPath, name + '.hybrid.js'), hybrid.source);
-      fs.writeFileSync(path.join(distPath, name + '.hybrid.js.gz'), hybrid.gzip);
-    } catch(e) { }
-
     // select the smallest gzipped file and use its minified counterpart as the
     // official minified release (ties go to Closure Compiler)
     var min = Math.min(compiled.gzip.length, hybrid.gzip.length, uglified.gzip.length);
@@ -334,14 +365,11 @@
     // was invoked directly (e.g. `node minify.js source.js`) and write to
     // `<filename>.min.js`
     (function() {
-      var filePath = process.argv[2],
-          dirPath = path.dirname(filePath),
-          source = fs.readFileSync(filePath, 'utf8'),
-          workingName = path.basename(filePath, '.js') + '.min';
-
-      minify(source, workingName, function(result) {
-        fs.writeFileSync(path.join(dirPath, workingName + '.js'), result, 'utf8');
-      });
+      var options = process.argv;
+      if (options.length < 3) {
+        return;
+      }
+      minify(options);
     }());
   }
 }());

build/post-compile.js

@@ -6,11 +6,15 @@
   var fs = require('fs');
 
   /** The minimal license/copyright template */
-  var licenseTemplate =
-    '/*!\n' +
-    ' Lo-Dash @VERSION lodash.com/license\n' +
-    ' Underscore.js 1.3.3 github.com/documentcloud/underscore/blob/master/LICENSE\n' +
-    '*/';
+  var licenseTemplate = {
+    'lodash':
+      '/*!\n' +
+      ' Lo-Dash @VERSION lodash.com/license\n' +
+      ' Underscore.js 1.4.2 underscorejs.org/LICENSE\n' +
+      '*/',
+    'underscore':
+      '/*! Underscore.js @VERSION underscorejs.org/LICENSE */'
+  };
 
   /*--------------------------------------------------------------------------*/
 
@@ -22,32 +26,29 @@
    * @returns {String} Returns the processed source.
    */
   function postprocess(source) {
-    // exit early if snippet isn't found
+    // move vars exposed by Closure Compiler into the IIFE
+    source = source.replace(/^((?:(['"])use strict\2;)?(?:var (?:[a-z]+=(?:!0|!1|null)[,;])+)?)([\s\S]*?function[^)]+\){)/, '$3$1');
+
+    // unescape properties (i.e. foo["bar"] => foo.bar)
+    source = source.replace(/(\w)\["([^."]+)"\]/g, function(match, left, right) {
+      return /\W/.test(right) ? match : (left + '.' + right);
+    });
+
+    // correct AMD module definition for AMD build optimizers
+    source = source.replace(/("function")\s*==\s*(typeof define)\s*&&\s*\(?\s*("object")\s*==\s*(typeof define\.amd)\s*&&\s*(define\.amd)\s*\)?/, '$2==$1&&$4==$3&&$5');
+
+    // add trailing semicolon
+    if (source) {
+      source = source.replace(/[\s;]*$/, ';');
+    }
+    // exit early if version snippet isn't found
     var snippet = /VERSION\s*[=:]\s*([\'"])(.*?)\1/.exec(source);
     if (!snippet) {
       return source;
     }
-
-    // set the version
-    var license = licenseTemplate.replace('@VERSION', snippet[2]);
-
-    // move vars exposed by Closure Compiler into the IIFE
-    source = source.replace(/^([^(\n]+)\s*(\(function[^)]+\){)/, '$2$1');
-
-    // use double quotes consistently
-    source = source.replace(/'use strict'/, '"use strict"');
-
-    // unescape properties (i.e. foo["bar"] => foo.bar)
-    source = source.replace(/(\w)\["([^."]+)"\]/g, '$1.$2');
-
-    // correct AMD module definition for AMD build optimizers
-    source = source.replace(/("function")==(typeof define)&&\(?("object")==(typeof define\.amd)(&&define\.amd)\)?/, '$2==$1&&$4==$3$5');
-
     // add license
-    source = license + '\n;' + source;
-
-    // add trailing semicolon
-    return source.replace(/[\s;]*$/, ';');
+    return licenseTemplate[/call\(this\);?$/.test(source) ? 'underscore' : 'lodash']
+      .replace('@VERSION', snippet[2]) + '\n;' + source;
   }
 
   /*--------------------------------------------------------------------------*/
@@ -55,13 +56,20 @@
   // expose `postprocess`
   if (module != require.main) {
     module.exports = postprocess;
-  } else {
+  }
+  else {
     // read the Lo-Dash source file from the first argument if the script
     // was invoked directly (e.g. `node post-compile.js source.js`) and write to
     // the same file
     (function() {
-      var source = fs.readFileSync(process.argv[2], 'utf8');
-      fs.writeFileSync(process.argv[2], postprocess(source), 'utf8');
+      var options = process.argv;
+      if (options.length < 3) {
+        return;
+      }
+      var filePath = options[options.length - 1],
+          source = fs.readFileSync(filePath, 'utf8');
+
+      fs.writeFileSync(filePath, postprocess(source), 'utf8');
     }());
   }
 }());

build/pre-compile.js

@@ -7,42 +7,68 @@
 
   /** Used to minify variables embedded in compiled strings */
   var compiledVars = [
-    'accumulator',
-    'args',
-    'arrayClass',
+    'argsIndex',
+    'argsLength',
     'callback',
-    'className',
     'collection',
-    'compareAscending',
+    'concat',
+    'createCallback',
     'ctor',
-    'funcClass',
     'hasOwnProperty',
-    'identity',
     'index',
-    'isFunc',
     'iteratee',
-    'iteratorBind',
     'length',
-    'methodName',
     'nativeKeys',
-    'noaccum',
     'object',
-    'objectTypes',
+    'ownIndex',
+    'ownProps',
     'prop',
+    'propertyIsEnumerable',
     'propIndex',
     'props',
-    'property',
-    'propertyIsEnumerable',
     'result',
     'skipProto',
     'slice',
-    'source',
-    'sourceIndex',
     'stringClass',
-    'target',
     'thisArg',
     'toString',
-    'value'
+    'undefined',
+    'value',
+
+    // lesser used variables
+    'accumulator',
+    'args',
+    'arrayLikeClasses',
+    'ArrayProto',
+    'bind',
+    'callee',
+    'className',
+    'compareAscending',
+    'forIn',
+    'found',
+    'funcs',
+    'indexOf',
+    'indicator',
+    'isArguments',
+    'isArr',
+    'isArray',
+    'isFunc',
+    'isFunction',
+    'isPlainObject',
+    'methodName',
+    'noaccum',
+    'noop',
+    'objectClass',
+    'objectTypes',
+    'pass',
+    'properties',
+    'property',
+    'propsLength',
+    'source',
+    'stackA',
+    'stackB',
+    'stackLength',
+    'target'
   ];
 
   /** Used to minify `compileIterator` option properties */
@@ -52,29 +78,32 @@
     'arrayBranch',
     'beforeLoop',
     'bottom',
-    'exit',
     'firstArg',
     'hasDontEnumBug',
     'inLoop',
     'init',
     'isKeysFast',
-    'iteratee',
     'object',
     'objectBranch',
+    'noArgsEnum',
     'noCharByIndex',
     'shadowed',
     'top',
-    'useHas'
+    'useHas',
+    'useStrict'
   ];
 
   /** Used to minify variables and string values to a single character */
   var minNames = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
+  minNames.push.apply(minNames, minNames.map(function(value) {
+    return value + value;
+  }));
 
   /** Used to protect the specified properties from getting minified */
   var propWhitelist = [
     '_',
-    '_chain',
-    '_wrapped',
+    '__chain__',
+    '__wrapped__',
     'after',
     'all',
     'amd',
@@ -89,6 +118,7 @@
     'compact',
     'compose',
     'contains',
+    'countBy',
     'criteria',
     'debounce',
     'defaults',
@@ -96,12 +126,13 @@
     'delay',
     'detect',
     'difference',
+    'drop',
     'each',
     'environment',
     'escape',
-    'escape',
     'evaluate',
     'every',
+    'exports',
     'extend',
     'filter',
     'find',
@@ -118,11 +149,13 @@
     'head',
     'identity',
     'include',
+    'index',
     'indexOf',
     'initial',
     'inject',
     'interpolate',
     'intersection',
+    'invert',
     'invoke',
     'isArguments',
     'isArray',
@@ -139,24 +172,31 @@
     'isNull',
     'isNumber',
     'isObject',
+    'isPlainObject',
     'isRegExp',
     'isString',
     'isUndefined',
     'keys',
     'last',
     'lastIndexOf',
+    'lateBind',
     'map',
     'max',
     'memoize',
+    'merge',
     'methods',
     'min',
     'mixin',
     'noConflict',
+    'object',
+    'omit',
     'once',
     'opera',
+    'pairs',
     'partial',
     'pick',
     'pluck',
+    'random',
     'range',
     'reduce',
     'reduceRight',
@@ -175,10 +215,12 @@
     'take',
     'tap',
     'template',
+    'templates',
     'templateSettings',
     'throttle',
     'times',
     'toArray',
+    'unescape',
     'union',
     'uniq',
     'unique',
@@ -187,10 +229,14 @@
     'values',
     'variable',
     'VERSION',
+    'where',
     'without',
     'wrap',
     'zip',
-    'zipObject'
+
+    // properties used by underscore.js
+    '_chain',
+    '_wrapped'
   ];
 
   /*--------------------------------------------------------------------------*/
@@ -198,25 +244,33 @@
   /**
    * Pre-process a given Lo-Dash `source`, preparing it for minification.
    *
-   * @param {String} source The source to process.
+   * @param {String} [source=''] The source to process.
+   * @param {Object} [options={}] The options object.
    * @returns {String} Returns the processed source.
    */
-  function preprocess(source) {
-    // remove copyright to add later in post-compile.js
-    source = source.replace(/\/\*![\s\S]+?\*\//, '');
+  function preprocess(source, options) {
+    source || (source = '');
+    options || (options = {});
 
     // remove unrecognized JSDoc tags so Closure Compiler won't complain
     source = source.replace(/@(?:alias|category)\b.*/g, '');
 
+    if (options.isTemplate) {
+      return source;
+    }
+
+    // remove copyright to add later in post-compile.js
+    source = source.replace(/\/\*![\s\S]+?\*\//, '');
+
     // add brackets to whitelisted properties so Closure Compiler won't mung them
     // http://code.google.com/closure/compiler/docs/api-tutorial3.html#export
     source = source.replace(RegExp('\\.(' + propWhitelist.join('|') + ')\\b', 'g'), "['$1']");
 
-    // remove brackets from `_.escape()` in `tokenizeEscape`
-    source = source.replace(/_\['escape']\("/, '_.escape("');
-
     // remove brackets from `_.escape()` in `_.template`
-    source = source.replace(/__e *= *_\['escape']/, '__e=_.escape');
+    source = source.replace(/__e *= *_\['escape']/g, '__e=_.escape');
+
+    // remove brackets from `_.escape()` in underscore.js `_.template`
+    source = source.replace(/_\['escape'\]\(__t'/g, '_.escape(__t');
 
     // remove brackets from `collection.indexOf` in `_.contains`
     source = source.replace("collection['indexOf'](target)", 'collection.indexOf(target)');
@@ -227,13 +281,16 @@
     // remove whitespace from string literals
     source = source.replace(/'(?:(?=(\\?))\1.)*?'/g, function(string) {
       // avoids removing the '\n' of the `stringEscapes` object
-      return string.replace(/\[object |else if|function | in |return\s+[\w']|throw |typeof |use strict|var |@ |'\\n'|\\\\n|\\n|\s+/g, function(match) {
+      return string.replace(/\[object |delete |else |function | in |return\s+[\w']|throw |typeof |use strict|var |@ |'\\n'|\\\\n|\\n|\s+/g, function(match) {
         return match == false || match == '\\n' ? '' : match;
       });
     });
 
-    // remove whitespace from `_.template` related regexpes
-    source = source.replace(/(?:reDelimiterCode\w+|reEmptyString\w+|reInsertVariable) *=.+/g, function(match) {
+    // add newline to `+"__p+='"` in underscore.js `_.template`
+    source = source.replace(/\+"__p\+='"/g, '+"\\n__p+=\'"');
+
+    // remove whitespace from `_.template` related regexes
+    source = source.replace(/(?:reEmptyString\w+|reInsertVariable) *=.+/g, function(match) {
       return match.replace(/ |\\n/g, '');
     });
 
@@ -246,35 +303,59 @@
       .replace("') {\\n'", "'){'")
 
     // remove `useSourceURL` variable
-    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *try *\{(?:\s*\/\/.*\n)* *var useSourceURL[\s\S]+?catch[^}]+}\n/, '');
+    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *try *\{(?:\s*\/\/.*)*\n *var useSourceURL[\s\S]+?catch[^}]+}\n/, '');
 
     // remove debug sourceURL use in `_.template`
-    source = source.replace(/(?:\s*\/\/.*\n)* *if *\(useSourceURL[^}]+}/, '');
+    source = source.replace(/(?:\s*\/\/.*\n)* *var sourceURL[^;]+;|\+ *sourceURL/g, '');
 
-    // minify internal properties used by `_.sortBy`
+    // minify internal properties used by 'compareAscending', `_.merge`, and `_.sortBy`
     (function() {
-      var properties = ['criteria', 'value'],
-          snippets = source.match(/( +)(?:function compareAscending|var sortBy)\b[\s\S]+?\n\1}/g);
+      var properties = ['criteria', 'index', 'value'],
+          snippets = source.match(/( +)(?:function compareAscending|var merge|var sortBy)\b[\s\S]+?\n\1}/g);
 
       if (!snippets) {
         return;
       }
       snippets.forEach(function(snippet) {
         var modified = snippet,
-            isSortBy = /var sortBy\b/.test(modified),
+            isCompilable = /(?:var merge|var sortBy)\b/.test(modified),
             isInlined = !/\bcreateIterator\b/.test(modified);
 
         // minify properties
         properties.forEach(function(property, index) {
-          // add quotes around properties in the inlined `_.sortBy` of the mobile
-          // build so Closure Compiler won't mung them
-          if (isSortBy && isInlined) {
-            modified = modified
-              .replace(RegExp('\\.' + property + '\\b', 'g'), "['" + minNames[index] + "']")
-              .replace(RegExp('\\b' + property + ' *:', 'g'), "'" + minNames[index] + "':");
+          var reBracketProp = RegExp("\\['(" + property + ")'\\]", 'g'),
+              reDotProp = RegExp('\\.' + property + '\\b', 'g'),
+              rePropColon = RegExp("([^?\\s])\\s*([\"'])?\\b" + property + "\\2 *:", 'g');
+
+          if (isCompilable) {
+            // add quotes around properties in the inlined `_.merge` and `_.sortBy`
+            // of the mobile build so Closure Compiler won't mung them
+            if (isInlined) {
+              modified = modified
+                .replace(reBracketProp, "['" + minNames[index] + "']")
+                .replace(reDotProp, "['" + minNames[index] + "']")
+                .replace(rePropColon, "$1'" + minNames[index] + "':");
+            }
+            else {
+              modified = modified
+                .replace(reBracketProp, '.' + minNames[index])
+                .replace(reDotProp, '.' + minNames[index])
+                .replace(rePropColon, '$1' + minNames[index] + ':');
+            }
+          }
+          else {
+            modified = modified
+              .replace(reBracketProp, "['" + minNames[index] + "']")
+              .replace(reDotProp, '.' + minNames[index])
+              .replace(rePropColon, "$1'" + minNames[index] + "':")
+
+            // correct `value.source` in regexp branch of `_.clone`
+            if (property == 'source') {
+              modified = modified.replace("value['" + minNames[index] + "']", "value['source']");
+            }
           }
-          modified = modified.replace(RegExp('\\b' + property + '\\b', 'g'), minNames[index]);
         });
+
         // replace with modified snippet
         source = source.replace(snippet, modified);
       });
@@ -308,8 +389,8 @@
       modified = modified.replace(RegExp('\\.(' + iteratorOptions.join('|') + ')\\b', 'g'), "['$1']");
 
       if (isCreateIterator) {
-        // replace with modified snippet early and clip snippet so other arguments
-        // aren't minified
+        // replace with modified snippet early and clip snippet to the `factory`
+        // call so other arguments aren't minified
         source = source.replace(snippet, modified);
         snippet = modified = modified.replace(/factory\([\s\S]+$/, '');
       }
@@ -339,7 +420,7 @@
           else {
             // minify property name strings
             modified = modified.replace(RegExp("'" + property + "'", 'g'), "'" + minNames[index] + "'");
-            // minify property names in regexps and accessors
+            // minify property names in regexes and accessors
             if (isCreateIterator) {
               modified = modified.replace(RegExp('([\\.|/])' + property + '\\b' , 'g'), '$1' + minNames[index]);
             }
@@ -365,8 +446,17 @@
     // was invoked directly (e.g. `node pre-compile.js source.js`) and write to
     // the same file
     (function() {
-      var source = fs.readFileSync(process.argv[2], 'utf8');
-      fs.writeFileSync(process.argv[2], preprocess(source), 'utf8');
+      var options = process.argv;
+      if (options.length < 3) {
+        return;
+      }
+      var filePath = options[options.length - 1],
+          isTemplate = options.indexOf('-t') > -1 || options.indexOf('--template') > -1,
+          source = fs.readFileSync(filePath, 'utf8');
+
+      fs.writeFileSync(filePath, preprocess(source, {
+        'isTemplate': isTemplate
+      }), 'utf8');
     }());
   }
 }());

doc/parse.php

@@ -20,9 +20,10 @@
 
   // generate Markdown
   $markdown = docdown(array(
-    'path' => '../' . $file,
-    'title' => 'Lo-Dash <sup>v0.4.0</sup>',
-    'url'  => 'https://github.com/bestiejs/lodash/blob/master/lodash.js'
+    'path'  => '../' . $file,
+    'title' => 'Lo-Dash <sup>v0.8.2</sup>',
+    'toc'   => 'categories',
+    'url'   => 'https://github.com/bestiejs/lodash/blob/master/lodash.js'
   ));
 
   // save to a .md file

index.js

@@ -0,0 +1 @@
+module.exports = require('./lodash');

lodash.min.js

@@ -1,35 +1,39 @@
 /*!
- Lo-Dash 0.4.0 lodash.com/license
- Underscore.js 1.3.3 github.com/documentcloud/underscore/blob/master/LICENSE
+ Lo-Dash 0.8.2 lodash.com/license
+ Underscore.js 1.4.2 underscorejs.org/LICENSE
 */
-;(function(e,t){"use strict";function s(e){return new o(e)}function o(e){if(e&&e._wrapped)return e;this._wrapped=e}function u(){for(var e,t,n,s=-1,o=arguments.length,u={e:"",f:"",j:"",q:"",c:{d:""},n:{d:""}};++s<o;)for(t in e=arguments[s],e)n=(n=e[t])==r?"":n,/d|i/.test(t)?("string"==typeof n&&(n={b:n,m:n}),u.c[t]=n.b,u.n[t]=n.m):u[t]=n;e=u.a,t=/^[^,]+/.exec(e)[0],u.l=u.l||t,u.g=t,u.h=yt,u.k=St,u.p=Q,u.r=u.r!==i,"o"in u||(u.o=wt),u.f||(u.f="if(!"+t+")return A");if("f"!=t||!u.c.i)u.c=r;t="var A",u.
-j&&(t+="="+u.j),t+=";"+u.f+";"+u.q+";var l,n="+u.l+";",u.c&&(t+="var p=n.length;l=-1;",u.n&&(t+="if(p===p>>>0){"),u.o&&(t+="if(I.call(n)==F){n=n.split('')}"),t+=u.c.d+";while(++l<p){"+u.c.i+"}",u.n&&(t+="}"));if(u.n){u.c&&(t+="else{"),u.h||(t+="var B=typeof n=='function'&&z.call(n,'prototype');"),u.k&&u.r?t+="var x=r(n),w=-1,p=x.length;"+u.n.d+";while(++w<p){l=x[w];if(!(B&&l=='prototype')){"+u.n.i+"}}":(t+=u.n.d+";for(l in n){",u.h?(u.r&&(t+="if(j.call(n,l)){"),t+=u.n.i+";",u.r&&(t+="}")):(t+="if(!(B&&l=='prototype')"
-,u.r&&(t+="&&j.call(n,l)"),t+="){"+u.n.i+"}"),t+="}");if(u.h){t+="var h=n.constructor;";for(n=0;7>n;n++)t+="l='"+u.p[n]+"';if(","constructor"==u.p[n]&&(t+="!(h&&h.prototype===n)&&"),t+="j.call(n,l)){"+u.n.i+"}"}u.c&&(t+="}")}return t+=u.e+";return A",Function("c,g,i,j,k,o,u,r,z,C,F,I",'"use strict";return function('+e+"){"+t+"}")(ft,a,ht,et,k,h,Tt,at,nt,rt,vt,it)}function a(e,n){return e=e.a,n=n.a,e===t?1:n===t?-1:e<n?-1:e>n?1:0}function f(e,t){return Y[t]}function l(e){return"\\"+Nt[e]}function c
-(e){return xt[e]}function h(e,t){return function(n,r,i){return e.call(t,n,r,i)}}function p(){}function d(e,t){if(F.test(t))return"<e%-"+t+"%>";var n=Y.length;return Y[n]="'+__e("+t+")+'",G+n}function v(e,t,n,r){return e=Y.length,t?Y[e]="';"+t+";__p+='":n?Y[e]="'+__we("+n+")+'":r&&(Y[e]="'+((__wt=("+r+"))==null?'':__wt)+'"),G+e}function m(e,t){if(F.test(t))return"<e%="+t+"%>";var n=Y.length;return Y[n]="'+((__t=("+t+"))==null?'':__t)+'",G+n}function g(e,t,n,r){if(!e)return n;var i=e.length,s=3>arguments
-.length;r&&(t=h(t,r));if(i===i>>>0){var o=wt&&it.call(e)==vt?e.split(""):e;for(i&&s&&(n=o[--i]);i--;)n=t(n,o[i],i,e);return n}o=en(e);for((i=o.length)&&s&&(n=e[o[--i]]);i--;)s=o[i],n=t(n,e[s],s,e);return n}function y(e,t,n){if(e)return t==r||n?e[0]:rt.call(e,0,t)}function b(e,t){var n=[];if(!e)return n;for(var r,i=-1,s=e.length;++i<s;)r=e[i],Yt(r)?tt.apply(n,t?r:b(r)):n.push(r);return n}function w(e,t,n){if(!e)return-1;var r=-1,i=e.length;if(n){if("number"!=typeof n)return r=x(e,t),e[r]===t?r:-1;
-r=(0>n?Math.max(0,i+n):n)-1}for(;++r<i;)if(e[r]===t)return r;return-1}function E(e,t,n){var r=-Infinity,i=r;if(!e)return i;var s=-1,o=e.length;if(!t){for(;++s<o;)e[s]>i&&(i=e[s]);return i}for(n&&(t=h(t,n));++s<o;)n=t(e[s],s,e),n>r&&(r=n,i=e[s]);return i}function S(e,t,n){return e?rt.call(e,t==r||n?1:t):[]}function x(e,t,n,r){if(!e)return 0;var i=0,s=e.length;if(n){r&&(n=N(n,r));for(t=n(t);i<s;)r=i+s>>>1,n(e[r])<t?i=r+1:s=r}else for(;i<s;)r=i+s>>>1,e[r]<t?i=r+1:s=r;return i}function T(e,t,n,r){var s=
-[];if(!e)return s;var o=-1,u=e.length,a=[];"function"==typeof t&&(r=n,n=t,t=i);for(n?r&&(n=h(n,r)):n=k;++o<u;)if(r=n(e[o],o,e),t?!o||a[a.length-1]!==r:0>w(a,r))a.push(r),s.push(e[o]);return s}function N(e,t){function n(){var o=arguments,u=t;return i||(e=t[r]),s.length&&(o=o.length?Z.apply(s,o):s),this instanceof n?(p.prototype=e.prototype,u=new p,(o=e.apply(u,o))&&Tt[typeof o]?o:u):e.apply(u,o)}var r,i=it.call(e)==ht;if(i){if(Et||st&&2<arguments.length)return st.call.apply(st,arguments)}else r=t,
-t=e;var s=rt.call(arguments,2);return n}function C(e,t,s){s||(s=[]);if(e===t)return 0!==e||1/e==1/t;if(e==r||t==r)return e===t;e._chain&&(e=e._wrapped),t._chain&&(t=t._wrapped);if(e.isEqual&&it.call(e.isEqual)==ht)return e.isEqual(t);if(t.isEqual&&it.call(t.isEqual)==ht)return t.isEqual(e);var o=it.call(e);if(o!=it.call(t))return i;switch(o){case vt:return e==""+t;case pt:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case lt:case ct:return+e==+t;case dt:return e.source==t.source&&e.global==t.global&&e.multiline==
-t.multiline&&e.ignoreCase==t.ignoreCase}if("object"!=typeof e||"object"!=typeof t)return i;for(var u=s.length;u--;)if(s[u]==e)return n;var u=-1,a=n,f=0;s.push(e);if(o==ft){if(f=e.length,a=f==t.length)for(;f--&&(a=C(e[f],t[f],s)););}else{if("constructor"in e!="constructor"in t||e.constructor!=t.constructor)return i;for(var l in e)if(et.call(e,l)&&(f++,!(a=et.call(t,l)&&C(e[l],t[l],s))))break;if(a){for(l in t)if(et.call(t,l)&&!(f--))break;a=!f}if(a&&yt)for(;7>++u&&(l=Q[u],!et.call(e,l)||!!(a=et.call
-(t,l)&&C(e[l],t[l],s))););}return s.pop(),a}function k(e){return e}function L(e){Ft(Gt(e),function(t){var r=s[t]=e[t];o.prototype[t]=function(){var e=[this._wrapped];return arguments.length&&tt.apply(e,arguments),e=r.apply(s,e),this._chain&&(e=new o(e),e._chain=n),e}})}var n=!0,r=null,i=!1,A,O,M,_,D="object"==typeof exports&&exports&&("object"==typeof global&&global&&global==global.global&&(e=global),exports),P=Array.prototype,H=Object.prototype,B=0,j=e._,F=/[-+=!~*%&^<>|{(\/]|\[\D|\b(?:delete|in|instanceof|new|typeof|void)\b/
-,I=/^';/,q=/^'\+/,R=/(?:__p\+='|\+')$/,U=/\b__p\+='';/g,z=/\b(__p\+?=)''\+/g,W=/(__w?e\(.*?\)|\b__w?t\))\+'';/g,X=/(?:__e|__t=)\(\s*(?![\d\s"']|this\.)/g,V=RegExp("^"+(H.valueOf+"").replace(/[.*+?^=!:${}()|[\]\/\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),$=/__token__(\d+)/g,J=/[&<"']/g,K=/['\n\r\t\u2028\u2029\\]/g,Q="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),G="__token__",Y=[],Z=P.concat,et=H.hasOwnProperty,tt=P.push,nt=H
-.propertyIsEnumerable,rt=P.slice,it=H.toString,st=V.test(st=rt.bind)&&st,ot=V.test(ot=Array.isArray)&&ot,ut=e.isFinite,at=V.test(at=Object.keys)&&at,ft="[object Array]",lt="[object Boolean]",ct="[object Date]",ht="[object Function]",pt="[object Number]",dt="[object RegExp]",vt="[object String]",mt=e.clearTimeout,gt=e.setTimeout,yt=!nt.call({valueOf:0},"valueOf"),bt="x"!=rt.call("x")[0],wt="xx"!="x"[0]+Object("x")[0],Et=st&&/\n|Opera/.test(st+it.call(e.opera)),St=at&&/^.+$|true/.test(at+!!e.attachEvent
-),xt={"&":"&amp;","<":"&lt;",'"':"&quot;","'":"&#x27;"},Tt={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i},Nt={"\\":"\\","'":"'","\n":"n","\r":"r","	":"t","\u2028":"u2028","\u2029":"u2029"};s.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:"obj"};var Ct={a:"f,d,H",j:"f",q:"if(!d){d=k}else if(H)d=o(d,H)",i:"d(n[l],l,f)"},kt={j:"true",i:"if(!d(n[l],l,f))return!A"},Lt={a:"t",j:"t",q:"for(var D,E=1,p=arguments.length;E<p;E++){D=arguments[E];"+
-(yt?"if(D){":""),l:"D",r:i,i:"A[l]=n[l]",e:(yt?"}":"")+"}"},At={j:"[]",i:"d(n[l],l,f)&&A.push(n[l])"},Ot={q:"if(H)d=o(d,H)"},Mt={i:{m:Ct.i}},_t={j:"",f:"if(!f)return[]",d:{b:"A=Array(p)",m:"A="+(St?"Array(p)":"[]")},i:{b:"A[l]=d(n[l],l,f)",m:"A"+(St?"[w]=":".push")+"(d(n[l],l,f))"}},Dt=u({a:"t",f:"if(!(t&&u[typeof t]))throw TypeError()",j:"[]",i:"A.push(l)"}),Pt=u({a:"f,G",j:"false",o:i,d:{b:"if(I.call(n)==F)return f.indexOf(G)>-1"},i:"if(n[l]===G)return true"}),Ht=u(Ct,kt),Bt=u(Ct,At),jt=u(Ct,Ot
-,{j:"",i:"if(d(n[l],l,f))return n[l]"}),Ft=u(Ct,Ot),It=u(Ct,{j:"{}",q:"var v,m=typeof d=='function';if(m&&H)d=o(d,H)",i:"v=m?d(n[l],l,f):n[l][d];(j.call(A,v)?A[v]:A[v]=[]).push(n[l])"}),qt=u(_t,{a:"f,q",q:"var b=C.call(arguments,2),m=typeof q=='function'",i:{b:"A[l]=(m?q:n[l][q]).apply(n[l],b)",m:"A"+(St?"[w]=":".push")+"((m?q:n[l][q]).apply(n[l],b))"}}),Rt=u(Ct,_t),Ut=u(_t,{a:"f,y",i:{b:"A[l]=n[l][y]",m:"A"+(St?"[w]=":".push")+"(n[l][y])"}}),zt=u({a:"f,d,a,H",j:"a",q:"var s=arguments.length<3;if(H)d=o(d,H)"
-,d:{b:"if(s)A=f[++l]"},i:{b:"A=d(A,n[l],l,f)",m:"A=s?(s=false,n[l]):d(A,n[l],l,f)"}}),Wt=u(Ct,At,{i:"!"+At.i}),Xt=u(Ct,kt,{j:"false",i:kt.i.replace("!","")}),Vt=u(Ct,_t,{q:"if(typeof d=='string'){var v=d;d=function(f){return f[v]}}else if(H)d=o(d,H)",i:{b:"A[l]={a:d(n[l],l,f),b:n[l]}",m:"A"+(St?"[w]=":".push")+"({a:d(n[l],l,f),b:n[l]})"},e:"A.sort(g);p=A.length;while(p--){A[p]=A[p].b}"}),$t=u(Lt,{i:"if(A[l]==null)"+Lt.i}),Jt=u(Lt),Kt=u(Ct,Ot,Mt,{r:i}),Qt=u(Ct,Ot,Mt),Gt=u({a:"t",j:"[]",r:i,i:"if(I.call(n[l])==i)A.push(l)"
-,e:"A.sort()"});Ft({Arguments:"[object Arguments]",Date:ct,Function:ht,Number:pt,RegExp:dt,String:vt},function(e,t){s["is"+t]=function(t){return it.call(t)==e}}),s.isArguments(arguments)||(s.isArguments=function(e){return!!e&&!!et.call(e,"callee")});var Yt=ot||function(e){return it.call(e)==ft},Zt=u({a:"J",j:"true",q:"var e=I.call(J);if(e==c||e==F)return!J.length",i:{m:"return false"}}),en=at?function(e){return"function"==typeof e&&nt.call(e,"prototype")?Dt(e):at(e)}:Dt,tn=u({a:"t",j:"[]",i:"A.push(n[l])"
-});s.VERSION="0.4.0",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=N,s.bindAll=function(e){var t=arguments,n=1;1==t.length&&(n=0,t=Gt(e));for(var r=t.length;n<r;n++)e[t[n]]=N(e[t[n]],e);return e},s.chain=function(e){return e=new o(e),e._chain=n,e},s.clone=function(e){return e&&Tt[typeof e]?Yt(e)?e.slice():Jt({},e):e},s.compact=function(e){var t=[];if(!e)return t;for(var n=-1,r=e.length;++n<r;)e[n]&&t.push(e[n]);return t},s.compose=function(){var e=
-arguments;return function(){for(var t=arguments,n=e.length;n--;)t=[e[n].apply(this,t)];return t[0]}},s.contains=Pt,s.debounce=function(e,t,n){function i(){a=r,n||e.apply(u,s)}var s,o,u,a;return function(){var r=n&&!a;return s=arguments,u=this,mt(a),a=gt(i,t),r&&(o=e.apply(u,s)),o}},s.defaults=$t,s.defer=function(e){var n=rt.call(arguments,1);return gt(function(){return e.apply(t,n)},1)},s.delay=function(e,n){var r=rt.call(arguments,2);return gt(function(){return e.apply(t,r)},n)},s.difference=function(
-e){var t=[];if(!e)return t;for(var n=-1,r=e.length,i=Z.apply(t,arguments);++n<r;)0>w(i,e[n],r)&&t.push(e[n]);return t},s.escape=function(e){return e==r?"":(e+"").replace(J,c)},s.every=Ht,s.extend=Jt,s.filter=Bt,s.find=jt,s.first=y,s.flatten=b,s.forEach=Ft,s.forIn=Kt,s.forOwn=Qt,s.functions=Gt,s.groupBy=It,s.has=function(e,t){return et.call(e,t)},s.identity=k,s.indexOf=w,s.initial=function(e,t,n){return e?rt.call(e,0,-(t==r||n?1:t)):[]},s.intersection=function(e){var t=[];if(!e)return t;for(var n,
-r=-1,i=e.length,s=rt.call(arguments,1);++r<i;)n=e[r],0>w(t,n)&&Ht(s,function(e){return-1<w(e,n)})&&t.push(n);return t},s.invoke=qt,s.isArray=Yt,s.isBoolean=function(e){return e===n||e===i||it.call(e)==lt},s.isElement=function(e){return!!e&&1==e.nodeType},s.isEmpty=Zt,s.isEqual=C,s.isFinite=function(e){return ut(e)&&it.call(e)==pt},s.isNaN=function(e){return it.call(e)==pt&&e!=+e},s.isNull=function(e){return e===r},s.isObject=function(e){return e&&Tt[typeof e]},s.isUndefined=function(e){return e===
-t},s.keys=en,s.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:rt.call(e,-t||i)}},s.lastIndexOf=function(e,t,n){if(!e)return-1;var r=e.length;for(n&&"number"==typeof n&&(r=(0>n?Math.max(0,r+n):Math.min(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},s.map=Rt,s.max=E,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return et.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.min=function(e,t,n){var r=Infinity,i=r;if(!e)return i;var s=-1,o=
-e.length;if(!t){for(;++s<o;)e[s]<i&&(i=e[s]);return i}for(n&&(t=h(t,n));++s<o;)n=t(e[s],s,e),n<r&&(r=n,i=e[s]);return i},s.mixin=L,s.noConflict=function(){return e._=j,this},s.once=function(e){var t,r=i;return function(){return r?t:(r=n,t=e.apply(this,arguments))}},s.partial=function(e){var t=rt.call(arguments,1),n=t.length;return function(){var r;return r=arguments,r.length&&(t.length=n,tt.apply(t,r)),r=1==t.length?e.call(this,t[0]):e.apply(this,t),t.length=n,r}},s.pick=function(e){for(var t,n=0
-,r=Z.apply(P,arguments),i=r.length,s={};++n<i;)t=r[n],t in e&&(s[t]=e[t]);return s},s.pluck=Ut,s.range=function(e,t,n){n||(n=1),t==r&&(t=e||0,e=0);for(var i=-1,t=Math.max(0,Math.ceil((t-e)/n)),s=Array(t);++i<t;)s[i]=e,e+=n;return s},s.reduce=zt,s.reduceRight=g,s.reject=Wt,s.rest=S,s.result=function(e,t){if(!e)return r;var n=e[t];return it.call(n)==ht?e[t]():n},s.shuffle=function(e){if(!e)return[];for(var t,n=-1,r=e.length,i=Array(r);++n<r;)t=Math.floor(Math.random()*(n+1)),i[n]=i[t],i[t]=e[n];return i
-},s.size=function(e){if(!e)return 0;var t=e.length;return t===t>>>0?e.length:en(e).length},s.some=Xt,s.sortBy=Vt,s.sortedIndex=x,s.tap=function(e,t){return t(e),e},s.template=function(e,t,n){n||(n={});var i,o,u,a,c;i=n.escape,o=n.evaluate,u=n.interpolate;var h=s.templateSettings,n=n.variable;i==r&&(i=h.escape),o==r&&(o=h.evaluate),u==r&&(u=h.interpolate),i&&(e=e.replace(i,d)),u&&(e=e.replace(u,m)),o!=A&&(A=o,_=RegExp((o?o.source:"($^)")+"|<e%-([\\s\\S]+?)%>|<e%=([\\s\\S]+?)%>","g")),u=Y.length,e=
-e.replace(_,v),i=Y.length-1,o=u<=i,!n&&(n=h.variable||O||"obj",c=o)&&(Y[u]="';__with("+n+"){"+Y[u].replace(I,"").replace(q,"__p+="),Y[i]=Y[i].replace(R,"")+"}____p+='"),h="$&"+n+".",e="__p='"+e.replace(K,l).replace($,f)+"';",Y.length=0,c&&(u=e.indexOf("__with"),i=e.indexOf("}__",u+10)),n!=O&&(O=n,M=RegExp("([(\\s])"+n+"\\."+n+"\\b","g")),e=(c?e.slice(0,u):e).replace(X,h).replace(M,"$1__d")+(c?e.slice(u+2,i+1)+e.slice(i+3).replace(X,h).replace(M,"$1__d"):""),e=(o?e.replace(U,""):e).replace(z,"$1")
-.replace(W,"$1;"),e="function("+n+"){"+n+"||("+n+"={});var __p,__t,__wt,__d="+n+"."+n+"||"+n+",__e=_.escape,__we=__e"+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+e+"return __p}";try{a=Function("_","return "+e)(s)}catch(p){a=function(){throw p}}return t?a(t):(a.source=e,a)},s.throttle=function(e,t){function n(){a=new Date,u=r,e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(a=r,s=e.apply(o,i)):u||(u=gt(n,f
-)),s}},s.times=function(e,t,n){var r=-1;if(n)for(;++r<e;)t.call(n,r);else for(;++r<e;)t(r)},s.toArray=function(e){if(!e)return[];if(e.toArray&&it.call(e.toArray)==ht)return e.toArray();var t=e.length;return t===t>>>0?(bt?it.call(e)==vt:"string"==typeof e)?e.split(""):rt.call(e):tn(e)},s.union=function(){for(var e=-1,t=[],n=Z.apply(t,arguments),r=n.length;++e<r;)0>w(t,n[e])&&t.push(n[e]);return t},s.uniq=T,s.uniqueId=function(e){var t=B++;return e?e+t:t},s.values=tn,s.without=function(e){var t=[];
-if(!e)return t;for(var n=-1,r=e.length;++n<r;)0>w(arguments,e[n],1)&&t.push(e[n]);return t},s.wrap=function(e,t){return function(){var n=[e];return arguments.length&&tt.apply(n,arguments),t.apply(this,n)}},s.zip=function(e){if(!e)return[];for(var t=-1,n=E(Ut(arguments,"length")),r=Array(n);++t<n;)r[t]=Ut(arguments,t);return r},s.zipObject=function(e,t){if(!e)return{};var n=-1,r=e.length,i={};for(t||(t=[]);++n<r;)i[e[n]]=t[n];return i},s.all=Ht,s.any=Xt,s.collect=Rt,s.detect=jt,s.each=Ft,s.foldl=zt
-,s.foldr=g,s.head=y,s.include=Pt,s.inject=zt,s.methods=Gt,s.select=Bt,s.tail=S,s.take=y,s.unique=T,o.prototype=s.prototype,L(s),o.prototype.chain=function(){return this._chain=n,this},o.prototype.value=function(){return this._wrapped},Ft("pop push reverse shift sort splice unshift".split(" "),function(e){var t=P[e];o.prototype[e]=function(){var e=this._wrapped;return t.apply(e,arguments),e.length===0&&delete e[0],this._chain&&(e=new o(e),e._chain=n),e}}),Ft(["concat","join","slice"],function(e){var t=
-P[e];o.prototype[e]=function(){var e=t.apply(this._wrapped,arguments);return this._chain&&(e=new o(e),e._chain=n),e}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(e._=s,define(function(){return s})):D?"object"==typeof module&&module&&module.s==D?(module.s=s)._=s:D._=s:e._=s})(this);
+;(function(e,t){function s(e){if(e&&e.__wrapped__)return e;if(!(this instanceof s))return new s(e);this.__wrapped__=e}function o(e,t,n){t||(t=0);var r=e.length,i=r-t>=(n||H),s=i?{}:e;if(i)for(n=t-1;++n<r;){var o=e[n]+"";(Z.call(s,o)?s[o]:s[o]=[]).push(e[n])}return function(e){if(i){var n=e+"";return Z.call(s,n)&&-1<T(s[n],e)}return-1<T(s,e,t)}}function u(e,n){var r=e.b,i=n.b,e=e.a,n=n.a;if(e!==n){if(e>n||e===t)return 1;if(e<n||n===t)return-1}return r<i?-1:1}function a(e,t,n){function r(){var u=arguments
+,a=s?this:t;return i||(e=t[o]),n.length&&(u=u.length?n.concat(nt.call(u)):n),this instanceof r?(p.prototype=e.prototype,a=new p,(u=e.apply(a,u))&&Ht[typeof u]?u:a):e.apply(a,u)}var i=m(e),s=!n,o=e;return s&&(n=t),r}function f(e,n){return e?"function"!=typeof e?function(t){return t[e]}:n!==t?function(t,r,i){return e.call(n,t,r,i)}:e:A}function l(){for(var e={e:"",g:Et,i:"",j:Mt,m:Tt,n:kt,o:J,p:"",q:n,r:_t,c:{d:""},l:{d:""}},t,i=-1;t=arguments[++i];)for(var s in t){var o=t[s];/d|h/.test(s)?("string"==typeof 
+o&&(o={b:o,k:o}),e.c[s]=o.b,e.l[s]=o.k):e[s]=o}t=e.a;if("d"!=(e.f=/^[^,]+/.exec(t)[0])||!e.c.h)e.c=r;i="",e.r&&(i+="'use strict';"),i+="var i,A,j="+e.f+",t="+(e.i||e.f)+";if(!"+e.f+")return t;"+e.p+";",e.c&&(i+="var k=j.length;i=-1;",e.l&&(i+="if(k===+k){"),e.n&&(i+="if(y.call(j)==w){j=j.split('')}"),i+=e.c.d+";while(++i<k){A=j[i];"+e.c.h+"}",e.l&&(i+="}"));if(e.l){e.c?i+="else {":e.m&&(i+="var k=j.length;i=-1;if(k&&O(j)){while(++i<k){A=j[i+=''];"+e.l.h+"}}else {"),e.g||(i+="var u=typeof j=='function'&&q.call(j,'prototype');"
+);if(e.j&&e.q)i+="var n=-1,o=Y[typeof j]?l(j):[],k=o.length;"+e.l.d+";while(++n<k){i=o[n];",e.g||(i+="if(!(u&&i=='prototype')){"),i+="A=j[i];"+e.l.h+"",e.g||(i+="}");else{i+=e.l.d+";for(i in j){";if(!e.g||e.q)i+="if(",e.g||(i+="!(u&&i=='prototype')"),!e.g&&e.q&&(i+="&&"),e.q&&(i+="h.call(j,i)"),i+="){";i+="A=j[i];"+e.l.h+";";if(!e.g||e.q)i+="}"}i+="}";if(e.g){i+="var g=j.constructor;";for(s=0;7>s;s++)i+="i='"+e.o[s]+"';if(","constructor"==e.o[s]&&(i+="!(g&&g.prototype===j)&&"),i+="h.call(j,i)){A=j[i];"+
+e.l.h+"}"}if(e.c||e.m)i+="}"}return i+=e.e+";return t",Function("D,E,F,I,e,f,J,h,M,O,Q,S,T,X,Y,l,q,v,w,y,z","var G=function("+t+"){"+i+"};return G")(Dt,_,L,u,Q,f,en,Z,T,v,$t,m,Jt,mt,Ht,ut,tt,nt,yt,rt)}function c(e){return"\\"+Bt[e]}function h(e){return Qt[e]}function p(){}function d(e){return Gt[e]}function v(e){return rt.call(e)==ct}function m(e){return"function"==typeof e}function g(e){var t=i;if(!e||"object"!=typeof e||v(e))return t;var n=e.constructor;return(!Lt||"function"==typeof e.toString||"string"!=typeof 
+(e+""))&&(!m(n)||n instanceof n)?xt?(en(e,function(e,n,r){return t=!Z.call(r,n),i}),t===i):(en(e,function(e,n){t=n}),t===i||Z.call(e,t)):t}function y(e,t,n,s,o){if(e==r)return e;n&&(t=i);if(n=Ht[typeof e]){var u=rt.call(e);if(!Pt[u]||Nt&&v(e))return e;var a=u==ht,n=a||(u==mt?Jt(e):n)}if(!n||!t)return n?a?nt.call(e):Zt({},e):e;n=e.constructor;switch(u){case pt:case dt:return new n(+e);case vt:case yt:return new n(e);case gt:return n(e.source,U.exec(e))}s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[
+u]==e)return o[u];var f=a?n(e.length):{};return s.push(e),o.push(f),(a?mn:tn)(e,function(e,n){f[n]=y(e,t,r,s,o)}),f}function b(e,t,s,o){if(e==r||t==r)return e===t;if(e===t)return 0!==e||1/e==1/t;if(Ht[typeof e]||Ht[typeof t])e=e.__wrapped__||e,t=t.__wrapped__||t;var u=rt.call(e);if(u!=rt.call(t))return i;switch(u){case pt:case dt:return+e==+t;case vt:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case gt:case yt:return e==t+""}var a=Dt[u];if(Nt&&!a&&(a=v(e))&&!v(t)||!a&&(u!=mt||Lt&&("function"!=typeof e.
+toString&&"string"==typeof (e+"")||"function"!=typeof t.toString&&"string"==typeof (t+""))))return i;s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u]==t;var u=-1,f=n,l=0;s.push(e),o.push(t);if(a){l=e.length;if(f=l==t.length)for(;l--&&(f=b(e[l],t[l],s,o)););return f}a=e.constructor,f=t.constructor;if(a!=f&&(!m(a)||!(a instanceof a&&m(f)&&f instanceof f)))return i;for(var c in e)if(Z.call(e,c)&&(l++,!Z.call(t,c)||!b(e[c],t[c],s,o)))return i;for(c in t)if(Z.call(t,c)&&!(l--))return i;if(
+Et)for(;7>++u;)if(c=J[u],Z.call(e,c)&&(!Z.call(t,c)||!b(e[c],t[c],s,o)))return i;return n}function w(e,t,n){var r=-Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=f(t,n),mn(e,function(e,n,i){n=t(e,n,i),n>r&&(r=n,o=e)});else for(;++i<s;)e[i]>o&&(o=e[i]);return o}function E(e,t,n,r){var s=e,o=e?e.length:0,u=3>arguments.length;if(o!==+o)var a=sn(e),o=a.length;else kt&&rt.call(e)==yt&&(s=e.split(""));return mn(e,function(e,f,l){f=a?a[--o]:--o,n=u?(u=i,s[f]):t.call(r,n,s[f],f,l)}),n}function S(e,t,n){
+if(e)return t==r||n?e[0]:nt.call(e,0,t)}function x(e,t){for(var n=-1,r=e?e.length:0,i=[];++n<r;){var s=e[n];$t(s)?et.apply(i,t?s:x(s)):i.push(s)}return i}function T(e,t,n){var r=-1,i=e?e.length:0;if("number"==typeof n)r=(0>n?at(0,i+n):n||0)-1;else if(n)return r=C(e,t),e[r]===t?r:-1;for(;++r<i;)if(e[r]===t)return r;return-1}function N(e,t,n){return e?nt.call(e,t==r||n?1:t):[]}function C(e,t,n,r){var i=0,s=e?e.length:i;if(n){n=f(n,r);for(t=n(t);i<s;)r=i+s>>>1,n(e[r])<t?i=r+1:s=r}else for(;i<s;)r=i+
+s>>>1,e[r]<t?i=r+1:s=r;return i}function k(e,t,n,r){var s=-1,o=e?e.length:0,u=[],a=[];"function"==typeof t&&(r=n,n=t,t=i);for(n=f(n,r);++s<o;)if(r=n(e[s],s,e),t?!s||a[a.length-1]!==r:0>T(a,r))a.push(r),u.push(e[s]);return u}function L(e,t){return Ot||it&&2<arguments.length?it.call.apply(it,arguments):a(e,t,nt.call(arguments,2))}function A(e){return e}function O(e){mn(nn(e),function(t){var r=s[t]=e[t];s.prototype[t]=function(){var e=[this.__wrapped__];return arguments.length&&et.apply(e,arguments)
+,e=r.apply(s,e),this.__chain__&&(e=new s(e),e.__chain__=n),e}})}var n=!0,r=null,i=!1,M="object"==typeof exports&&exports&&("object"==typeof global&&global&&global==global.global&&(e=global),exports),_=Array.prototype,D=Object.prototype,P=0,H=30,B=e._,j=/[-?+=!~*%&^<>|{(\/]|\[\D|\b(?:delete|in|instanceof|new|typeof|void)\b/,F=/&(?:amp|lt|gt|quot|#x27);/g,I=/\b__p\+='';/g,q=/\b(__p\+=)''\+/g,R=/(__e\(.*?\)|\b__t\))\+'';/g,U=/\w*$/,z=/(?:__e|__t=)\(\s*(?![\d\s"']|this\.)/g,W=RegExp("^"+(D.valueOf+""
+).replace(/[.*+?^=!:${}()|[\]\/\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),X=/($^)/,V=/[&<>"']/g,$=/['\n\r\t\u2028\u2029\\]/g,J="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),K=Math.ceil,Q=_.concat,G=Math.floor,Y=W.test(Y=Object.getPrototypeOf)&&Y,Z=D.hasOwnProperty,et=_.push,tt=D.propertyIsEnumerable,nt=_.slice,rt=D.toString,it=W.test(it=nt.bind)&&it,st=W.test(st=Array.isArray)&&st,ot=e.isFinite,ut=W.test(ut=Object.keys)&&ut
+,at=Math.max,ft=Math.min,lt=Math.random,ct="[object Arguments]",ht="[object Array]",pt="[object Boolean]",dt="[object Date]",vt="[object Number]",mt="[object Object]",gt="[object RegExp]",yt="[object String]",bt=e.clearTimeout,wt=e.setTimeout,Et,St,xt,Tt=n;(function(){function e(){this.x=1}var t={0:1,length:1},n=[];e.prototype={valueOf:1,y:1};for(var r in new e)n.push(r);for(r in arguments)Tt=!r;Et=4>(n+"").length,xt="x"!=n[0],St=(n.splice.call(t,0,1),t[0])})(1);var Nt=!v(arguments),Ct="x"!=nt.call("x"
+)[0],kt="xx"!="x"[0]+Object("x")[0];try{var Lt=("[object Object]",rt.call(e.document||0)==mt)}catch(At){}var Ot=it&&/\n|Opera/.test(it+rt.call(e.opera)),Mt=ut&&/^.+$|true/.test(ut+!!e.attachEvent),_t=!Ot,Dt={};Dt[pt]=Dt[dt]=Dt["[object Function]"]=Dt[vt]=Dt[mt]=Dt[gt]=i,Dt[ct]=Dt[ht]=Dt[yt]=n;var Pt={};Pt[ct]=Pt["[object Function]"]=i,Pt[ht]=Pt[pt]=Pt[dt]=Pt[vt]=Pt[mt]=Pt[gt]=Pt[yt]=n;var Ht={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i,unknown:n},Bt={"\\":"\\","'":"'","\n":"n"
+,"\r":"r","	":"t","\u2028":"u2028","\u2029":"u2029"};s.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""};var jt={a:"d,c,x",p:"c=f(c,x)",h:"if(c(A,i,d)===false)return t"},Ft={i:"{}",p:"c=f(c,x)",h:"var p=c(A,i,d);(h.call(t,p)?t[p]++:t[p]=1)"},It={i:"true",h:"if(!c(A,i,d))return!t"},qt={q:i,r:i,a:"m",p:"for(var a=1,b=arguments.length;a<b;a++){if(j=arguments[a]){",h:"t[i]=A",e:"}}"},Rt={i:"[]",h:"c(A,i,d)&&t.push(A)"},Ut={p:"c=f(c,x)"}
+,zt={h:{k:jt.h}},Wt={i:"d||[]",d:{b:"t=Array(k)",k:"t="+(Mt?"Array(k)":"[]")},h:{b:"t[i]=c(A,i,d)",k:"t"+(Mt?"[n]=":".push")+"(c(A,i,d))"}},Xt={q:i,a:"m,c,x",i:"{}",p:"var R=typeof c=='function';if(R)c=f(c,x);else var s=e.apply(E,arguments)",h:"if(R?!c(A,i,m):M(s,i)<0)t[i]=A"},Vt=l({a:"m",i:"{}",h:"t[A]=i"});Nt&&(v=function(e){return e?Z.call(e,"callee"):i});var $t=st||function(e){return rt.call(e)==ht};m(/x/)&&(m=function(e){return"[object Function]"==rt.call(e)});var Jt=Y?function(e){if(!e||"object"!=typeof 
+e)return i;var t=e.valueOf,n="function"==typeof t&&(n=Y(t))&&Y(n);return n?e==n||Y(e)==n&&!v(e):g(e)}:g,Kt=l({a:"m",i:"[]",h:"t.push(i)"}),Qt={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},Gt=Vt(Qt),Yt=l(qt,{h:"if(t[i]==null)"+qt.h}),Zt=l(qt),en=l(jt,Ut,zt,{q:i}),tn=l(jt,Ut,zt),nn=l({q:i,a:"m",i:"[]",h:"S(A)&&t.push(i)",e:"t.sort()"}),rn=l({a:"A",i:"true",p:"var H=y.call(A),k=A.length;if(D[H]"+(Nt?"||O(A)":"")+"||(H==X&&k===+k&&S(A.splice)))return!k",h:{k:"return false"}}),sn=ut?function(
+e){var t=typeof e;return"function"==t&&tt.call(e,"prototype")?Kt(e):e&&Ht[t]?ut(e):[]}:Kt,on=l(qt,{a:"m,dd,N",p:"var P,C=arguments,a=0;if(N==I){var b=2,ee=C[3],ff=C[4]}else var b=C.length,ee=[],ff=[];while(++a<b){if(j=C[a]){",h:"if((dd=A)&&((P=Q(dd))||T(dd))){var K=false,gg=ee.length;while(gg--)if(K=ee[gg]==dd)break;if(K){t[i]=ff[gg]}else {ee.push(dd);ff.push(A=(A=t[i],P)?(Q(A)?A:[]):(T(A)?A:{}));t[i]=G(A,dd,I,ee,ff)}}else if(dd!=null)t[i]=dd"}),un=l(Xt),an=l({a:"m",i:"[]",h:"t"+(Mt?"[n]=":".push"
+)+"([i,A])"}),fn=l(Xt,{p:"if(typeof c!='function'){var i=0,s=e.apply(E,arguments),k=s.length;while(++i<k){var p=s[i];if(p in m)t[p]=m[p]}}else {c=f(c,x)",h:"if(c(A,i,m))t[i]=A",e:"}"}),ln=l({a:"m",i:"[]",h:"t.push(A)"}),cn=l({a:"d,hh",i:"false",n:i,d:{b:"if(y.call(d)==w)return d.indexOf(hh)>-1"},h:"if(A===hh)return true"}),hn=l(jt,Ft),pn=l(jt,It),dn=l(jt,Rt),vn=l(jt,Ut,{i:"z",h:"if(c(A,i,d))return A"}),mn=l(jt,Ut),gn=l(jt,Ft,{h:"var p=c(A,i,d);(h.call(t,p)?t[p]:t[p]=[]).push(A)"}),yn=l(Wt,{a:"d,U"
+,p:"var C=v.call(arguments,2),R=typeof U=='function'",h:{b:"t[i]=(R?U:A[U]).apply(A,C)",k:"t"+(Mt?"[n]=":".push")+"((R?U:A[U]).apply(A,C))"}}),bn=l(jt,Wt),wn=l(Wt,{a:"d,bb",h:{b:"t[i]=A[bb]",k:"t"+(Mt?"[n]=":".push")+"(A[bb])"}}),En=l({a:"d,c,B,x",i:"B",p:"var V=arguments.length<3;c=f(c,x)",d:{b:"if(V)t=j[++i]"},h:{b:"t=c(t,A,i,d)",k:"t=V?(V=false,A):c(t,A,i,d)"}}),Sn=l(jt,Rt,{h:"!"+Rt.h}),xn=l(jt,It,{i:"false",h:It.h.replace("!","")}),Tn=l(jt,Ft,Wt,{h:{b:"t[i]={a:c(A,i,d),b:i,c:A}",k:"t"+(Mt?"[n]="
+:".push")+"({a:c(A,i,d),b:i,c:A})"},e:"t.sort(I);k=t.length;while(k--)t[k]=t[k].c"}),Nn=l(Rt,{a:"d,aa",p:"var s=[];J(aa,function(A,p){s.push(p)});var cc=s.length",h:"for(var Z=true,r=0;r<cc;r++){var p=s[r];if(!(Z=A[p]===aa[p]))break}Z&&t.push(A)"}),Cn=l({q:i,r:i,a:"m",p:"var L=arguments,i=0,k=L.length;if(k>1){while(++i<k)t[L[i]]=F(t[L[i]],t);return t}",h:"if(S(A))t[i]=F(A,t)"});s.VERSION="0.8.2",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=L,s.bindAll=
+Cn,s.chain=function(e){return e=new s(e),e.__chain__=n,e},s.clone=y,s.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++t<n;){var i=e[t];i&&r.push(i)}return r},s.compose=function(){var e=arguments;return function(){for(var t=arguments,n=e.length;n--;)t=[e[n].apply(this,t)];return t[0]}},s.contains=cn,s.countBy=hn,s.debounce=function(e,t,n){function i(){a=r,n||(o=e.apply(u,s))}var s,o,u,a;return function(){var r=n&&!a;return s=arguments,u=this,bt(a),a=wt(i,t),r&&(o=e.apply(u,s)),o}},s.defaults=
+Yt,s.defer=function(e){var n=nt.call(arguments,1);return wt(function(){return e.apply(t,n)},1)},s.delay=function(e,n){var r=nt.call(arguments,2);return wt(function(){return e.apply(t,r)},n)},s.difference=function(e){var t=[];if(!e)return t;for(var n=-1,r=e.length,i=Q.apply(_,arguments),i=o(i,r);++n<r;){var s=e[n];i(s)||t.push(s)}return t},s.escape=function(e){return e==r?"":(e+"").replace(V,h)},s.every=pn,s.extend=Zt,s.filter=dn,s.find=vn,s.first=S,s.flatten=x,s.forEach=mn,s.forIn=en,s.forOwn=tn,
+s.functions=nn,s.groupBy=gn,s.has=function(e,t){return e?Z.call(e,t):i},s.identity=A,s.indexOf=T,s.initial=function(e,t,n){return e?nt.call(e,0,-(t==r||n?1:t)):[]},s.intersection=function(e){var t=arguments.length,n=[],r=-1,i=e?e.length:0,s=[];e:for(;++r<i;){var u=e[r];if(0>T(s,u)){for(var a=1;a<t;a++)if(!(n[a]||(n[a]=o(arguments[a])))(u))continue e;s.push(u)}}return s},s.invert=Vt,s.invoke=yn,s.isArguments=v,s.isArray=$t,s.isBoolean=function(e){return e===n||e===i||rt.call(e)==pt},s.isDate=function(
+e){return rt.call(e)==dt},s.isElement=function(e){return e?1===e.nodeType:i},s.isEmpty=rn,s.isEqual=b,s.isFinite=function(e){return ot(e)&&rt.call(e)==vt},s.isFunction=m,s.isNaN=function(e){return rt.call(e)==vt&&e!=+e},s.isNull=function(e){return e===r},s.isNumber=function(e){return rt.call(e)==vt},s.isObject=function(e){return e?Ht[typeof e]:i},s.isPlainObject=Jt,s.isRegExp=function(e){return rt.call(e)==gt},s.isString=function(e){return rt.call(e)==yt},s.isUndefined=function(e){return e===t},s
+.keys=sn,s.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:nt.call(e,-t||i)}},s.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?at(0,r+n):ft(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},s.lateBind=function(e,t){return a(t,e,nt.call(arguments,2))},s.map=bn,s.max=w,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return Z.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=on,s.min=function(e,t,n){var r=
+Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=f(t,n),mn(e,function(e,n,i){n=t(e,n,i),n<r&&(r=n,o=e)});else for(;++i<s;)e[i]<o&&(o=e[i]);return o},s.mixin=O,s.noConflict=function(){return e._=B,this},s.object=function(e,t){for(var n=-1,r=e?e.length:0,i={};++n<r;){var s=e[n];t?i[s]=t[n]:i[s[0]]=s[1]}return i},s.omit=un,s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},s.pairs=an,s.partial=function(e){return a(e,nt.call(arguments,1))},s.pick=fn,s.pluck=
+wn,s.random=function(e,t){return e==r&&t==r&&(t=1),e=+e||0,t==r&&(t=e,e=0),e+G(lt()*((+t||0)-e+1))},s.range=function(e,t,n){e=+e||0,n=+n||1,t==r&&(t=e,e=0);for(var i=-1,t=at(0,K((t-e)/n)),s=Array(t);++i<t;)s[i]=e,e+=n;return s},s.reduce=En,s.reduceRight=E,s.reject=Sn,s.rest=N,s.result=function(e,t){var n=e?e[t]:r;return m(n)?e[t]():n},s.shuffle=function(e){var t=-1,n=Array(e?e.length:0);return mn(e,function(e){var r=G(lt()*(++t+1));n[t]=n[r],n[r]=e}),n},s.size=function(e){var t=e?e.length:0;return t===+
+t?t:sn(e).length},s.some=xn,s.sortBy=Tn,s.sortedIndex=C,s.tap=function(e,t){return t(e),e},s.template=function(e,t,n){e||(e=""),n||(n={});var r,i,o=0,u=s.templateSettings,a="__p += '",f=n.variable||u.variable,l=f;e.replace(RegExp((n.escape||u.escape||X).source+"|"+(n.interpolate||u.interpolate||X).source+"|"+(n.evaluate||u.evaluate||X).source+"|$","g"),function(t,n,i,s,u){a+=e.slice(o,u).replace($,c),a+=n?"'+__e("+n+")+'":s?"';"+s+";__p+='":i?"'+((__t=("+i+"))==null?'':__t)+'":"",r||(r=s||j.test(
+n||i)),o=u+t.length}),a+="';",l||(f="obj",r?a="with("+f+"){"+a+"}":(n=RegExp("(\\(\\s*)"+f+"\\."+f+"\\b","g"),a=a.replace(z,"$&"+f+".").replace(n,"$1__d"))),a=(r?a.replace(I,""):a).replace(q,"$1").replace(R,"$1;"),a="function("+f+"){"+(l?"":f+"||("+f+"={});")+"var __t,__p='',__e=_.escape"+(r?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":(l?"":",__d="+f+"."+f+"||"+f)+";")+a+"return __p}";try{i=Function("_","return "+a)(s)}catch(h){throw h.source=a,h}return t?i(t):(i.source=
+a,i)},s.throttle=function(e,t){function n(){a=new Date,u=r,s=e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(bt(u),a=r,s=e.apply(o,i)):u||(u=wt(n,f)),s}},s.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++r<e;)i[r]=t.call(n,r);return i},s.toArray=function(e){if(!e)return[];var t=e.length;return t===+t?(Ct?rt.call(e)==yt:"string"==typeof e)?e.split(""):nt.call(e):ln(e)},s.unescape=function(e){return e==r?"":(e+"").replace(F,d)},s.union=
+function(){for(var e=-1,t=Q.apply(_,arguments),n=t.length,r=[];++e<n;){var i=t[e];0>T(r,i)&&r.push(i)}return r},s.uniq=k,s.uniqueId=function(e){var t=P++;return e?e+t:t},s.values=ln,s.where=Nn,s.without=function(e){for(var t=-1,n=e?e.length:0,r=o(arguments,1,20),i=[];++t<n;){var s=e[t];r(s)||i.push(s)}return i},s.wrap=function(e,t){return function(){var n=[e];return arguments.length&&et.apply(n,arguments),t.apply(this,n)}},s.zip=function(e){for(var t=-1,n=e?w(wn(arguments,"length")):0,r=Array(n);++
+t<n;)r[t]=wn(arguments,t);return r},s.all=pn,s.any=xn,s.collect=bn,s.detect=vn,s.drop=N,s.each=mn,s.foldl=En,s.foldr=E,s.head=S,s.include=cn,s.inject=En,s.methods=nn,s.select=dn,s.tail=N,s.take=S,s.unique=k,O(s),s.prototype.chain=function(){return this.__chain__=n,this},s.prototype.value=function(){return this.__wrapped__},mn("pop push reverse shift sort splice unshift".split(" "),function(e){var t=_[e];s.prototype[e]=function(){var e=this.__wrapped__;return t.apply(e,arguments),St&&e.length===0&&delete 
+e[0],this.__chain__&&(e=new s(e),e.__chain__=n),e}}),mn(["concat","join","slice"],function(e){var t=_[e];s.prototype[e]=function(){var e=t.apply(this.__wrapped__,arguments);return this.__chain__&&(e=new s(e),e.__chain__=n),e}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(e._=s,define(function(){return s})):M?"object"==typeof module&&module&&module.exports==M?(module.exports=s)._=s:M._=s:e._=s})(this);

lodash.underscore.min.js

@@ -0,0 +1,36 @@
+/*!
+ Lo-Dash 0.8.2 lodash.com/license
+ Underscore.js 1.4.2 underscorejs.org/LICENSE
+*/
+;(function(e,t){function s(e,t,r){var s;if(!e)return i;var t=x(t,r),o=e.length,r=-1;if(o===+o){for(;++r<o;)if(s=e[r],t(s,r,e))return n}else for(r in e)if(it.call(e,r)&&(s=e[r],t(s,r,e)))return n;return i}function o(e,t,n,r){var s,o,u=n;if(!e)return u;var a=3>arguments.length,t=x(t,r),f=e.length;s=-1;if(f===+f)for(a&&(u=e[++s]);++s<f;)o=e[s],u=t(u,o,s,e);else for(s in e)it.call(e,s)&&(o=e[s],u=a?(a=i,o):t(u,o,s,e));return u}function u(e,t){var n,r,i=e||[];if(!e)return i;var s=e.length;n=-1;if(s===+
+s)for(i=Array(s);++n<s;)r=e[n],i[n]=r[t];else for(n in i=[],e)it.call(e,n)&&(r=e[n],i.push(r[t]));return i}function a(e,t,n){var r,i=e||[];if(!e)return i;var t=x(t,n),s=e.length,n=-1;if(s===+s)for(i=Array(s);++n<s;)r=e[n],i[n]=t(r,n,e);else for(n in i=[],e)it.call(e,n)&&(r=e[n],i.push(t(r,n,e)));return i}function f(e,t,n){var r;if(!e)return e;var t=x(t,n),i=e.length,n=-1;if(i===+i)for(;++n<i;)r=e[n],t(r,n,e);else for(n in e)it.call(e,n)&&(r=e[n],t(r,n,e));return e}function l(e,n,r){var i,s=t;if(!
+e)return s;var n=x(n,r),o=e.length,r=-1;if(o===+o){for(;++r<o;)if(i=e[r],n(i,r,e))return i}else for(r in e)if(it.call(e,r)&&(i=e[r],n(i,r,e)))return i;return s}function c(e,t,n){var r,i=[];if(!e)return i;var t=x(t,n),s=e.length,n=-1;if(s===+s)for(;++n<s;)r=e[n],t(r,n,e)&&i.push(r);else for(n in e)it.call(e,n)&&(r=e[n],t(r,n,e)&&i.push(r));return i}function h(e,t,r){var s;if(!e)return n;var t=x(t,r),o=e.length,r=-1;if(o===+o){for(;++r<o;)if(s=e[r],!t(s,r,e))return i}else for(r in e)if(it.call(e,r)&&
+(s=e[r],!t(s,r,e)))return i;return n}function p(e,t){var r,s;if(!e)return i;var o=e.length;r=-1;if(o===+o){if(ut.call(e)==wt)return-1<e.indexOf(t);for(;++r<o;)if(s=e[r],s===t)return n}else for(r in e)if(it.call(e,r)&&(s=e[r],s===t))return n;return i}function d(e){var t,n,r=[];if(!e)return r;for(t in e)it.call(e,t)&&(n=e[t],r.push(n));return r}function v(e){var t,n,r=[];if(!e)return r;for(t in e)n=e[t],L(n)&&r.push(t);return r.sort(),r}function m(e,t,n){var r;if(!e)return e;t=x(t,n);for(r in e)n=e
+[r],t(n,r,e);return e}function g(e){var t,n,r=e;if(!e)return e;for(var i=1,s=arguments.length;i<s;i++)if(r=arguments[i])for(t in r)n=r[t],e[t]=n;return e}function y(e){var t,n=[];if(!e)return n;for(t in e)it.call(e,t)&&n.push(t);return n}function b(e){var t,n,r={};if(!e)return r;for(t in e)it.call(e,t)&&(n=e[t],r[n]=t);return r}function w(e){if(e&&e.__wrapped__)return e;if(!(this instanceof w))return new w(e);this.__wrapped__=e}function E(e,n){var r=e.b,i=n.b,e=e.a,n=n.a;if(e!==n){if(e>n||e===t)return 1
+;if(e<n||n===t)return-1}return r<i?-1:1}function S(e,t,n){function r(){var i=arguments,s=t;return n.length&&(i=i.length?n.concat(ot.call(i)):n),this instanceof r?(C.prototype=e.prototype,s=new C,(i=e.apply(s,i))&&Tt[typeof i]?i:s):e.apply(s,i)}return r}function x(e,n){return e?"function"!=typeof e?function(t){return t[e]}:n!==t?function(t,r,i){return e.call(n,t,r,i)}:e:q}function T(e){return"\\"+Nt[e]}function N(e){return kt[e]}function C(){}function k(e){return Lt[e]}function L(e){return"function"==typeof 
+e}function A(e){var t=i;if(!e||"object"!=typeof e||isArguments(e))return t;var n=e.constructor;return!L(n)||n instanceof n?(m(e,function(e,n){t=n}),t===i||it.call(e,t)):t}function O(e,t,s,o){if(e==r||t==r)return e===t;if(e===t)return 0!==e||1/e==1/t;if(Tt[typeof e]||Tt[typeof t])e=e.__wrapped__||e,t=t.__wrapped__||t;var u=ut.call(e);if(u!=ut.call(t))return i;switch(u){case vt:case mt:return+e==+t;case gt:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case bt:case wt:return e==t+""}var a=Ct(e);if(!a&&u!=yt
+)return i;s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u]==t;var f=n,u=0;s.push(e),o.push(t);if(a){u=e.length;if(f=u==t.length)for(;u--&&(f=O(e[u],t[u],s,o)););return f}a=e.constructor,f=t.constructor;if(a!=f&&(!L(a)||!(a instanceof a&&L(f)&&f instanceof f)))return i;for(var l in e)if(it.call(e,l)&&(u++,!it.call(t,l)||!O(e[l],t[l],s,o)))return i;for(l in t)if(it.call(t,l)&&!(u--))return i;return n}function M(e,t,n){var r=-Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=x(t,n),f(e,function(
+e,n,i){n=t(e,n,i),n>r&&(r=n,o=e)});else for(;++i<s;)e[i]>o&&(o=e[i]);return o}function _(e,t,n,r){var s=e?e.length:0,o=3>arguments.length;if(s!==+s)var u=At(e),s=u.length;return f(e,function(a,f,l){f=u?u[--s]:--s,n=o?(o=i,e[f]):t.call(r,n,e[f],f,l)}),n}function D(e,t,n){if(e)return t==r||n?e[0]:ot.call(e,0,t)}function P(e,t){for(var n=-1,r=e?e.length:0,i=[];++n<r;){var s=e[n];Ct(s)?st.apply(i,t?s:P(s)):i.push(s)}return i}function H(e,t,n){var r=-1,i=e?e.length:0;if("number"==typeof n)r=(0>n?ht(0,
+i+n):n||0)-1;else if(n)return r=j(e,t),e[r]===t?r:-1;for(;++r<i;)if(e[r]===t)return r;return-1}function B(e,t,n){return e?ot.call(e,t==r||n?1:t):[]}function j(e,t,n,r){var i=0,s=e?e.length:i;if(n){n=x(n,r);for(t=n(t);i<s;)r=i+s>>>1,n(e[r])<t?i=r+1:s=r}else for(;i<s;)r=i+s>>>1,e[r]<t?i=r+1:s=r;return i}function F(e,t,n,r){var s=-1,o=e?e.length:0,u=[],a=[];"function"==typeof t&&(r=n,n=t,t=i);for(n=x(n,r);++s<o;)if(r=n(e[s],s,e),t?!s||a[a.length-1]!==r:0>H(a,r))a.push(r),u.push(e[s]);return u}function I
+(e,t){return xt||at&&2<arguments.length?at.call.apply(at,arguments):S(e,t,ot.call(arguments,2))}function q(e){return e}function R(e){f(v(e),function(t){var r=w[t]=e[t];w.prototype[t]=function(){var e=[this.__wrapped__];return arguments.length&&st.apply(e,arguments),e=r.apply(w,e),this.__chain__&&(e=new w(e),e.__chain__=n),e}})}var n=!0,r=null,i=!1,U="object"==typeof exports&&exports&&("object"==typeof global&&global&&global==global.global&&(e=global),exports),z=Array.prototype,W=Object.prototype,
+X=0,V=e._,$=/[-?+=!~*%&^<>|{(\/]|\[\D|\b(?:delete|in|instanceof|new|typeof|void)\b/,J=/&(?:amp|lt|gt|quot|#x27);/g,K=/(?:__e|__t=)\(\s*(?![\d\s"']|this\.)/g,Q=RegExp("^"+(W.valueOf+"").replace(/[.*+?^=!:${}()|[\]\/\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),G=/($^)/,Y=/[&<>"']/g,Z=/['\n\r\t\u2028\u2029\\]/g,et=Math.ceil,tt=z.concat,nt=Math.floor,rt=Q.test(rt=Object.getPrototypeOf)&&rt,it=W.hasOwnProperty,st=z.push,ot=z.slice,ut=W.toString,at=Q.test(at=ot.bind)&&at,ft=Q.test(ft=Array.isArray
+)&&ft,lt=e.isFinite,ct=Q.test(ct=Object.keys)&&ct,ht=Math.max,pt=Math.min,dt=Math.random,vt="[object Boolean]",mt="[object Date]",gt="[object Number]",yt="[object Object]",bt="[object RegExp]",wt="[object String]",Et=e.clearTimeout,St=e.setTimeout,xt=at&&/\n|Opera/.test(at+ut.call(e.opera)),Tt={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i,unknown:n},Nt={"\\":"\\","'":"'","\n":"n","\r":"r","	":"t","\u2028":"u2028","\u2029":"u2029"};w.templateSettings={escape:/<%-([\s\S]+?)%>/g
+,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},w.isArguments=function(e){return"[object Arguments]"==ut.call(e)},w.isArguments(arguments)||(w.isArguments=function(e){return e?it.call(e,"callee"):i});var Ct=ft||function(e){return"[object Array]"==ut.call(e)};L(/x/)&&(L=function(e){return"[object Function]"==ut.call(e)});var W=rt?function(e){if(!e||"object"!=typeof e)return i;var t=e.valueOf,n="function"==typeof t&&(n=rt(t))&&rt(n);return n?e==n||rt(e)==n&&!isArguments(e):A
+(e)}:A,kt={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},Lt=b(kt),At=ct?function(e){return e&&Tt[typeof e]?ct(e):[]}:y;w.VERSION="0.8.2",w.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},w.bind=I,w.bindAll=function(e){var t,n,r=e,i=e;if(!e)return i;n=arguments,t=0;var s=n.length;if(1<s){for(;++t<s;)i[n[t]]=I(i[n[t]],i);return i}for(t in r)n=r[t],L(n)&&(i[t]=I(n,i));return i},w.chain=function(e){return e=new w(e),e.__chain__=n,e},w.clone=function(
+e){return e&&Tt[typeof e]?Ct(e)?ot.call(e):g({},e):e},w.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++t<n;){var i=e[t];i&&r.push(i)}return r},w.compose=function(){var e=arguments;return function(){for(var t=arguments,n=e.length;n--;)t=[e[n].apply(this,t)];return t[0]}},w.contains=p,w.countBy=function(e,t,n){var r,i={};if(!e)return i;var t=x(t,n),s=e.length,n=-1;if(s===+s)for(;++n<s;)r=e[n],r=t(r,n,e),it.call(i,r)?i[r]++:i[r]=1;else for(n in e)it.call(e,n)&&(r=e[n],r=t(r,n,e),it.call(i,r)?
+i[r]++:i[r]=1);return i},w.debounce=function(e,t,n){function i(){a=r,n||(o=e.apply(u,s))}var s,o,u,a;return function(){var r=n&&!a;return s=arguments,u=this,Et(a),a=St(i,t),r&&(o=e.apply(u,s)),o}},w.defaults=function(e){var t,n,i=e;if(!e)return e;for(var s=1,o=arguments.length;s<o;s++)if(i=arguments[s])for(t in i)n=i[t],e[t]==r&&(e[t]=n);return e},w.defer=function(e){var n=ot.call(arguments,1);return St(function(){return e.apply(t,n)},1)},w.delay=function(e,n){var r=ot.call(arguments,2);return St
+(function(){return e.apply(t,r)},n)},w.difference=function(e){for(var t=-1,n=e.length,r=tt.apply(z,arguments),i=[];++t<n;){var s=e[t];0>H(r,s,n)&&i.push(s)}return i},w.escape=function(e){return e==r?"":(e+"").replace(Y,N)},w.every=h,w.extend=g,w.filter=c,w.find=l,w.first=D,w.flatten=P,w.forEach=f,w.forIn=m,w.forOwn=function(e,t,n){var r;if(!e)return e;t=x(t,n);for(r in e)it.call(e,r)&&(n=e[r],t(n,r,e));return e},w.functions=v,w.groupBy=function(e,t,n){var r,i={};if(!e)return i;var t=x(t,n),s=e.length
+,n=-1;if(s===+s)for(;++n<s;){r=e[n];var o=t(r,n,e);(it.call(i,o)?i[o]:i[o]=[]).push(r)}else for(n in e)it.call(e,n)&&(r=e[n],o=t(r,n,e),(it.call(i,o)?i[o]:i[o]=[]).push(r));return i},w.has=function(e,t){return e?it.call(e,t):i},w.identity=q,w.indexOf=H,w.initial=function(e,t,n){return e?ot.call(e,0,-(t==r||n?1:t)):[]},w.intersection=function(e){var t=arguments.length,n=-1,r=e.length,i=[];e:for(;++n<r;){var s=e[n];if(0>H(i,s)){for(var o=1;o<t;o++)if(0>H(arguments[o],s))continue e;i.push(s)}}return i
+},w.invert=b,w.invoke=function(e,t){var n,r,i=e,s=e||[];if(!e)return s;var o=ot.call(arguments,2),u="function"==typeof t,a=i.length;n=-1;if(a===+a)for(s=Array(a);++n<a;)r=i[n],s[n]=(u?t:r[t]).apply(r,o);else for(n in s=[],i)it.call(i,n)&&(r=i[n],s.push((u?t:r[t]).apply(r,o)));return s},w.isArray=Ct,w.isBoolean=function(e){return e===n||e===i||ut.call(e)==vt},w.isDate=function(e){return ut.call(e)==mt},w.isElement=function(e){return e?1===e.nodeType:i},w.isEmpty=function(e){var t;if(!e)return n;var r=
+ut.call(e),s=e.length;if(Ct(e)||r==wt||r==yt&&s===+s&&L(e.splice))return!s;for(t in e)if(it.call(e,t))return i;return n},w.isEqual=O,w.isFinite=function(e){return lt(e)&&ut.call(e)==gt},w.isFunction=L,w.isNaN=function(e){return ut.call(e)==gt&&e!=+e},w.isNull=function(e){return e===r},w.isNumber=function(e){return ut.call(e)==gt},w.isObject=function(e){return e?Tt[typeof e]:i},w.isPlainObject=W,w.isRegExp=function(e){return ut.call(e)==bt},w.isString=function(e){return ut.call(e)==wt},w.isUndefined=
+function(e){return e===t},w.keys=At,w.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:ot.call(e,-t||i)}},w.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?ht(0,r+n):pt(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},w.map=a,w.max=M,w.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return it.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},w.min=function(e,t,n){var r=Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+
+s)t=x(t,n),f(e,function(e,n,i){n=t(e,n,i),n<r&&(r=n,o=e)});else for(;++i<s;)e[i]<o&&(o=e[i]);return o},w.mixin=R,w.noConflict=function(){return e._=V,this},w.object=function(e,t){for(var n=-1,r=e?e.length:0,i={};++n<r;){var s=e[n];t?i[s]=t[n]:i[s[0]]=s[1]}return i},w.omit=function(e,t,n){var r,i,s=e,o={};if(!e)return o;var u="function"==typeof t;if(u)t=x(t,n);else var a=tt.apply(z,arguments);for(r in s)if(i=s[r],u?!t(i,r,e):0>H(a,r))o[r]=i;return o},w.once=function(e){var t,s=i;return function(){
+return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},w.pairs=function(e){var t,n,r=[];if(!e)return r;for(t in e)it.call(e,t)&&(n=e[t],r.push([t,n]));return r},w.pick=function(e,t,n){var r,i,s=e,o={};if(!e)return o;if("function"!=typeof t){r=0,i=tt.apply(z,arguments);for(s=i.length;++r<s;){var u=i[r];u in e&&(o[u]=e[u])}}else for(r in t=x(t,n),s)i=s[r],t(i,r,e)&&(o[r]=i);return o},w.pluck=u,w.random=function(e,t){return e==r&&t==r&&(t=1),e=+e||0,t==r&&(t=e,e=0),e+nt(dt()*((+t||0)-e+1))},w.range=function(
+e,t,n){e=+e||0,n=+n||1,t==r&&(t=e,e=0);for(var i=-1,t=ht(0,et((t-e)/n)),s=Array(t);++i<t;)s[i]=e,e+=n;return s},w.reduce=o,w.reduceRight=_,w.reject=function(e,t,n){var r,i=[];if(!e)return i;var t=x(t,n),s=e.length,n=-1;if(s===+s)for(;++n<s;)r=e[n],!t(r,n,e)&&i.push(r);else for(n in e)it.call(e,n)&&(r=e[n],!t(r,n,e)&&i.push(r));return i},w.rest=B,w.result=function(e,t){var n=e?e[t]:r;return L(n)?e[t]():n},w.shuffle=function(e){var t=-1,n=Array(e?e.length:0);return f(e,function(e){var r=nt(dt()*(++
+t+1));n[t]=n[r],n[r]=e}),n},w.size=function(e){var t=e?e.length:0;return t===+t?t:At(e).length},w.some=s,w.sortBy=function(e,t,n){var r,i=e||[];if(!e)return i;var t=x(t,n),s=e.length,n=-1;if(s===+s)for(i=Array(s);++n<s;)r=e[n],i[n]={a:t(r,n,e),b:n,c:r};else for(n in i=[],e)it.call(e,n)&&(r=e[n],i.push({a:t(r,n,e),b:n,c:r}));i.sort(E);for(s=i.length;s--;)i[s]=i[s].c;return i},w.sortedIndex=j,w.tap=function(e,t){return t(e),e},w.template=function(e,t,n){e||(e=""),n||(n={});var r,i,s=0,o=w.templateSettings
+,u="__p += '",a=n.variable||o.variable,f=a;e.replace(RegExp((n.escape||o.escape||G).source+"|"+(n.interpolate||o.interpolate||G).source+"|"+(n.evaluate||o.evaluate||G).source+"|$","g"),function(t,n,i,o,a){u+=e.slice(s,a).replace(Z,T),u+=n?"'+__e("+n+")+'":o?"';"+o+";__p+='":i?"'+((__t=("+i+"))==null?'':__t)+'":"",r||(r=o||$.test(n||i)),s=a+t.length}),u+="';",f||(a="obj",r?u="with("+a+"){"+u+"}":(n=RegExp("(\\(\\s*)"+a+"\\."+a+"\\b","g"),u=u.replace(K,"$&"+a+".").replace(n,"$1__d"))),u="function("+
+a+"){"+(f?"":a+"||("+a+"={});")+"var __t,__p='',__e=_.escape"+(r?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":(f?"":",__d="+a+"."+a+"||"+a)+";")+u+"return __p}";try{i=Function("_","return "+u)(w)}catch(l){throw l.source=u,l}return t?i(t):(i.source=u,i)},w.throttle=function(e,t){function n(){a=new Date,u=r,s=e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(Et(u),a=r,s=e.apply(o,i)):u||(u=St(n,f)),s}},w.times=function(
+e,t,n){for(var e=+e||0,r=-1,i=Array(e);++r<e;)i[r]=t.call(n,r);return i},w.toArray=function(e){if(!e)return[];var t=e.length;return t===+t?"string"==typeof e?e.split(""):ot.call(e):d(e)},w.unescape=function(e){return e==r?"":(e+"").replace(J,k)},w.union=function(){for(var e=-1,t=tt.apply(z,arguments),n=t.length,r=[];++e<n;){var i=t[e];0>H(r,i)&&r.push(i)}return r},w.uniq=F,w.uniqueId=function(e){var t=X++;return e?e+t:t},w.values=d,w.where=function(e,t){var r,i,s=[];if(!e)return s;var o=[];m(t,function(
+e,t){o.push(t)});var u=o.length,a=e.length;r=-1;if(a===+a)for(;++r<a;){i=e[r];for(var f=n,l=0;l<u&&(f=o[l],f=i[f]===t[f]);l++);f&&s.push(i)}else for(r in e)if(it.call(e,r)){i=e[r],f=n;for(l=0;l<u&&(f=o[l],f=i[f]===t[f]);l++);f&&s.push(i)}return s},w.without=function(e){for(var t=-1,n=e.length,r=[];++t<n;){var i=e[t];0>H(arguments,i,1)&&r.push(i)}return r},w.wrap=function(e,t){return function(){var n=[e];return arguments.length&&st.apply(n,arguments),t.apply(this,n)}},w.zip=function(e){for(var t=-1
+,n=e?M(u(arguments,"length")):0,r=Array(n);++t<n;)r[t]=u(arguments,t);return r},w.all=h,w.any=s,w.collect=a,w.detect=l,w.drop=B,w.each=f,w.foldl=o,w.foldr=_,w.head=D,w.include=p,w.inject=o,w.methods=v,w.select=c,w.tail=B,w.take=D,w.unique=F,R(w),w.prototype.chain=function(){return this.__chain__=n,this},w.prototype.value=function(){return this.__wrapped__},f("pop push reverse shift sort splice unshift".split(" "),function(e){var t=z[e];w.prototype[e]=function(){var e=this.__wrapped__;return t.apply
+(e,arguments),this.__chain__&&(e=new w(e),e.__chain__=n),e}}),f(["concat","join","slice"],function(e){var t=z[e];w.prototype[e]=function(){var e=t.apply(this.__wrapped__,arguments);return this.__chain__&&(e=new w(e),e.__chain__=n),e}}),U?"object"==typeof module&&module&&module.exports==U?(module.exports=w)._=w:U._=w:e._=w})(this);

package.json

@@ -1,9 +1,9 @@
 {
   "name": "lodash",
-  "version": "0.4.0",
-  "description": "A drop-in replacement for Underscore.js that delivers performance improvements, bug fixes, and additional features.",
+  "version": "0.8.2",
+  "description": "A drop-in replacement for Underscore.js delivering performance, bug fixes, and additional features.",
   "homepage": "http://lodash.com",
-  "main": "lodash",
+  "main": "./lodash",
   "keywords": [
     "browser",
     "client",
@@ -21,7 +21,7 @@
   ],
   "author": {
     "name": "John-David Dalton",
-    "email": "john@fusejs.com",
+    "email": "john.david.dalton@gmail.com",
     "web": "http://allyoucanleet.com/"
   },
   "bugs": {
@@ -42,8 +42,11 @@
     "node",
     "rhino"
   ],
+  "jam": {
+    "main": "./lodash.js"
+  },
   "scripts": {
     "build": "node build",
-    "test": "node test/test"
+    "test": "node test/test && node test/test-build"
   }
 }

perf/index.html

@@ -20,29 +20,40 @@
 		<script>
 			var lodash = _.noConflict();
 		</script>
-		<script src="../vendor/underscore/underscore.js"></script>
+		<script src="../vendor/underscore/underscore-min.js"></script>
+		<script src="../vendor/platform.js/platform.js"></script>
 		<script src="../vendor/benchmark.js/benchmark.js"></script>
 		<script src="../vendor/firebug-lite/src/firebug-lite-debug.js"></script>
+		<script src="perf.js"></script>
 		<script>
 			(function() {
-				if (!/[?&]nojava=true(?:&|$)/.test(location.search)) {
-					// using innerHTML avoids an alert in some versions of IE6
-					var div = document.createElement('div');
-					div.innerHTML = '<applet code=nano archive="../vendor/benchmark.js/nano.jar">';
-					document.body.insertBefore(div.lastChild, document.body.firstChild);
+				var measured,
+				    perfNow,
+				    begin = new Date;
+
+				function init() {
+					var fbUI = document.getElementById('FirebugUI'),
+					    fbDoc = fbUI && (fbDoc = fbUI.contentWindow || fbUI.contentDocument).document || fbDoc,
+					    fbCommandLine = fbDoc && fbDoc.getElementById('fbCommandLine');
+
+					if (!fbCommandLine) {
+						return setTimeout(init, 15);
+					}
+					fbUI.style.height = fbDoc.body.style.height = fbDoc.documentElement.style.height = '100%';
+					setTimeout(run, 15);
 				}
+
+				// is the applet permitted?
+				if (!/[?&]nojava=true(?:&|$)/.test(location.search)) {
+					// is the applet really needed?
+					while (!(measured = new Date - begin)) { }
+					if (measured != 1 && !((perfNow = window.performance) && typeof (perfNow.now || perfNow.webkitNow) == 'function')) {
+						// load applet
+						document.write('<applet code="nano" archive="../vendor/benchmark.js/nano.jar"></applet>');
+					}
+				}
+				window.onload = init;
 			}());
-
-			window.onload = function() {
-				var fbUI = document.getElementById('FirebugUI'),
-				    fbDoc = (fbDoc = fbUI.contentWindow || fbUI.contentDocument).document || fbDoc,
-				    sibling = document.getElementsByTagName('script')[0],
-				    script = document.createElement('script');
-
-				fbUI.style.height = fbDoc.body.style.height = fbDoc.documentElement.style.height = '100%';
-				script.src = 'perf.js?t=' + (+new Date);
-				sibling.parentNode.insertBefore(script, sibling);
-			};
 		</script>
 	</body>
 </html>

test/backbone.html

@@ -23,13 +23,21 @@
 		</div>
 		<script src="../vendor/backbone/test/vendor/json2.js"></script>
 		<script src="../vendor/backbone/test/vendor/jquery-1.7.1.js"></script>
-		<script src="../vendor/backbone/test/vendor/qunit.js"></script>
 		<script src="../vendor/backbone/test/vendor/jslitmus.js"></script>
+		<script src="../vendor/platform.js/platform.js"></script>
+		<script>
+			// avoid syntax errors for `QUnit.throws` in older Firefoxes
+			document.write(platform.name == 'Firefox' && /^1\b/.test(platform.version)
+				? '<script src="../vendor/qunit/qunit/qunit-1.8.0.js"><\/script>'
+				: '<script src="../vendor/qunit/qunit/qunit.js"><\/script>'
+			);
+		</script>
 		<script src="test-ui.js"></script>
 		<script>
 			document.write('<script src="../' + QUnit.config.lodashFilename + '.js"><\/script>');
 		</script>
 		<script src="../vendor/backbone/backbone.js"></script>
+		<script src="../vendor/backbone/test/environment.js"></script>
 		<script src="../vendor/backbone/test/noconflict.js"></script>
 		<script src="../vendor/backbone/test/events.js"></script>
 		<script src="../vendor/backbone/test/model.js"></script>

test/index.html

@@ -7,7 +7,14 @@
 	</head>
 	<body>
 		<div id="qunit"></div>
-		<script src="../vendor/qunit/qunit/qunit.js"></script>
+		<script src="../vendor/platform.js/platform.js"></script>
+		<script>
+			// avoid syntax errors for `QUnit.throws` in older Firefoxes
+			document.write(platform.name == 'Firefox' && /^1\b/.test(platform.version)
+				? '<script src="../vendor/qunit/qunit/qunit-1.8.0.js"><\/script>'
+				: '<script src="../vendor/qunit/qunit/qunit.js"><\/script>'
+			);
+		</script>
 		<script src="test-ui.js"></script>
 		<script>
 			// set a bad shim
@@ -25,9 +32,6 @@
 			Object.keys = Object._keys;
 			delete Object._keys;
 
-			// set to test `_.noConflict`
-			_ = 1;
-
 			// load Lo-Dash again to overwrite the existing `_` value
 			document.write('<script src="../' + QUnit.config.lodashFilename + '.js"><\/script>');
 
@@ -40,6 +44,7 @@
 		<script>
 			// load Lo-Dash as a module
 			var lodashModule,
+			    shimmedModule,
 			    underscoreModule;
 
 			window.require && require({
@@ -47,18 +52,41 @@
 				'urlArgs': 't=' + (+new Date),
 				'paths': {
 					'lodash': '../../' + QUnit.config.lodashFilename,
-					'underscore': './../../' + QUnit.config.lodashFilename
+					'shimmed': './../../' + QUnit.config.lodashFilename,
+					'underscore': '../underscore/../../' + QUnit.config.lodashFilename
+				},
+				'shim': {
+					'shimmed': {
+					    'exports': '_'
+					}
 				}
 			},
-			['lodash', 'underscore'], function(lodash, underscore) {
-				lodashModule = lodash.noConflict();
-				lodashModule.moduleName = 'lodash';
-
-				underscoreModule = underscore.noConflict();
-				underscoreModule.moduleName = 'underscore';
-
+			['lodash', 'shimmed', 'underscore'], function(lodash, shimmed, underscore) {
+				if (lodash && lodash.noConflict) {
+					lodashModule = lodash.noConflict();
+					lodashModule.moduleName = 'lodash';
+				}
+				if (shimmed.noConflict) {
+					shimmedModule = shimmed.noConflict();
+					shimmedModule.moduleName = 'shimmed';
+				}
+				if (underscore && underscore.noConflict) {
+					underscoreModule = underscore.noConflict();
+					underscoreModule.moduleName = 'underscore';
+				}
 				require(['test.js']);
 			});
+
+			// set a more readable browser name
+			window.onload = function() {
+				var timeoutId = setInterval(function() {
+					var ua = document.getElementById('qunit-userAgent');
+					if (ua) {
+						ua.innerHTML = platform;
+						clearInterval(timeoutId);
+					}
+				}, 15);
+			};
 		</script>
 	</body>
 </html>

test/run-test.sh

@@ -1,9 +1,14 @@
 cd "$(dirname "$0")"
 for cmd in rhino ringo narwhal node; do
-	echo ""
-	echo "Testing in $cmd..."
-	$cmd test.js
+  echo ""
+  echo "Testing in $cmd..."
+  $cmd test.js
 done
+
+echo ""
+echo "Testing build..."
+node test-build.js
+
 echo ""
 echo "Testing in a browser..."
 open index.html

test/template/a.jst

@@ -0,0 +1,3 @@
+<ul>
+<% _.forEach(people, function(name) { %><li><%= name %></li><% }); %>
+</ul>

test/template/b.jst

@@ -0,0 +1 @@
+<% print("Hello " + epithet); %>.

test/template/c.tpl

@@ -0,0 +1 @@
+Hello {{ name }}!

test/test-build.js

@@ -0,0 +1,968 @@
+#!/usr/bin/env node
+;(function(undefined) {
+  'use strict';
+
+  /** Load modules */
+  var fs = require('fs'),
+      path = require('path'),
+      vm = require('vm'),
+      build = require('../build.js'),
+      minify = require('../build/minify'),
+      _ = require('../lodash.js');
+
+  /** The unit testing framework */
+  var QUnit = global.QUnit = require('../vendor/qunit/qunit/qunit.js');
+  require('../vendor/qunit-clib/qunit-clib.js');
+
+  /** Used to associate aliases with their real names */
+  var aliasToRealMap = {
+    'all': 'every',
+    'any': 'some',
+    'collect': 'map',
+    'detect': 'find',
+    'drop': 'rest',
+    'each': 'forEach',
+    'foldl': 'reduce',
+    'foldr': 'reduceRight',
+    'head': 'first',
+    'include': 'contains',
+    'inject': 'reduce',
+    'methods': 'functions',
+    'select': 'filter',
+    'tail': 'rest',
+    'take': 'first',
+    'unique': 'uniq'
+  };
+
+  /** Used to associate real names with their aliases */
+  var realToAliasMap = {
+    'contains': ['include'],
+    'every': ['all'],
+    'filter': ['select'],
+    'find': ['detect'],
+    'first': ['head', 'take'],
+    'forEach': ['each'],
+    'functions': ['methods'],
+    'map': ['collect'],
+    'reduce': ['foldl', 'inject'],
+    'reduceRight': ['foldr'],
+    'rest': ['drop', 'tail'],
+    'some': ['any'],
+    'uniq': ['unique']
+  };
+
+  /** List of all Lo-Dash methods */
+  var allMethods = _.functions(_).filter(function(methodName) {
+    return !/^_/.test(methodName);
+  });
+
+  /** List of "Arrays" category methods */
+  var arraysMethods = [
+    'compact',
+    'difference',
+    'drop',
+    'first',
+    'flatten',
+    'head',
+    'indexOf',
+    'initial',
+    'intersection',
+    'last',
+    'lastIndexOf',
+    'object',
+    'range',
+    'rest',
+    'sortedIndex',
+    'tail',
+    'take',
+    'union',
+    'uniq',
+    'unique',
+    'without',
+    'zip'
+  ];
+
+  /** List of "Chaining" category methods */
+  var chainingMethods = [
+    'chain',
+    'mixin',
+    'tap',
+    'value'
+  ];
+
+  /** List of "Collections" category methods */
+  var collectionsMethods = [
+    'all',
+    'any',
+    'collect',
+    'contains',
+    'countBy',
+    'detect',
+    'each',
+    'every',
+    'filter',
+    'find',
+    'foldl',
+    'foldr',
+    'forEach',
+    'groupBy',
+    'include',
+    'inject',
+    'invoke',
+    'map',
+    'max',
+    'min',
+    'pluck',
+    'reduce',
+    'reduceRight',
+    'reject',
+    'select',
+    'shuffle',
+    'size',
+    'some',
+    'sortBy',
+    'toArray',
+    'where'
+  ];
+
+  /** List of "Functions" category methods */
+  var functionsMethods = [
+    'after',
+    'bind',
+    'bindAll',
+    'compose',
+    'debounce',
+    'defer',
+    'delay',
+    'lateBind',
+    'memoize',
+    'once',
+    'partial',
+    'throttle',
+    'wrap'
+  ];
+
+  /** List of "Objects" category methods */
+  var objectsMethods = [
+    'clone',
+    'defaults',
+    'extend',
+    'forIn',
+    'forOwn',
+    'functions',
+    'has',
+    'invert',
+    'isArguments',
+    'isArray',
+    'isBoolean',
+    'isDate',
+    'isElement',
+    'isEmpty',
+    'isEqual',
+    'isFinite',
+    'isFunction',
+    'isNaN',
+    'isNull',
+    'isNumber',
+    'isObject',
+    'isPlainObject',
+    'isRegExp',
+    'isString',
+    'isUndefined',
+    'keys',
+    'methods',
+    'merge',
+    'omit',
+    'pairs',
+    'pick',
+    'values'
+  ];
+
+  /** List of "Utilities" category methods */
+  var utilityMethods = [
+    'escape',
+    'identity',
+    'noConflict',
+    'random',
+    'result',
+    'template',
+    'times',
+    'unescape',
+    'uniqueId'
+  ];
+
+  /** List of Backbone's Lo-Dash dependencies */
+  var backboneDependencies = [
+    'bind',
+    'bindAll',
+    'clone',
+    'contains',
+    'escape',
+    'every',
+    'extend',
+    'filter',
+    'find',
+    'first',
+    'forEach',
+    'groupBy',
+    'has',
+    'indexOf',
+    'initial',
+    'invoke',
+    'isArray',
+    'isEmpty',
+    'isEqual',
+    'isFunction',
+    'isObject',
+    'isRegExp',
+    'keys',
+    'last',
+    'lastIndexOf',
+    'map',
+    'max',
+    'min',
+    'mixin',
+    'reduce',
+    'reduceRight',
+    'reject',
+    'rest',
+    'result',
+    'shuffle',
+    'size',
+    'some',
+    'sortBy',
+    'sortedIndex',
+    'toArray',
+    'uniqueId',
+    'without'
+  ];
+
+  /** List of methods used by Underscore */
+  var underscoreMethods = _.without.apply(_, [allMethods].concat([
+    'forIn',
+    'forOwn',
+    'isPlainObject',
+    'lateBind',
+    'merge',
+    'partial'
+  ]));
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Creates a context object to use with `vm.runInContext`.
+   *
+   * @private
+   * @returns {Object} Returns a new context object.
+   */
+  function createContext() {
+    return vm.createContext({
+      'clearTimeout': clearTimeout,
+      'setTimeout': setTimeout
+    });
+  }
+
+  /**
+   * Expands a list of method names to include real and alias names.
+   *
+   * @private
+   * @param {Array} methodNames The array of method names to expand.
+   * @returns {Array} Returns a new array of expanded method names.
+   */
+  function expandMethodNames(methodNames) {
+    return methodNames.reduce(function(result, methodName) {
+      var realName = getRealName(methodName);
+      result.push.apply(result, [realName].concat(getAliases(realName)));
+      return result;
+    }, []);
+  }
+
+  /**
+   * Gets the aliases associated with a given function name.
+   *
+   * @private
+   * @param {String} funcName The name of the function to get aliases for.
+   * @returns {Array} Returns an array of aliases.
+   */
+  function getAliases(funcName) {
+    return realToAliasMap[funcName] || [];
+  }
+
+  /**
+   * Gets the names of methods belonging to the given `category`.
+   *
+   * @private
+   * @param {String} category The category to filter by.
+   * @returns {Array} Returns a new array of method names belonging to the given category.
+   */
+  function getMethodsByCategory(category) {
+    switch (category) {
+      case 'Arrays':
+        return arraysMethods.slice();
+      case 'Chaining':
+        return chainingMethods.slice();
+      case 'Collections':
+        return collectionsMethods.slice();
+      case 'Functions':
+        return functionsMethods.slice();
+      case 'Objects':
+        return objectsMethods.slice();
+      case 'Utilities':
+        return utilityMethods.slice();
+    }
+    return [];
+  }
+
+  /**
+   * Gets the real name, not alias, of a given function name.
+   *
+   * @private
+   * @param {String} funcName The name of the function to resolve.
+   * @returns {String} Returns the real name.
+   */
+  function getRealName(funcName) {
+    return aliasToRealMap[funcName] || funcName;
+  }
+
+  /**
+   * Tests if a given method on the `lodash` object can be called successfully.
+   *
+   * @private
+   * @param {Object} lodash The built Lo-Dash object.
+   * @param {String} methodName The name of the Lo-Dash method to test.
+   * @param {String} message The unit test message.
+   */
+  function testMethod(lodash, methodName, message) {
+    var pass = true,
+        array = [['a', 1], ['b', 2], ['c', 3]],
+        object = { 'a': 1, 'b': 2, 'c': 3 },
+        noop = function() {},
+        string = 'abc',
+        func = lodash[methodName];
+
+    try {
+      if (arraysMethods.indexOf(methodName) > -1) {
+        if (/(?:indexOf|sortedIndex|without)$/i.test(methodName)) {
+          func(array, string);
+        } else if (/^(?:difference|intersection|union|uniq|zip)/.test(methodName)) {
+          func(array, array);
+        } else if (methodName == 'range') {
+          func(2, 4);
+        } else {
+          func(array);
+        }
+      }
+      else if (chainingMethods.indexOf(methodName) > -1) {
+        if (methodName == 'chain') {
+          lodash.chain(array);
+          lodash(array).chain();
+        }
+        else if (methodName == 'mixin') {
+          lodash.mixin({});
+        }
+        else {
+          lodash(array)[methodName](noop);
+        }
+      }
+      else if (collectionsMethods.indexOf(methodName) > -1) {
+        if (/^(?:count|group|sort)By$/.test(methodName)) {
+          func(array, noop);
+          func(array, string);
+          func(object, noop);
+          func(object, string);
+        }
+        else if (/^(?:size|toArray)$/.test(methodName)) {
+          func(array);
+          func(object);
+        }
+        else if (methodName == 'invoke') {
+          func(array, 'slice');
+          func(object, 'toFixed');
+        }
+        else if (methodName == 'where') {
+          func(array, object);
+          func(object, object);
+        }
+        else {
+          func(array, noop, object);
+          func(object, noop, object);
+        }
+      }
+      else if (functionsMethods.indexOf(methodName) > -1) {
+        if (methodName == 'after') {
+          func(1, noop);
+        } else if (methodName == 'bindAll') {
+          func({ 'noop': noop });
+        } else if (methodName == 'lateBind') {
+          func(lodash, 'identity', array, string);
+        } else if (/^(?:bind|partial)$/.test(methodName)) {
+          func(noop, object, array, string);
+        } else if (/^(?:compose|memoize|wrap)$/.test(methodName)) {
+          func(noop, noop);
+        } else if (/^(?:debounce|throttle)$/.test(methodName)) {
+          func(noop, 100);
+        } else {
+          func(noop);
+        }
+      }
+      else if (objectsMethods.indexOf(methodName) > -1) {
+        if (methodName == 'clone') {
+          func(object);
+          func(object, true);
+        }
+        else if (/^(?:defaults|extend|merge)$/.test(methodName)) {
+          func({}, object);
+        } else if (/^(?:forIn|forOwn)$/.test(methodName)) {
+          func(object, noop);
+        } else if (/^(?:omit|pick)$/.test(methodName)) {
+          func(object, 'b');
+        } else if (methodName == 'has') {
+          func(object, string);
+        } else {
+          func(object);
+        }
+      }
+      else if (utilityMethods.indexOf(methodName) > -1) {
+        if (methodName == 'result') {
+          func(object, 'b');
+        } else if (methodName == 'times') {
+          func(2, noop, object);
+        } else {
+          func(string, object);
+        }
+      }
+    }
+    catch(e) {
+      console.log(e);
+      pass = false;
+    }
+    equal(pass, true, '_.' + methodName + ': ' + message);
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('minified AMD snippet');
+
+  (function() {
+    var start = _.once(QUnit.start);
+
+    asyncTest('`lodash`', function() {
+      build(['-s'], function(source, filePath) {
+        // used by r.js build optimizer
+        var defineHasRegExp = /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g,
+            basename = path.basename(filePath, '.js');
+
+        ok(!!defineHasRegExp.exec(source), basename);
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('template builds');
+
+  (function() {
+    var templatePath = __dirname + '/template';
+
+    asyncTest('`lodash template=*.jst`', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'template=' + templatePath + '/*.jst'], function(source, filePath) {
+        var basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        var data = {
+          'a': { 'people': ['moe', 'larry', 'curly'] },
+          'b': { 'epithet': 'stooge' }
+        };
+
+        context._ = _;
+        vm.runInContext(source, context);
+        var templates = context._.templates;
+
+        equal(templates.a(data.a).replace(/[\r\n]+/g, ''), '<ul><li>moe</li><li>larry</li><li>curly</li></ul>', basename);
+        equal(templates.b(data.b), 'Hello stooge.', basename);
+        start();
+      });
+    });
+
+    asyncTest('`lodash settings=...`', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'template=' + templatePath + '/*.tpl', 'settings={interpolate:/\\{\\{([\\s\\S]+?)\\}\\}/}'], function(source, filePath) {
+        var basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        var data = {
+          'c': { 'name': 'Mustache' }
+        };
+
+        context._ = _;
+        vm.runInContext(source, context);
+        var templates = context._.templates;
+
+        equal(templates.c(data.c), 'Hello Mustache!', basename);
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('independent builds');
+
+  (function() {
+    asyncTest('debug only', function() {
+      var start = _.once(QUnit.start);
+      build(['-d', '-s'], function(source, filePath) {
+        equal(path.basename(filePath, '.js'), 'lodash');
+        start();
+      });
+    });
+
+    asyncTest('debug custom', function () {
+      var start = _.once(QUnit.start);
+      build(['-d', '-s', 'backbone'], function(source, filePath) {
+        equal(path.basename(filePath, '.js'), 'lodash.custom');
+        start();
+      });
+    });
+
+    asyncTest('minified only', function() {
+      var start = _.once(QUnit.start);
+      build(['-m', '-s'], function(source, filePath) {
+        equal(path.basename(filePath, '.js'), 'lodash.min');
+        start();
+      });
+    });
+
+    asyncTest('minified custom', function () {
+      var start = _.once(QUnit.start);
+      build(['-m', '-s', 'backbone'], function(source, filePath) {
+        equal(path.basename(filePath, '.js'), 'lodash.custom.min');
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('strict modifier');
+
+  (function() {
+    var object = Object.create(Object.prototype, {
+      'a': { 'value': _.identify },
+      'b': { 'value': null }
+    });
+
+    ['non-strict', 'strict'].forEach(function(strictMode, index) {
+      asyncTest(strictMode + ' should ' + (index ? 'error': 'silently fail') + ' attempting to overwrite read-only properties', function() {
+        var commands = ['-s', 'include=bindAll,defaults,extend'],
+            start = _.after(2, _.once(QUnit.start));
+
+        if (index) {
+          commands.push('strict');
+        }
+        build(commands, function(source, filePath) {
+          var basename = path.basename(filePath, '.js'),
+              context = createContext(),
+              pass = !index;
+
+          vm.runInContext(source, context);
+          var lodash = context._;
+
+          try {
+            lodash.bindAll(object);
+            lodash.extend(object, { 'a': 1 });
+            lodash.defaults(object, { 'b': 2 });
+          } catch(e) {
+            pass = !!index;
+          }
+          equal(pass, true, basename);
+          start();
+        });
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('underscore modifier');
+
+  (function() {
+    asyncTest('modified methods should work correctly', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'underscore'], function(source, filePath) {
+        var last,
+            array = [{ 'value': 1 }, { 'value': 2 }],
+            basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        vm.runInContext(source, context);
+        var lodash = context._;
+
+        lodash.each(array, function(value) {
+          last = value;
+          return false;
+        });
+
+        equal(last.value, 2, '_.each: ' + basename);
+        equal(lodash.isEmpty('moe'), false, '_.isEmpty: ' + basename);
+
+        var object = { 'fn': lodash.bind(function(x) { return this.x + x; }, { 'x': 1 }, 1) };
+        equal(object.fn(), 2, '_.bind: ' + basename);
+
+        ok(lodash.clone(array, true)[0] === array[0], '_.clone: ' + basename);
+        start();
+      });
+    });
+
+    asyncTest('`lodash underscore include=partial`', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'underscore', 'include=partial'], function(source, filePath) {
+        var basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        vm.runInContext(source, context);
+        var lodash = context._;
+
+        equal(lodash.partial(_.identity, 2)(), 2, '_.partial: ' + basename);
+        start();
+      });
+    });
+
+    asyncTest('`lodash underscore plus=clone`', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'underscore', 'plus=clone'], function(source, filePath) {
+        var array = [{ 'value': 1 }],
+            basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        vm.runInContext(source, context);
+        var lodash = context._,
+            clone = lodash.clone(array, true);
+
+        deepEqual(array, clone, basename);
+        notEqual(array, clone, basename);
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('exports command');
+
+  (function() {
+    var commands = [
+      'exports=amd',
+      'exports=commonjs',
+      'exports=global',
+      'exports=node',
+      'exports=none'
+    ];
+
+    commands.forEach(function(command, index) {
+      asyncTest('`lodash ' + command +'`', function() {
+        var start = _.after(2, _.once(QUnit.start));
+
+        build(['-s', command], function(source, filePath) {
+          var basename = path.basename(filePath, '.js'),
+              context = createContext(),
+              pass = false;
+
+          switch(index) {
+            case 0:
+              context.define = function(fn) {
+                pass = true;
+                context._ = fn();
+              };
+              context.define.amd = {};
+              vm.runInContext(source, context);
+              ok(pass, basename);
+              break;
+
+            case 1:
+              context.exports = {};
+              vm.runInContext(source, context);
+              ok(context._ === undefined, basename);
+              ok(_.isFunction(context.exports._), basename)
+              break;
+
+            case 2:
+              vm.runInContext(source, context);
+              ok(_.isFunction(context._), basename);
+              break;
+
+            case 3:
+              context.exports = {};
+              context.module = { 'exports': context.exports };
+              vm.runInContext(source, context);
+              ok(context._ === undefined, basename);
+              ok(_.isFunction(context.module.exports), basename);
+              break;
+
+            case 4:
+              vm.runInContext(source, context);
+              ok(context._ === undefined, basename);
+          }
+          start();
+        });
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('iife command');
+
+  (function() {
+    var commands = [
+      'iife=this["lodash"]=(function(window,undefined){%output%;return lodash}(this))',
+      'iife=define(function(window,undefined){return function(){%output%;return lodash}}(this));'
+    ];
+
+    commands.forEach(function(command) {
+      asyncTest('`lodash ' + command +'`', function() {
+        var start = _.after(2, _.once(QUnit.start));
+
+        build(['-s', 'exports=none', command], function(source, filePath) {
+          var basename = path.basename(filePath, '.js'),
+              context = createContext();
+
+          context.define = function(func) {
+            context.lodash = func();
+          };
+
+          try {
+            vm.runInContext(source, context);
+          } catch(e) {
+            console.log(e);
+          }
+
+          var lodash = context.lodash || {};
+          ok(_.isString(lodash.VERSION), basename);
+          start();
+        });
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('output options');
+
+  (function() {
+    ['-o a.js', '--output a.js'].forEach(function(command, index) {
+      asyncTest('`lodash ' + command +'`', function() {
+        var start = _.once(QUnit.start);
+
+        build(['-s'].concat(command.split(' ')), function(source, filePath) {
+          equal(path.basename(filePath, '.js'), 'a', command);
+          start();
+        });
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('stdout options');
+
+  (function() {
+    ['-c', '--stdout'].forEach(function(command, index) {
+      asyncTest('`lodash ' + command +'`', function() {
+        var written,
+            start = _.once(QUnit.start),
+            write = process.stdout.write;
+
+        process.stdout.write = function(string) {
+          written = string;
+        };
+
+        build([command, 'exports=', 'include='], function(source) {
+          process.stdout.write = write;
+          equal(written, source);
+          equal(arguments.length, 1);
+          start();
+        });
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('minify underscore');
+
+  (function() {
+    asyncTest('`node minify underscore.js`', function() {
+      var source = fs.readFileSync(path.join(__dirname, '..', 'vendor', 'underscore', 'underscore.js'), 'utf8'),
+          start = _.once(QUnit.start);
+
+      minify(source, {
+        'isSilent': true,
+        'workingName': 'underscore.min',
+        'onComplete': function(result) {
+          var context = createContext();
+
+          try {
+            vm.runInContext(result, context);
+          } catch(e) {
+            console.log(e);
+          }
+
+          var underscore = context._ || {};
+          ok(_.isString(underscore.VERSION));
+          ok(!/Lo-Dash/.test(result) && result.match(/\n/g).length < source.match(/\n/g).length);
+          start();
+        }
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('mobile build');
+
+  (function() {
+    asyncTest('`lodash mobile`', function() {
+      var start = _.after(2, _.once(QUnit.start));
+
+      build(['-s', 'mobile'], function(source, filePath) {
+        var basename = path.basename(filePath, '.js'),
+            context = createContext();
+
+        try {
+          vm.runInContext(source, context);
+        } catch(e) {
+          console.log(e);
+        }
+
+        var array = [1, 2, 3],
+            object1 = [{ 'a': 1 }],
+            object2 = [{ 'b': 2 }],
+            object3 = [{ 'a': 1, 'b': 2 }],
+            circular1 = { 'a': 1 },
+            circular2 = { 'a': 1 },
+            lodash = context._;
+
+        circular1.b = circular1;
+        circular2.b = circular2;
+
+        deepEqual(lodash.merge(object1, object2), object3, basename);
+        deepEqual(lodash.sortBy([3, 2, 1], _.identity), array, basename);
+        equal(lodash.isEqual(circular1, circular2), true, basename);
+
+        var actual = lodash.clone(circular1, true);
+        ok(actual != circular1 && actual.b == actual, basename);
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  QUnit.module('lodash build');
+
+  (function() {
+    var commands = [
+      'backbone',
+      'csp',
+      'legacy',
+      'mobile',
+      'strict',
+      'underscore',
+      'category=arrays',
+      'category=chaining',
+      'category=collections',
+      'category=functions',
+      'category=objects',
+      'category=utilities',
+      'exclude=union,uniq,zip',
+      'include=each,filter,map',
+      'include=once plus=bind,Chaining',
+      'category=collections,functions',
+      'underscore backbone',
+      'backbone legacy category=utilities minus=first,last',
+      'underscore include=debounce,throttle plus=after minus=throttle',
+      'underscore mobile strict category=functions exports=amd,global plus=pick,uniq',
+    ]
+    .concat(
+      allMethods.map(function(methodName) {
+        return 'include=' + methodName;
+      })
+    );
+
+    commands.forEach(function(command) {
+      asyncTest('`lodash ' + command +'`', function() {
+        var start = _.after(2, _.once(QUnit.start));
+
+        build(['--silent'].concat(command.split(' ')), function(source, filePath) {
+          var methodNames,
+              basename = path.basename(filePath, '.js'),
+              context = createContext();
+
+          try {
+            vm.runInContext(source, context);
+          } catch(e) {
+            console.log(e);
+          }
+          // add method names explicitly
+          if (/include/.test(command)) {
+            methodNames = command.match(/include=(\S*)/)[1].split(/, */);
+          }
+          // add method names required by Backbone and Underscore builds
+          if (/backbone/.test(command) && !methodNames) {
+            methodNames = backboneDependencies.slice();
+          }
+          if (/underscore/.test(command) && !methodNames) {
+            methodNames = underscoreMethods.slice();
+          }
+          // add method names explicitly by category
+          if (/category/.test(command)) {
+            // resolve method names belonging to each category (case-insensitive)
+            methodNames = command.match(/category=(\S*)/)[1].split(/, */).reduce(function(result, category) {
+              var capitalized = category[0].toUpperCase() + category.toLowerCase().slice(1);
+              return result.concat(getMethodsByCategory(capitalized));
+            }, methodNames || []);
+          }
+          // init `methodNames` if it hasn't been inited
+          if (!methodNames) {
+            methodNames = allMethods.slice();
+          }
+          if (/plus/.test(command)) {
+            methodNames = methodNames.concat(command.match(/plus=(\S*)/)[1].split(/, */));
+          }
+          if (/minus/.test(command)) {
+            methodNames = _.without.apply(_, [methodNames]
+              .concat(expandMethodNames(command.match(/minus=(\S*)/)[1].split(/, */))));
+          }
+          if (/exclude/.test(command)) {
+            methodNames = _.without.apply(_, [methodNames]
+              .concat(expandMethodNames(command.match(/exclude=(\S*)/)[1].split(/, */))));
+          }
+
+          // expand aliases and categories to real method names
+          methodNames = expandMethodNames(methodNames).reduce(function(result, methodName) {
+            return result.concat(methodName, getMethodsByCategory(methodName));
+          }, []);
+
+          // remove nonexistent and duplicate method names
+          methodNames = _.uniq(_.intersection(allMethods, expandMethodNames(methodNames)));
+
+          var lodash = context._ || {};
+          methodNames.forEach(function(methodName) {
+            testMethod(lodash, methodName, basename);
+          });
+
+          start();
+        });
+      });
+    });
+  }());
+
+}());

test/test-ui.js

@@ -45,10 +45,10 @@
     }
 
     function init() {
-      var header = document.getElementById('qunit-header');
-      if (header) {
-        header.appendChild(label1);
-        header.appendChild(label2);
+      var toolbar = document.getElementById('qunit-testrunner-toolbar');
+      if (toolbar) {
+        toolbar.appendChild(span1);
+        toolbar.appendChild(span2);
 
         dropdown.selectedIndex = (function() {
           switch (build) {
@@ -68,21 +68,24 @@
       }
     }
 
-    var label1 = document.createElement('label');
-    label1.innerHTML =
-      '<input name="norequire" type="checkbox">norequire</label>';
+    var span1 = document.createElement('span');
+    span1.innerHTML =
+      '<input id="qunit-norequire" type="checkbox">' +
+      '<label for="qunit-norequire">No RequireJS</label>';
 
-    var label2 = document.createElement('label');
-    label2.innerHTML =
-      '<select name="build">' +
-      '<option value="dev">developement</option>' +
-      '<option value="prod">production</option>' +
-      '<option value="custom">custom</option>' +
-      '<option value="custom-debug">custom (debug)</option>' +
-      '</select>build';
+    var span2 = document.createElement('span');
+    span2.style.cssText = 'float:right';
+    span2.innerHTML =
+      '<label for="qunit-build">Build: </label>' +
+      '<select id="qunit-build">' +
+      '<option value="dev">Developement</option>' +
+      '<option value="prod">Production</option>' +
+      '<option value="custom">Custom</option>' +
+      '<option value="custom-debug">Custom (debug)</option>' +
+      '</select>';
 
-    var checkbox = label1.firstChild,
-        dropdown = label2.firstChild;
+    var checkbox = span1.firstChild,
+        dropdown = span2.lastChild;
 
     init();
   });

test/underscore.html

@@ -20,8 +20,15 @@
 		</div>
 		<script src="../vendor/backbone/test/vendor/json2.js"></script>
 		<script src="../vendor/underscore/test/vendor/jquery.js"></script>
-		<script src="../vendor/underscore/test/vendor/qunit.js"></script>
 		<script src="../vendor/underscore/test/vendor/jslitmus.js"></script>
+		<script src="../vendor/platform.js/platform.js"></script>
+		<script>
+			// avoid syntax errors for `QUnit.throws` in older Firefoxes
+			document.write(platform.name == 'Firefox' && /^1\b/.test(platform.version)
+				? '<script src="../vendor/qunit/qunit/qunit-1.8.0.js"><\/script>'
+				: '<script src="../vendor/qunit/qunit/qunit.js"><\/script>'
+			);
+		</script>
 		<script src="test-ui.js"></script>
 		<script>
 			document.write('<script src="../' + QUnit.config.lodashFilename + '.js"><\/script>');

vendor/backbone/backbone.js

@@ -18,8 +18,11 @@
   // restored later on, if `noConflict` is used.
   var previousBackbone = root.Backbone;
 
-  // Create a local reference to splice.
-  var splice = Array.prototype.splice;
+  // Create a local reference to array methods.
+  var ArrayProto = Array.prototype;
+  var push = ArrayProto.push;
+  var slice = ArrayProto.slice;
+  var splice = ArrayProto.splice;
 
   // The top-level namespace. All public Backbone classes and modules will
   // be attached to this. Exported for both CommonJS and the browser.
@@ -134,6 +137,9 @@
 
       rest = [];
       events = events.split(eventSplitter);
+
+      // Fill up `rest` with the callback arguments.  Since we're only copying
+      // the tail of `arguments`, a loop is much faster than Array#slice.
       for (i = 1, length = arguments.length; i < length; i++) {
         rest[i - 1] = arguments[i];
       }
@@ -177,22 +183,22 @@
   // is automatically generated and assigned for you.
   var Model = Backbone.Model = function(attributes, options) {
     var defaults;
-    attributes || (attributes = {});
+    var attrs = attributes || {};
     if (options && options.collection) this.collection = options.collection;
     if (options && options.parse) attributes = this.parse(attributes);
-    if (defaults = getValue(this, 'defaults')) {
-      attributes = _.extend({}, defaults, attributes);
+    if (defaults = _.result(this, 'defaults')) {
+      attrs = _.extend({}, defaults, attrs);
     }
     this.attributes = {};
     this._escapedAttributes = {};
     this.cid = _.uniqueId('c');
     this.changed = {};
-    this._silent = {};
+    this._changes = {};
     this._pending = {};
-    this.set(attributes, {silent: true});
+    this.set(attrs, {silent: true});
     // Reset change tracking.
     this.changed = {};
-    this._silent = {};
+    this._changes = {};
     this._pending = {};
     this._previousAttributes = _.clone(this.attributes);
     this.initialize.apply(this, arguments);
@@ -204,14 +210,18 @@
     // A hash of attributes whose current and previous value differ.
     changed: null,
 
-    // A hash of attributes that have silently changed since the last time
-    // `change` was called.  Will become pending attributes on the next call.
-    _silent: null,
+    // A hash of attributes that have changed since the last time `change`
+    // was called.
+    _changes: null,
 
-    // A hash of attributes that have changed since the last `'change'` event
+    // A hash of attributes that have changed since the last `change` event
     // began.
     _pending: null,
 
+    // A hash of attributes with the current model state to determine if
+    // a `change` should be recorded within a nested `change` block.
+    _changing : null,
+
     // The default name for the JSON `id` attribute is `"id"`. MongoDB and
     // CouchDB users may want to set this to `"_id"`.
     idAttribute: 'id',
@@ -251,23 +261,22 @@
 
     // Set a hash of model attributes on the object, firing `"change"` unless
     // you choose to silence it.
-    set: function(key, value, options) {
-      var attrs, attr, val;
+    set: function(attrs, options) {
+      var attr, key, val;
+      if (attrs == null) return this;
 
       // Handle both `"key", value` and `{key: value}` -style arguments.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
+      if (!_.isObject(attrs)) {
+        key = attrs;
+        (attrs = {})[key] = options;
+        options = arguments[2];
       }
 
       // Extract attributes and options.
-      options || (options = {});
-      if (!attrs) return this;
+      var silent = options && options.silent;
+      var unset = options && options.unset;
       if (attrs instanceof Model) attrs = attrs.attributes;
-      if (options.unset) for (attr in attrs) attrs[attr] = void 0;
+      if (unset) for (attr in attrs) attrs[attr] = void 0;
 
       // Run validation.
       if (!this._validate(attrs, options)) return false;
@@ -275,7 +284,7 @@
       // Check for changes of `id`.
       if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
 
-      var changes = options.changes = {};
+      var changing = this._changing;
       var now = this.attributes;
       var escaped = this._escapedAttributes;
       var prev = this._previousAttributes || {};
@@ -285,27 +294,30 @@
         val = attrs[attr];
 
         // If the new and current value differ, record the change.
-        if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
+        if (!_.isEqual(now[attr], val) || (unset && _.has(now, attr))) {
           delete escaped[attr];
-          (options.silent ? this._silent : changes)[attr] = true;
+          this._changes[attr] = true;
         }
 
         // Update or delete the current value.
-        options.unset ? delete now[attr] : now[attr] = val;
+        unset ? delete now[attr] : now[attr] = val;
 
         // If the new and previous value differ, record the change.  If not,
         // then remove changes for this attribute.
-        if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) {
+        if (!_.isEqual(prev[attr], val) || (_.has(now, attr) !== _.has(prev, attr))) {
           this.changed[attr] = val;
-          if (!options.silent) this._pending[attr] = true;
+          if (!silent) this._pending[attr] = true;
         } else {
           delete this.changed[attr];
           delete this._pending[attr];
+          if (!changing) delete this._changes[attr];
         }
+
+        if (changing && _.isEqual(now[attr], changing[attr])) delete this._changes[attr];
       }
 
       // Fire the `"change"` events.
-      if (!options.silent) this.change(options);
+      if (!silent) this.change(options);
       return this;
     },
 
@@ -333,25 +345,21 @@
       options.success = function(resp, status, xhr) {
         if (!model.set(model.parse(resp, xhr), options)) return false;
         if (success) success(model, resp, options);
-        model.trigger('sync', model, resp, options);
       };
-      options.error = Backbone.wrapError(options.error, model, options);
       return this.sync('read', this, options);
     },
 
     // Set a hash of model attributes, and sync the model to the server.
     // If the server returns an attributes hash that differs, the model's
     // state will be `set` again.
-    save: function(key, value, options) {
-      var attrs, current, done;
+    save: function(attrs, options) {
+      var key, current, done;
 
-      // Handle both `("key", value)` and `({key: value})` -style calls.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      if (attrs != null && !_.isObject(attrs)) {
+        key = attrs;
+        (attrs = {})[key] = options;
+        options = arguments[2];
       }
       options = options ? _.clone(options) : {};
 
@@ -368,7 +376,7 @@
       }
 
       // Do not persist invalid models.
-      if (!attrs && !this.isValid()) return false;
+      if (!attrs && !this._validate(null, options)) return false;
 
       // After a successful server-side save, the client is (optionally)
       // updated with the server-side state.
@@ -380,11 +388,9 @@
         if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs);
         if (!model.set(serverAttrs, options)) return false;
         if (success) success(model, resp, options);
-        model.trigger('sync', model, resp, options);
       };
 
       // Finish configuring and sending the Ajax request.
-      options.error = Backbone.wrapError(options.error, model, options);
       var xhr = this.sync(this.isNew() ? 'create' : 'update', this, options);
 
       // When using `wait`, reset attributes to original values unless
@@ -412,7 +418,6 @@
       options.success = function(resp) {
         if (options.wait || model.isNew()) destroy();
         if (success) success(model, resp, options);
-        if (!model.isNew()) model.trigger('sync', model, resp, options);
       };
 
       if (this.isNew()) {
@@ -420,7 +425,6 @@
         return false;
       }
 
-      options.error = Backbone.wrapError(options.error, model, options);
       var xhr = this.sync('delete', this, options);
       if (!options.wait) destroy();
       return xhr;
@@ -430,9 +434,9 @@
     // using Backbone's restful methods, override this to change the endpoint
     // that will be called.
     url: function() {
-      var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError();
+      var base = _.result(this, 'urlRoot') || _.result(this.collection, 'url') || urlError();
       if (this.isNew()) return base;
-      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
+      return base + (base.charAt(base.length - 1) === '/' ? '' : '/') + encodeURIComponent(this.id);
     },
 
     // **parse** converts a response into the hash of attributes to be `set` on
@@ -455,18 +459,25 @@
     // a `"change:attribute"` event for each changed attribute.
     // Calling this will cause all objects observing the model to update.
     change: function(options) {
-      options || (options = {});
       var changing = this._changing;
-      this._changing = true;
+      var current = this._changing = {};
 
       // Silent changes become pending changes.
-      for (var attr in this._silent) this._pending[attr] = true;
+      for (var attr in this._changes) this._pending[attr] = true;
 
-      // Silent changes are triggered.
-      var changes = _.extend({}, options.changes, this._silent);
-      this._silent = {};
+      // Trigger 'change:attr' for any new or silent changes.
+      var changes = this._changes;
+      this._changes = {};
+
+      // Set the correct state for this._changing values
+      var triggers = [];
       for (var attr in changes) {
-        this.trigger('change:' + attr, this, this.get(attr), options);
+        current[attr] = this.get(attr);
+        triggers.push(attr);
+      }
+
+      for (var i=0, l=triggers.length; i < l; i++) {
+        this.trigger('change:' + triggers[i], this, current[triggers[i]], options);
       }
       if (changing) return this;
 
@@ -476,13 +487,13 @@
         this.trigger('change', this, options);
         // Pending and silent changes still remain.
         for (var attr in this.changed) {
-          if (this._pending[attr] || this._silent[attr]) continue;
+          if (this._pending[attr] || this._changes[attr]) continue;
           delete this.changed[attr];
         }
         this._previousAttributes = _.clone(this.attributes);
       }
 
-      this._changing = false;
+      this._changing = null;
       return this;
     },
 
@@ -524,23 +535,20 @@
 
     // Check if the model is currently in a valid state. It's only possible to
     // get into an *invalid* state if you're using silent changes.
-    isValid: function() {
-      return !this.validate || !this.validate(this.attributes);
+    isValid: function(options) {
+      return !this.validate || !this.validate(this.attributes, options);
     },
 
     // Run validation against the next complete set of model attributes,
     // returning `true` if all is well. If a specific `error` callback has
     // been passed, call that instead of firing the general `"error"` event.
     _validate: function(attrs, options) {
-      if (options.silent || !this.validate) return true;
+      if (options && options.silent || !this.validate) return true;
       attrs = _.extend({}, this.attributes, attrs);
       var error = this.validate(attrs, options);
       if (!error) return true;
-      if (options && options.error) {
-        options.error(this, error, options);
-      } else {
-        this.trigger('error', this, error, options);
-      }
+      if (options && options.error) options.error(this, error, options);
+      this.trigger('error', this, error, options);
       return false;
     }
 
@@ -555,10 +563,13 @@
   var Collection = Backbone.Collection = function(models, options) {
     options || (options = {});
     if (options.model) this.model = options.model;
-    if (options.comparator !== undefined) this.comparator = options.comparator;
+    if (options.comparator !== void 0) this.comparator = options.comparator;
     this._reset();
     this.initialize.apply(this, arguments);
-    if (models) this.reset(models, {silent: true, parse: options.parse});
+    if (models) {
+      if (options.parse) models = this.parse(models);
+      this.reset(models, {silent: true, parse: options.parse});
+    }
   };
 
   // Define the Collection's inheritable methods.
@@ -586,61 +597,51 @@
     // Add a model, or list of models to the set. Pass **silent** to avoid
     // firing the `add` event for every new model.
     add: function(models, options) {
-      var i, index, length, model, cid, id, cids = {}, ids = {}, dups = [];
-      options || (options = {});
+      var i, args, length, model, existing;
+      var at = options && options.at;
       models = _.isArray(models) ? models.slice() : [models];
 
       // Begin by turning bare objects into model references, and preventing
-      // invalid models or duplicate models from being added.
+      // invalid models from being added.
       for (i = 0, length = models.length; i < length; i++) {
-        if (!(model = models[i] = this._prepareModel(models[i], options))) {
-          throw new Error("Can't add an invalid model to a collection");
-        }
-        cid = model.cid;
-        id = model.id;
-        if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) {
-          dups.push(i);
+        if (models[i] = this._prepareModel(models[i], options)) continue;
+        throw new Error("Can't add an invalid model to a collection");
+      }
+
+      for (i = models.length - 1; i >= 0; i--) {
+        model = models[i];
+        existing = model.id != null && this._byId[model.id];
+
+        // If a duplicate is found, splice it out and optionally merge it into
+        // the existing model.
+        if (existing || this._byCid[model.cid]) {
+          if (options && options.merge && existing) {
+            existing.set(model, options);
+          }
+          models.splice(i, 1);
           continue;
         }
-        cids[cid] = ids[id] = model;
-      }
 
-      // Remove duplicates.
-      i = dups.length;
-      while (i--) {
-        dups[i] = models.splice(dups[i], 1)[0];
-      }
-
-      // Listen to added models' events, and index models for lookup by
-      // `id` and by `cid`.
-      for (i = 0, length = models.length; i < length; i++) {
-        (model = models[i]).on('all', this._onModelEvent, this);
+        // Listen to added models' events, and index models for lookup by
+        // `id` and by `cid`.
+        model.on('all', this._onModelEvent, this);
         this._byCid[model.cid] = model;
         if (model.id != null) this._byId[model.id] = model;
       }
 
-      // Insert models into the collection, re-sorting if needed, and triggering
-      // `add` events unless silenced.
-      this.length += length;
-      index = options.at != null ? options.at : this.models.length;
-      splice.apply(this.models, [index, 0].concat(models));
-
-      // Merge in duplicate models.
-      if (options.merge) {
-        for (i = 0, length = dups.length; i < length; i++) {
-          if (model = this._byId[dups[i].id]) {
-            model.set(dups[i], options);
-          }
-        }
-      }
+      // Update `length` and splice in new models.
+      this.length += models.length;
+      args = [at != null ? at : this.models.length, 0];
+      push.apply(args, models);
+      splice.apply(this.models, args);
 
       // Sort the collection if appropriate.
-      if (this.comparator && options.at == null) this.sort({silent: true});
+      if (this.comparator && at == null) this.sort({silent: true});
 
-      if (options.silent) return this;
-      for (i = 0, length = this.models.length; i < length; i++) {
-        if (!cids[(model = this.models[i]).cid]) continue;
-        options.index = i;
+      if (options && options.silent) return this;
+
+      // Trigger `add` events.
+      while (model = models.shift()) {
         model.trigger('add', model, this, options);
       }
 
@@ -734,35 +735,35 @@
     // normal circumstances, as the set will maintain sort order as each item
     // is added.
     sort: function(options) {
-      options || (options = {});
-      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
-      var boundComparator = _.bind(this.comparator, this);
-      if (this.comparator.length == 1) {
-        this.models = this.sortBy(boundComparator);
-      } else {
-        this.models.sort(boundComparator);
+      if (!this.comparator) {
+        throw new Error('Cannot sort a set without a comparator');
       }
-      if (!options.silent) this.trigger('reset', this, options);
+
+      if (_.isString(this.comparator) || this.comparator.length === 1) {
+        this.models = this.sortBy(this.comparator, this);
+      } else {
+        this.models.sort(_.bind(this.comparator, this));
+      }
+
+      if (!options || !options.silent) this.trigger('reset', this, options);
       return this;
     },
 
     // Pluck an attribute from each model in the collection.
     pluck: function(attr) {
-      return _.map(this.models, function(model){ return model.get(attr); });
+      return _.invoke(this.models, 'get', attr);
     },
 
     // When you have more items than you want to add or remove individually,
     // you can reset the entire set with a new list of models, without firing
     // any `add` or `remove` events. Fires `reset` when finished.
     reset: function(models, options) {
-      models  || (models = []);
-      options || (options = {});
       for (var i = 0, l = this.models.length; i < l; i++) {
         this._removeReference(this.models[i]);
       }
       this._reset();
-      this.add(models, _.extend({silent: true}, options));
-      if (!options.silent) this.trigger('reset', this, options);
+      if (models) this.add(models, _.extend({silent: true}, options));
+      if (!options || !options.silent) this.trigger('reset', this, options);
       return this;
     },
 
@@ -771,15 +772,13 @@
     // models to the collection instead of resetting.
     fetch: function(options) {
       options = options ? _.clone(options) : {};
-      if (options.parse === undefined) options.parse = true;
+      if (options.parse === void 0) options.parse = true;
       var collection = this;
       var success = options.success;
       options.success = function(resp, status, xhr) {
         collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
         if (success) success(collection, resp, options);
-        collection.trigger('sync', collection, resp, options);
       };
-      options.error = Backbone.wrapError(options.error, collection, options);
       return this.sync('read', this, options);
     },
 
@@ -787,14 +786,14 @@
     // collection immediately, unless `wait: true` is passed, in which case we
     // wait for the server to agree.
     create: function(model, options) {
-      var coll = this;
+      var collection = this;
       options = options ? _.clone(options) : {};
       model = this._prepareModel(model, options);
       if (!model) return false;
-      if (!options.wait) coll.add(model, options);
+      if (!options.wait) collection.add(model, options);
       var success = options.success;
       options.success = function(model, resp, options) {
-        if (options.wait) coll.add(model, options);
+        if (options.wait) collection.add(model, options);
         if (success) success(model, resp, options);
       };
       model.save(null, options);
@@ -842,9 +841,7 @@
 
     // Internal method to remove a model's ties to a collection.
     _removeReference: function(model) {
-      if (this == model.collection) {
-        delete model.collection;
-      }
+      if (this === model.collection) delete model.collection;
       model.off('all', this._onModelEvent, this);
     },
 
@@ -853,10 +850,8 @@
     // events simply proxy through. "add" and "remove" events that originate
     // in other collections are ignored.
     _onModelEvent: function(event, model, collection, options) {
-      if ((event == 'add' || event == 'remove') && collection != this) return;
-      if (event == 'destroy') {
-        this.remove(model, options);
-      }
+      if ((event === 'add' || event === 'remove') && collection !== this) return;
+      if (event === 'destroy') this.remove(model, options);
       if (model && event === 'change:' + model.idAttribute) {
         delete this._byId[model.previous(model.idAttribute)];
         if (model.id != null) this._byId[model.id] = model;
@@ -867,16 +862,32 @@
   });
 
   // Underscore methods that we want to implement on the Collection.
-  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find',
-    'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any',
-    'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex',
-    'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf',
-    'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy'];
+  var methods = ['forEach', 'each', 'map', 'collect', 'reduce', 'foldl',
+    'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select',
+    'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',
+    'max', 'min', 'sortedIndex', 'toArray', 'size', 'first', 'head', 'take',
+    'initial', 'rest', 'tail', 'last', 'without', 'indexOf', 'shuffle',
+    'lastIndexOf', 'isEmpty'];
 
   // Mix in each Underscore method as a proxy to `Collection#models`.
   _.each(methods, function(method) {
     Collection.prototype[method] = function() {
-      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
+      var args = slice.call(arguments);
+      args.unshift(this.models);
+      return _[method].apply(_, args);
+    };
+  });
+
+  // Underscore methods that take a property name as an argument.
+  var attributeMethods = ['groupBy', 'countBy', 'sortBy'];
+
+  // Use attributes instead of properties.
+  _.each(attributeMethods, function(method) {
+    Collection.prototype[method] = function(value, context) {
+      var iterator = _.isFunction(value) ? value : function(model) {
+        return model.get(value);
+      };
+      return _[method](this.models, iterator, context);
     };
   });
 
@@ -894,9 +905,10 @@
 
   // Cached regular expressions for matching named param parts and splatted
   // parts of route strings.
+  var optionalParam = /\((.*?)\)/g;
   var namedParam    = /:\w+/g;
   var splatParam    = /\*\w+/g;
-  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
+  var escapeRegExp  = /[-{}[\]+?.,\\^$|#\s]/g;
 
   // Set up all inheritable **Backbone.Router** properties and methods.
   _.extend(Router.prototype, Events, {
@@ -912,7 +924,6 @@
     //     });
     //
     route: function(route, name, callback) {
-      Backbone.history || (Backbone.history = new History);
       if (!_.isRegExp(route)) route = this._routeToRegExp(route);
       if (!callback) callback = this[name];
       Backbone.history.route(route, _.bind(function(fragment) {
@@ -927,6 +938,7 @@
     // Simple proxy to `Backbone.history` to save a fragment into the history.
     navigate: function(fragment, options) {
       Backbone.history.navigate(fragment, options);
+      return this;
     },
 
     // Bind all defined routes to `Backbone.history`. We have to reverse the
@@ -947,6 +959,7 @@
     // against the current location hash.
     _routeToRegExp: function(route) {
       route = route.replace(escapeRegExp, '\\$&')
+                   .replace(optionalParam, '(?:$1)?')
                    .replace(namedParam, '([^\/]+)')
                    .replace(splatParam, '(.*?)');
       return new RegExp('^' + route + '$');
@@ -965,16 +978,23 @@
 
   // Handles cross-browser history management, based on URL fragments. If the
   // browser does not support `onhashchange`, falls back to polling.
-  var History = Backbone.History = function(options) {
+  var History = Backbone.History = function() {
     this.handlers = [];
     _.bindAll(this, 'checkUrl');
-    this.location = options && options.location || root.location;
-    this.history = options && options.history || root.history;
+
+    // #1653 - Ensure that `History` can be used outside of the browser.
+    if (typeof window !== 'undefined') {
+      this.location = window.location;
+      this.history = window.history;
+    }
   };
 
-  // Cached regex for cleaning leading hashes and slashes .
+  // Cached regex for cleaning leading hashes and slashes.
   var routeStripper = /^[#\/]/;
 
+  // Cached regex for stripping leading and trailing slashes.
+  var rootStripper = /^\/+|\/+$/g;
+
   // Cached regex for detecting MSIE.
   var isExplorer = /msie [\w.]+/;
 
@@ -1004,7 +1024,7 @@
       if (fragment == null) {
         if (this._hasPushState || !this._wantsHashChange || forcePushState) {
           fragment = this.location.pathname;
-          var root = this.options.root.replace(trailingSlash, '');
+          var root = this.root.replace(trailingSlash, '');
           if (!fragment.indexOf(root)) fragment = fragment.substr(root.length);
         } else {
           fragment = this.getHash();
@@ -1022,6 +1042,7 @@
       // Figure out the initial configuration. Do we need an iframe?
       // Is pushState desired ... is it available?
       this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this.root             = this.options.root;
       this._wantsHashChange = this.options.hashChange !== false;
       this._wantsPushState  = !!this.options.pushState;
       this._hasPushState    = !!(this.options.pushState && this.history && this.history.pushState);
@@ -1029,6 +1050,9 @@
       var docMode           = document.documentMode;
       var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
 
+      // Normalize root to always include a leading and trailing slash.
+      this.root = ('/' + this.root + '/').replace(rootStripper, '/');
+
       if (oldIE && this._wantsHashChange) {
         this.iframe = Backbone.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
         this.navigate(fragment);
@@ -1048,13 +1072,13 @@
       // opened by a non-pushState browser.
       this.fragment = fragment;
       var loc = this.location;
-      var atRoot  = (loc.pathname == this.options.root) && !loc.search;
+      var atRoot = loc.pathname.replace(/[^\/]$/, '$&/') === this.root;
 
       // If we've started off with a route from a `pushState`-enabled browser,
       // but we're currently in a browser that doesn't support it...
       if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
         this.fragment = this.getFragment(null, true);
-        this.location.replace(this.options.root + this.location.search + '#' + this.fragment);
+        this.location.replace(this.root + this.location.search + '#' + this.fragment);
         // Return immediately as browser will do redirect to new url
         return true;
 
@@ -1062,12 +1086,10 @@
       // in a browser where it could be `pushState`-based instead...
       } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
         this.fragment = this.getHash().replace(routeStripper, '');
-        this.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
+        this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
       }
 
-      if (!this.options.silent) {
-        return this.loadUrl();
-      }
+      if (!this.options.silent) return this.loadUrl();
     },
 
     // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
@@ -1088,10 +1110,10 @@
     // calls `loadUrl`, normalizing across the hidden iframe.
     checkUrl: function(e) {
       var current = this.getFragment();
-      if (current == this.fragment && this.iframe) {
+      if (current === this.fragment && this.iframe) {
         current = this.getFragment(this.getHash(this.iframe));
       }
-      if (current == this.fragment) return false;
+      if (current === this.fragment) return false;
       if (this.iframe) this.navigate(current);
       this.loadUrl() || this.loadUrl(this.getHash());
     },
@@ -1120,10 +1142,10 @@
     navigate: function(fragment, options) {
       if (!History.started) return false;
       if (!options || options === true) options = {trigger: options};
-      var frag = (fragment || '').replace(routeStripper, '');
-      if (this.fragment == frag) return;
-      this.fragment = frag;
-      var url = (frag.indexOf(this.options.root) != 0 ? this.options.root : '') + frag;
+      fragment = this.getFragment(fragment || '');
+      if (this.fragment === fragment) return;
+      this.fragment = fragment;
+      var url = this.root + fragment;
 
       // If pushState is available, we use it to set the fragment as a real URL.
       if (this._hasPushState) {
@@ -1132,13 +1154,13 @@
       // If hash changes haven't been explicitly disabled, update the hash
       // fragment to store history.
       } else if (this._wantsHashChange) {
-        this._updateHash(this.location, frag, options.replace);
-        if (this.iframe && (frag != this.getFragment(this.getHash(this.iframe)))) {
+        this._updateHash(this.location, fragment, options.replace);
+        if (this.iframe && (fragment !== this.getFragment(this.getHash(this.iframe)))) {
           // Opening and closing the iframe tricks IE7 and earlier to push a
           // history entry on hash-tag change.  When replace is true, we don't
           // want this.
           if(!options.replace) this.iframe.document.open().close();
-          this._updateHash(this.iframe.location, frag, options.replace);
+          this._updateHash(this.iframe.location, fragment, options.replace);
         }
 
       // If you've told us that you explicitly don't want fallback hashchange-
@@ -1153,13 +1175,19 @@
     // a new one to the browser history.
     _updateHash: function(location, fragment, replace) {
       if (replace) {
-        location.replace(location.href.replace(/(javascript:|#).*$/, '') + '#' + fragment);
+        var href = location.href.replace(/(javascript:|#).*$/, '');
+        location.replace(href + '#' + fragment);
       } else {
-        location.hash = fragment;
+        // #1649 - Some browsers require that `hash` contains a leading #.
+        location.hash = '#' + fragment;
       }
     }
+
   });
 
+  // Create the default Backbone.history.
+  Backbone.history = new History;
+
   // Backbone.View
   // -------------
 
@@ -1202,9 +1230,19 @@
       return this;
     },
 
+    // Clean up references to this view in order to prevent latent effects and
+    // memory leaks.
+    dispose: function() {
+      this.undelegateEvents();
+      if (this.model && this.model.off) this.model.off(null, null, this);
+      if (this.collection && this.collection.off) this.collection.off(null, null, this);
+      return this;
+    },
+
     // Remove this view from the DOM. Note that the view isn't present in the
     // DOM by default, so calling this method may be a no-op.
     remove: function() {
+      this.dispose();
       this.$el.remove();
       return this;
     },
@@ -1247,7 +1285,7 @@
     // This only works for delegate-able events: not `focus`, `blur`, and
     // not `change`, `submit`, and `reset` in Internet Explorer.
     delegateEvents: function(events) {
-      if (!(events || (events = getValue(this, 'events')))) return;
+      if (!(events || (events = _.result(this, 'events')))) return;
       this.undelegateEvents();
       for (var key in events) {
         var method = events[key];
@@ -1290,27 +1328,17 @@
     // an element from the `id`, `className` and `tagName` properties.
     _ensureElement: function() {
       if (!this.el) {
-        var attrs = _.extend({}, getValue(this, 'attributes'));
-        if (this.id) attrs.id = this.id;
-        if (this.className) attrs['class'] = this.className;
-        this.setElement(this.make(getValue(this, 'tagName'), attrs), false);
+        var attrs = _.extend({}, _.result(this, 'attributes'));
+        if (this.id) attrs.id = _.result(this, 'id');
+        if (this.className) attrs['class'] = _.result(this, 'className');
+        this.setElement(this.make(_.result(this, 'tagName'), attrs), false);
       } else {
-        this.setElement(this.el, false);
+        this.setElement(_.result(this, 'el'), false);
       }
     }
 
   });
 
-  // The self-propagating extend function that Backbone classes use.
-  var extend = function(protoProps, classProps) {
-    var child = inherits(this, protoProps, classProps);
-    child.extend = this.extend;
-    return child;
-  };
-
-  // Set up inheritance for the model, collection, and view.
-  Model.extend = Collection.extend = Router.extend = View.extend = extend;
-
   // Backbone.sync
   // -------------
 
@@ -1348,11 +1376,11 @@
 
     // Ensure that we have a URL.
     if (!options.url) {
-      params.url = getValue(model, 'url') || urlError();
+      params.url = _.result(model, 'url') || urlError();
     }
 
     // Ensure that we have the appropriate request data.
-    if (!options.data && model && (method == 'create' || method == 'update')) {
+    if (!options.data && model && (method === 'create' || method === 'update')) {
       params.contentType = 'application/json';
       params.data = JSON.stringify(model);
     }
@@ -1380,6 +1408,18 @@
       params.processData = false;
     }
 
+    var success = options.success;
+    options.success = function(resp, status, xhr) {
+      if (success) success(resp, status, xhr);
+      model.trigger('sync', model, resp, options);
+    };
+
+    var error = options.error;
+    options.error = function(xhr, status, thrown) {
+      if (error) error(model, xhr, options);
+      model.trigger('error', model, xhr, options);
+    };
+
     // Make the request, allowing the user to override any Ajax options.
     return Backbone.ajax(_.extend(params, options));
   };
@@ -1389,69 +1429,47 @@
     return Backbone.$.ajax.apply(Backbone.$, arguments);
   };
 
-  // Wrap an optional error callback with a fallback error event.
-  Backbone.wrapError = function(onError, originalModel, options) {
-    return function(model, resp) {
-      resp = model === originalModel ? resp : model;
-      if (onError) {
-        onError(originalModel, resp, options);
-      } else {
-        originalModel.trigger('error', originalModel, resp, options);
-      }
-    };
-  };
-
   // Helpers
   // -------
 
-  // Shared empty constructor function to aid in prototype-chain creation.
-  var ctor = function(){};
-
   // Helper function to correctly set up the prototype chain, for subclasses.
   // Similar to `goog.inherits`, but uses a hash of prototype properties and
   // class properties to be extended.
-  var inherits = function(parent, protoProps, staticProps) {
+  var extend = function(protoProps, staticProps) {
+    var parent = this;
     var child;
 
     // The constructor function for the new subclass is either defined by you
     // (the "constructor" property in your `extend` definition), or defaulted
     // by us to simply call the parent's constructor.
-    if (protoProps && protoProps.hasOwnProperty('constructor')) {
+    if (protoProps && _.has(protoProps, 'constructor')) {
       child = protoProps.constructor;
     } else {
       child = function(){ parent.apply(this, arguments); };
     }
 
-    // Inherit class (static) properties from parent.
-    _.extend(child, parent);
+    // Add static properties to the constructor function, if supplied.
+    _.extend(child, parent, staticProps);
 
     // Set the prototype chain to inherit from `parent`, without calling
     // `parent`'s constructor function.
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor();
+    var Surrogate = function(){ this.constructor = child; };
+    Surrogate.prototype = parent.prototype;
+    child.prototype = new Surrogate;
 
     // Add prototype properties (instance properties) to the subclass,
     // if supplied.
     if (protoProps) _.extend(child.prototype, protoProps);
 
-    // Add static properties to the constructor function, if supplied.
-    if (staticProps) _.extend(child, staticProps);
-
-    // Correctly set child's `prototype.constructor`.
-    child.prototype.constructor = child;
-
-    // Set a convenience property in case the parent's prototype is needed later.
+    // Set a convenience property in case the parent's prototype is needed
+    // later.
     child.__super__ = parent.prototype;
 
     return child;
   };
 
-  // Helper function to get a value from a Backbone object as a property
-  // or as a function.
-  var getValue = function(object, prop) {
-    if (!(object && object[prop])) return null;
-    return _.isFunction(object[prop]) ? object[prop]() : object[prop];
-  };
+  // Set up inheritance for the model, collection, router, and view.
+  Model.extend = Collection.extend = Router.extend = View.extend = extend;
 
   // Throw an error when a URL is needed, and none is supplied.
   var urlError = function() {

vendor/backbone/test/collection.js

@@ -1,13 +1,12 @@
 $(document).ready(function() {
 
-  var lastRequest = null;
-  var sync = Backbone.sync;
-
   var a, b, c, d, e, col, otherCol;
 
-  module("Backbone.Collection", {
+  module("Backbone.Collection", _.extend(new Environment, {
 
     setup: function() {
+      Environment.prototype.setup.apply(this, arguments);
+
       a         = new Backbone.Model({id: 3, label: 'a'});
       b         = new Backbone.Model({id: 2, label: 'b'});
       c         = new Backbone.Model({id: 1, label: 'c'});
@@ -15,23 +14,11 @@ $(document).ready(function() {
       e         = null;
       col       = new Backbone.Collection([a,b,c,d]);
       otherCol  = new Backbone.Collection();
-
-      Backbone.sync = function(method, model, options) {
-        lastRequest = {
-          method: method,
-          model: model,
-          options: options
-        };
-      };
-    },
-
-    teardown: function() {
-      Backbone.sync = sync;
     }
 
-  });
+  }));
 
-  test("Collection: new and sort", 7, function() {
+  test("new and sort", 7, function() {
     equal(col.first(), a, "a should be first");
     equal(col.last(), d, "d should be last");
     col.comparator = function(a, b) {
@@ -47,13 +34,37 @@ $(document).ready(function() {
     equal(col.length, 4);
   });
 
-  test("Collection: get, getByCid", 3, function() {
+  test("String comparator.", 1, function() {
+    var collection = new Backbone.Collection([
+      {id: 3},
+      {id: 1},
+      {id: 2}
+    ], {comparator: 'id'});
+    deepEqual(collection.pluck('id'), [1, 2, 3]);
+  });
+
+  test("new and parse", 3, function() {
+    var Collection = Backbone.Collection.extend({
+      parse : function(data) {
+        return _.filter(data, function(datum) {
+          return datum.a % 2 === 0;
+        });
+      }
+    });
+    var models = [{a: 1}, {a: 2}, {a: 3}, {a: 4}];
+    var collection = new Collection(models, {parse: true});
+    strictEqual(collection.length, 2);
+    strictEqual(collection.first().get('a'), 2);
+    strictEqual(collection.last().get('a'), 4);
+  });
+
+  test("get, getByCid", 3, function() {
     equal(col.get(0), d);
     equal(col.get(2), b);
     equal(col.getByCid(col.first().cid), col.first());
   });
 
-  test("Collection: get with non-default ids", 2, function() {
+  test("get with non-default ids", 2, function() {
     var col = new Backbone.Collection();
     var MongoModel = Backbone.Model.extend({
       idAttribute: '_id'
@@ -65,7 +76,7 @@ $(document).ready(function() {
     equal(col.get(101), model);
   });
 
-  test("Collection: update index when id changes", 3, function() {
+  test("update index when id changes", 3, function() {
     var col = new Backbone.Collection();
     col.add([
       {id : 0, name : 'one'},
@@ -78,15 +89,15 @@ $(document).ready(function() {
     equal(col.get(101).get('name'), 'one');
   });
 
-  test("Collection: at", 1, function() {
+  test("at", 1, function() {
     equal(col.at(2), c);
   });
 
-  test("Collection: pluck", 1, function() {
+  test("pluck", 1, function() {
     equal(col.pluck('label').join(' '), 'a b c d');
   });
 
-  test("Collection: add", 11, function() {
+  test("add", 10, function() {
     var added, opts, secondAdded;
     added = opts = secondAdded = null;
     e = new Backbone.Model({id: 10, label : 'e'});
@@ -96,7 +107,6 @@ $(document).ready(function() {
     });
     col.on('add', function(model, collection, options){
       added = model.get('label');
-      equal(options.index, 4);
       opts = options;
     });
     col.add(e, {amazing: true});
@@ -118,7 +128,7 @@ $(document).ready(function() {
     equal(atCol.last(), h);
   });
 
-  test("Collection: add multiple models", 6, function() {
+  test("add multiple models", 6, function() {
     var col = new Backbone.Collection([{at: 0}, {at: 1}, {at: 9}]);
     col.add([{at: 2}, {at: 3}, {at: 4}, {at: 5}, {at: 6}, {at: 7}, {at: 8}], {at: 2});
     for (var i = 0; i <= 5; i++) {
@@ -126,7 +136,7 @@ $(document).ready(function() {
     }
   });
 
-  test("Collection: add; at should have preference over comparator", 1, function() {
+  test("add; at should have preference over comparator", 1, function() {
     var Col = Backbone.Collection.extend({
       comparator: function(a,b) {
         return a.id > b.id ? -1 : 1;
@@ -139,19 +149,19 @@ $(document).ready(function() {
     equal(col.pluck('id').join(' '), '3 1 2');
   });
 
-  test("Collection: can't add model to collection twice", function() {
+  test("can't add model to collection twice", function() {
     var col = new Backbone.Collection([{id: 1}, {id: 2}, {id: 1}, {id: 2}, {id: 3}]);
     equal(col.pluck('id').join(' '), '1 2 3');
   });
 
-  test("Collection: can't add different model with same id to collection twice", 1, function() {
+  test("can't add different model with same id to collection twice", 1, function() {
     var col = new Backbone.Collection;
     col.unshift({id: 101});
     col.add({id: 101});
     equal(col.length, 1);
   });
 
-  test("Collection: merge in duplicate models with {merge: true}", 3, function() {
+  test("merge in duplicate models with {merge: true}", 3, function() {
     var col = new Backbone.Collection;
     col.add([{id: 1, name: 'Moe'}, {id: 2, name: 'Curly'}, {id: 3, name: 'Larry'}]);
     col.add({id: 1, name: 'Moses'});
@@ -162,7 +172,7 @@ $(document).ready(function() {
     equal(col.first().get('name'), 'Tim');
   });
 
-  test("Collection: add model to multiple collections", 10, function() {
+  test("add model to multiple collections", 10, function() {
     var counter = 0;
     var e = new Backbone.Model({id: 10, label : 'e'});
     e.on('add', function(model, collection) {
@@ -190,7 +200,7 @@ $(document).ready(function() {
     equal(e.collection, colE);
   });
 
-  test("Collection: add model with parse", 1, function() {
+  test("add model with parse", 1, function() {
     var Model = Backbone.Model.extend({
       parse: function(obj) {
         obj.value += 1;
@@ -204,7 +214,7 @@ $(document).ready(function() {
     equal(col.at(0).get('value'), 2);
   });
 
-  test("Collection: add model to collection with sort()-style comparator", 3, function() {
+  test("add model to collection with sort()-style comparator", 3, function() {
     var col = new Backbone.Collection;
     col.comparator = function(a, b) {
       return a.get('name') < b.get('name') ? -1 : 1;
@@ -220,7 +230,7 @@ $(document).ready(function() {
     equal(col.indexOf(tom), 2);
   });
 
-  test("Collection: comparator that depends on `this`", 1, function() {
+  test("comparator that depends on `this`", 2, function() {
     var col = new Backbone.Collection;
     col.negative = function(num) {
       return -num;
@@ -229,10 +239,15 @@ $(document).ready(function() {
       return this.negative(a.id);
     };
     col.add([{id: 1}, {id: 2}, {id: 3}]);
-    equal(col.pluck('id').join(' '), '3 2 1');
+    deepEqual(col.pluck('id'), [3, 2, 1]);
+    col.comparator = function(a, b) {
+      return this.negative(b.id) - this.negative(a.id);
+    };
+    col.sort();
+    deepEqual(col.pluck('id'), [1, 2, 3]);
   });
 
-  test("Collection: remove", 5, function() {
+  test("remove", 5, function() {
     var removed = null;
     var otherRemoved = null;
     col.on('remove', function(model, col, options) {
@@ -249,20 +264,20 @@ $(document).ready(function() {
     equal(otherRemoved, null);
   });
 
-  test("Collection: shift and pop", 2, function() {
+  test("shift and pop", 2, function() {
     var col = new Backbone.Collection([{a: 'a'}, {b: 'b'}, {c: 'c'}]);
     equal(col.shift().get('a'), 'a');
     equal(col.pop().get('c'), 'c');
   });
 
-  test("Collection: slice", 2, function() {
+  test("slice", 2, function() {
     var col = new Backbone.Collection([{a: 'a'}, {b: 'b'}, {c: 'c'}]);
     var array = col.slice(1, 3);
     equal(array.length, 2);
     equal(array[0].get('b'), 'b');
   });
 
-  test("Collection: events are unbound on remove", 3, function() {
+  test("events are unbound on remove", 3, function() {
     var counter = 0;
     var dj = new Backbone.Model();
     var emcees = new Backbone.Collection([dj]);
@@ -275,7 +290,7 @@ $(document).ready(function() {
     equal(counter, 1);
   });
 
-  test("Collection: remove in multiple collections", 7, function() {
+  test("remove in multiple collections", 7, function() {
     var modelData = {
       id : 5,
       title : 'Othello'
@@ -299,7 +314,7 @@ $(document).ready(function() {
     equal(passed, true);
   });
 
-  test("Collection: remove same model in multiple collection", 16, function() {
+  test("remove same model in multiple collection", 16, function() {
     var counter = 0;
     var e = new Backbone.Model({id: 5, title: 'Othello'});
     e.on('remove', function(model, collection) {
@@ -333,7 +348,7 @@ $(document).ready(function() {
     equal(counter, 2);
   });
 
-  test("Collection: model destroy removes from all collections", 3, function() {
+  test("model destroy removes from all collections", 3, function() {
     var e = new Backbone.Model({id: 5, title: 'Othello'});
     e.sync = function(method, model, options) { options.success({}); };
     var colE = new Backbone.Collection([e]);
@@ -355,25 +370,29 @@ $(document).ready(function() {
     equal(undefined, e.collection);
   });
 
-  test("Collection: fetch", 4, function() {
-    col.fetch();
-    equal(lastRequest.method, 'read');
-    equal(lastRequest.model, col);
-    equal(lastRequest.options.parse, true);
+  test("fetch", 4, function() {
+    var collection = new Backbone.Collection;
+    collection.url = '/test';
+    collection.fetch();
+    equal(this.syncArgs.method, 'read');
+    equal(this.syncArgs.model, collection);
+    equal(this.syncArgs.options.parse, true);
 
-    col.fetch({parse: false});
-    equal(lastRequest.options.parse, false);
+    collection.fetch({parse: false});
+    equal(this.syncArgs.options.parse, false);
   });
 
-  test("Collection: create", 4, function() {
-    var model = col.create({label: 'f'}, {wait: true});
-    equal(lastRequest.method, 'create');
-    equal(lastRequest.model, model);
+  test("create", 4, function() {
+    var collection = new Backbone.Collection;
+    collection.url = '/test';
+    var model = collection.create({label: 'f'}, {wait: true});
+    equal(this.syncArgs.method, 'create');
+    equal(this.syncArgs.model, model);
     equal(model.get('label'), 'f');
-    equal(model.collection, col);
+    equal(model.collection, collection);
   });
 
-  test("Collection: create enforces validation", 1, function() {
+  test("create enforces validation", 1, function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
         return "fail";
@@ -386,7 +405,7 @@ $(document).ready(function() {
     equal(col.create({"foo":"bar"}), false);
   });
 
-  test("Collection: a failing create runs the error callback", 1, function() {
+  test("a failing create runs the error callback", 1, function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
         return "fail";
@@ -402,7 +421,7 @@ $(document).ready(function() {
     equal(flag, true);
   });
 
-  test("collection: initialize", 1, function() {
+  test("initialize", 1, function() {
     var Collection = Backbone.Collection.extend({
       initialize: function() {
         this.one = 1;
@@ -412,11 +431,11 @@ $(document).ready(function() {
     equal(coll.one, 1);
   });
 
-  test("Collection: toJSON", 1, function() {
+  test("toJSON", 1, function() {
     equal(JSON.stringify(col), '[{"id":3,"label":"a"},{"id":2,"label":"b"},{"id":1,"label":"c"},{"id":0,"label":"d"}]');
   });
 
-  test("Collection: where", 6, function() {
+  test("where", 6, function() {
     var coll = new Backbone.Collection([
       {a: 1},
       {a: 1},
@@ -432,7 +451,7 @@ $(document).ready(function() {
     equal(coll.where({a: 1, b: 2}).length, 1);
   });
 
-  test("Collection: Underscore methods", 13, function() {
+  test("Underscore methods", 13, function() {
     equal(col.map(function(model){ return model.get('label'); }).join(' '), 'a b c d');
     equal(col.any(function(model){ return model.id === 100; }), false);
     equal(col.any(function(model){ return model.id === 0; }), true);
@@ -452,7 +471,7 @@ $(document).ready(function() {
          [4, 0]);
   });
 
-  test("Collection: reset", 10, function() {
+  test("reset", 10, function() {
     var resetCount = 0;
     var models = col.models;
     col.on('reset', function() { resetCount += 1; });
@@ -471,7 +490,7 @@ $(document).ready(function() {
     ok(_.isEqual(col.last().attributes, d.attributes));
   });
 
-  test("Collection: reset passes caller options", 3, function() {
+  test("reset passes caller options", 3, function() {
     var Model = Backbone.Model.extend({
       initialize: function(attrs, options) {
         this.model_parameter = options.model_parameter;
@@ -485,14 +504,14 @@ $(document).ready(function() {
     });
   });
 
-  test("Collection: trigger custom events on models", 1, function() {
+  test("trigger custom events on models", 1, function() {
     var fired = null;
     a.on("custom", function() { fired = true; });
     a.trigger("custom");
     equal(fired, true);
   });
 
-  test("Collection: add does not alter arguments", 2, function(){
+  test("add does not alter arguments", 2, function(){
     var attrs = {};
     var models = [attrs];
     new Backbone.Collection().add(models);
@@ -501,16 +520,17 @@ $(document).ready(function() {
   });
 
   test("#714: access `model.collection` in a brand new model.", 2, function() {
-    var col = new Backbone.Collection;
+    var collection = new Backbone.Collection;
+    collection.url = '/test';
     var Model = Backbone.Model.extend({
       set: function(attrs) {
         equal(attrs.prop, 'value');
-        equal(this.collection, col);
+        equal(this.collection, collection);
         return this;
       }
     });
-    col.model = Model;
-    col.create({prop: 'value'});
+    collection.model = Model;
+    collection.create({prop: 'value'});
   });
 
   test("#574, remove its own reference to the .models array.", 2, function() {
@@ -542,24 +562,7 @@ $(document).ready(function() {
     });
   });
 
-  test("Collection: index with comparator", 4, function() {
-    var counter = 0;
-    var col = new Backbone.Collection([{id: 2}, {id: 4}], {
-      comparator: function(model){ return model.id; }
-    }).on('add', function(model, colleciton, options){
-      if (model.id == 1) {
-        equal(options.index, 0);
-        equal(counter++, 0);
-      }
-      if (model.id == 3) {
-        equal(options.index, 2);
-        equal(counter++, 1);
-      }
-    });
-    col.add([{id: 3}, {id: 1}]);
-  });
-
-  test("Collection: throwing during add leaves consistent state", 4, function() {
+  test("throwing during add leaves consistent state", 4, function() {
     var col = new Backbone.Collection();
     col.on('test', function() { ok(false); });
     col.model = Backbone.Model.extend({
@@ -573,7 +576,7 @@ $(document).ready(function() {
     equal(col.length, 0);
   });
 
-  test("Collection: multiple copies of the same model", 3, function() {
+  test("multiple copies of the same model", 3, function() {
     var col = new Backbone.Collection();
     var model = new Backbone.Model();
     col.add([model, model]);
@@ -606,7 +609,7 @@ $(document).ready(function() {
     ok(!collection.get('undefined'));
   });
 
-  test("Collection: falsy comparator", 4, function(){
+  test("falsy comparator", 4, function(){
     var Col = Backbone.Collection.extend({
       comparator: function(model){ return model.id; }
     });
@@ -636,20 +639,15 @@ $(document).ready(function() {
   });
 
   test("#1412 - Trigger 'sync' event.", 2, function() {
-    var collection = new Backbone.Collection([], {
-      model: Backbone.Model.extend({
-        sync: function(method, model, options) {
-          options.success();
-        }
-      })
-    });
-    collection.sync = function(method, model, options) { options.success(); };
+    var collection = new Backbone.Collection;
+    collection.url = '/test';
     collection.on('sync', function() { ok(true); });
+    Backbone.ajax = function(settings){ settings.success(); };
     collection.fetch();
     collection.create({id: 1});
   });
 
-  test("#1447 - create with wait adds model.", function() {
+  test("#1447 - create with wait adds model.", 1, function() {
     var collection = new Backbone.Collection;
     var model = new Backbone.Model;
     model.sync = function(method, model, options){ options.success(); };
@@ -657,7 +655,7 @@ $(document).ready(function() {
     collection.create(model, {wait: true});
   });
 
-  test("#1448 - add sorts collection after merge.", function() {
+  test("#1448 - add sorts collection after merge.", 1, function() {
     var collection = new Backbone.Collection([
       {id: 1, x: 1},
       {id: 2, x: 2}
@@ -666,4 +664,41 @@ $(document).ready(function() {
     collection.add({id: 1, x: 3}, {merge: true});
     deepEqual(collection.pluck('id'), [2, 1]);
   });
+
+  test("#1655 - groupBy can be used with a string argument.", 3, function() {
+    var collection = new Backbone.Collection([{x: 1}, {x: 2}]);
+    var grouped = collection.groupBy('x');
+    strictEqual(_.keys(grouped).length, 2);
+    strictEqual(grouped[1][0].get('x'), 1);
+    strictEqual(grouped[2][0].get('x'), 2);
+  });
+
+  test("#1655 - sortBy can be used with a string argument.", 1, function() {
+    var collection = new Backbone.Collection([{x: 3}, {x: 1}, {x: 2}]);
+    var values = _.map(collection.sortBy('x'), function(model) {
+      return model.get('x');
+    });
+    deepEqual(values, [1, 2, 3]);
+  });
+
+  test("#1604 - Removal during iteration.", 0, function() {
+    var collection = new Backbone.Collection([{}, {}]);
+    collection.on('add', function() {
+      collection.at(0).destroy();
+    });
+    collection.add({}, {at: 0});
+  });
+
+  test("#1638 - `sort` during `add` triggers correctly.", function() {
+    var collection = new Backbone.Collection;
+    collection.comparator = function(model) { return model.get('x'); };
+    var added = [];
+    collection.on('add', function(model) {
+      model.set({x: 3});
+      collection.sort();
+      added.push(model.id);
+    });
+    collection.add([{id: 1, x: 1}, {id: 2, x: 2}]);
+    deepEqual(added, [1, 2]);
+  });
 });

vendor/backbone/test/environment.js

@@ -0,0 +1,39 @@
+(function() {
+
+  var Environment = this.Environment = function(){};
+
+  _.extend(Environment.prototype, {
+
+    ajax: Backbone.ajax,
+
+    sync: Backbone.sync,
+
+    setup: function() {
+      var env = this;
+
+      // Capture ajax settings for comparison.
+      Backbone.ajax = function(settings) {
+        env.ajaxSettings = settings;
+      };
+
+      // Capture the arguments to Backbone.sync for comparison.
+      Backbone.sync = function(method, model, options) {
+        env.syncArgs = {
+          method: method,
+          model: model,
+          options: options
+        };
+        env.sync.apply(this, arguments);
+      };
+    },
+
+    teardown: function() {
+      this.syncArgs = null;
+      this.ajaxSettings = null;
+      Backbone.sync = this.sync;
+      Backbone.ajax = this.ajax;
+    }
+
+  });
+
+})();

vendor/backbone/test/events.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Backbone.Events");
 
-  test("Events: on and trigger", 2, function() {
+  test("on and trigger", 2, function() {
     var obj = { counter: 0 };
     _.extend(obj,Backbone.Events);
     obj.on('event', function() { obj.counter += 1; });
@@ -15,7 +15,7 @@ $(document).ready(function() {
     equal(obj.counter, 5, 'counter should be incremented five times.');
   });
 
-  test("Events: binding and triggering multiple events", 4, function() {
+  test("binding and triggering multiple events", 4, function() {
     var obj = { counter: 0 };
     _.extend(obj,Backbone.Events);
 
@@ -35,7 +35,7 @@ $(document).ready(function() {
     equal(obj.counter, 5);
   });
 
-  test("Events: trigger all for each event", 3, function() {
+  test("trigger all for each event", 3, function() {
     var a, b, obj = { counter: 0 };
     _.extend(obj, Backbone.Events);
     obj.on('all', function(event) {
@@ -49,7 +49,7 @@ $(document).ready(function() {
     equal(obj.counter, 2);
   });
 
-  test("Events: on, then unbind all functions", 1, function() {
+  test("on, then unbind all functions", 1, function() {
     var obj = { counter: 0 };
     _.extend(obj,Backbone.Events);
     var callback = function() { obj.counter += 1; };
@@ -60,7 +60,7 @@ $(document).ready(function() {
     equal(obj.counter, 1, 'counter should have only been incremented once.');
   });
 
-  test("Events: bind two callbacks, unbind only one", 2, function() {
+  test("bind two callbacks, unbind only one", 2, function() {
     var obj = { counterA: 0, counterB: 0 };
     _.extend(obj,Backbone.Events);
     var callback = function() { obj.counterA += 1; };
@@ -73,7 +73,7 @@ $(document).ready(function() {
     equal(obj.counterB, 2, 'counterB should have been incremented twice.');
   });
 
-  test("Events: unbind a callback in the midst of it firing", 1, function() {
+  test("unbind a callback in the midst of it firing", 1, function() {
     var obj = {counter: 0};
     _.extend(obj, Backbone.Events);
     var callback = function() {
@@ -87,7 +87,7 @@ $(document).ready(function() {
     equal(obj.counter, 1, 'the callback should have been unbound.');
   });
 
-  test("Events: two binds that unbind themeselves", 2, function() {
+  test("two binds that unbind themeselves", 2, function() {
     var obj = { counterA: 0, counterB: 0 };
     _.extend(obj,Backbone.Events);
     var incrA = function(){ obj.counterA += 1; obj.off('event', incrA); };
@@ -101,7 +101,7 @@ $(document).ready(function() {
     equal(obj.counterB, 1, 'counterB should have only been incremented once.');
   });
 
-  test("Events: bind a callback with a supplied context", 1, function () {
+  test("bind a callback with a supplied context", 1, function () {
     var TestClass = function () {
       return this;
     };
@@ -114,7 +114,7 @@ $(document).ready(function() {
     obj.trigger('event');
   });
 
-  test("Events: nested trigger with unbind", 1, function () {
+  test("nested trigger with unbind", 1, function () {
     var obj = { counter: 0 };
     _.extend(obj, Backbone.Events);
     var incr1 = function(){ obj.counter += 1; obj.off('event', incr1); obj.trigger('event'); };
@@ -125,7 +125,7 @@ $(document).ready(function() {
     equal(obj.counter, 3, 'counter should have been incremented three times');
   });
 
-  test("Events: callback list is not altered during trigger", 2, function () {
+  test("callback list is not altered during trigger", 2, function () {
     var counter = 0, obj = _.extend({}, Backbone.Events);
     var incr = function(){ counter++; };
     obj.on('event', function(){ obj.on('event', incr).on('all', incr); })

vendor/backbone/test/model.js

@@ -1,22 +1,15 @@
 $(document).ready(function() {
 
-  // Variable to catch the last request.
-  var lastRequest = null;
-  // Variable to catch ajax params.
-  var ajaxParams = null;
-  var sync = Backbone.sync;
-  var ajax = Backbone.ajax;
-  var urlRoot = null;
-
   var proxy = Backbone.Model.extend();
   var klass = Backbone.Collection.extend({
     url : function() { return '/collection'; }
   });
   var doc, collection;
 
-  module("Backbone.Model", {
+  module("Backbone.Model", _.extend(new Environment, {
 
     setup: function() {
+      Environment.prototype.setup.apply(this, arguments);
       doc = new proxy({
         id     : '1-the-tempest',
         title  : "The Tempest",
@@ -25,29 +18,11 @@ $(document).ready(function() {
       });
       collection = new klass();
       collection.add(doc);
-
-      Backbone.sync = function(method, model, options) {
-        lastRequest = {
-          method: method,
-          model: model,
-          options: options
-        };
-        sync.apply(this, arguments);
-      };
-      Backbone.ajax = function(params) { ajaxParams = params; };
-      urlRoot = Backbone.Model.prototype.urlRoot;
-      Backbone.Model.prototype.urlRoot = '/';
-    },
-
-    teardown: function() {
-      Backbone.sync = sync;
-      Backbone.ajax = ajax;
-      Backbone.Model.prototype.urlRoot = urlRoot;
     }
 
-  });
+  }));
 
-  test("Model: initialize", 3, function() {
+  test("initialize", 3, function() {
     var Model = Backbone.Model.extend({
       initialize: function() {
         this.one = 1;
@@ -59,7 +34,7 @@ $(document).ready(function() {
     equal(model.collection, collection);
   });
 
-  test("Model: initialize with attributes and options", 1, function() {
+  test("initialize with attributes and options", 1, function() {
     var Model = Backbone.Model.extend({
       initialize: function(attributes, options) {
         this.one = options.one;
@@ -69,7 +44,7 @@ $(document).ready(function() {
     equal(model.one, 1);
   });
 
-  test("Model: initialize with parsed attributes", 1, function() {
+  test("initialize with parsed attributes", 1, function() {
     var Model = Backbone.Model.extend({
       parse: function(obj) {
         obj.value += 1;
@@ -80,7 +55,7 @@ $(document).ready(function() {
     equal(model.get('value'), 2);
   });
 
-  test("Model: url", 3, function() {
+  test("url", 3, function() {
     doc.urlRoot = null;
     equal(doc.url(), '/collection/1-the-tempest');
     doc.collection.url = '/collection/';
@@ -90,7 +65,7 @@ $(document).ready(function() {
     doc.collection = collection;
   });
 
-  test("Model: url when using urlRoot, and uri encoding", 2, function() {
+  test("url when using urlRoot, and uri encoding", 2, function() {
     var Model = Backbone.Model.extend({
       urlRoot: '/collection'
     });
@@ -100,7 +75,7 @@ $(document).ready(function() {
     equal(model.url(), '/collection/%2B1%2B');
   });
 
-  test("Model: url when using urlRoot as a function to determine urlRoot at runtime", 2, function() {
+  test("url when using urlRoot as a function to determine urlRoot at runtime", 2, function() {
     var Model = Backbone.Model.extend({
       urlRoot: function() {
         return '/nested/' + this.get('parent_id') + '/collection';
@@ -113,7 +88,7 @@ $(document).ready(function() {
     equal(model.url(), '/nested/1/collection/2');
   });
 
-  test("Model: clone", 8, function() {
+  test("clone", 8, function() {
     var a = new Backbone.Model({ 'foo': 1, 'bar': 2, 'baz': 3});
     var b = a.clone();
     equal(a.get('foo'), 1);
@@ -127,7 +102,7 @@ $(document).ready(function() {
     equal(b.get('foo'), 1, "Changing a parent attribute does not change the clone.");
   });
 
-  test("Model: isNew", 6, function() {
+  test("isNew", 6, function() {
     var a = new Backbone.Model({ 'foo': 1, 'bar': 2, 'baz': 3});
     ok(a.isNew(), "it should be new");
     a = new Backbone.Model({ 'foo': 1, 'bar': 2, 'baz': 3, 'id': -5 });
@@ -139,12 +114,12 @@ $(document).ready(function() {
     ok(!new Backbone.Model({ 'id': -5 }).isNew(), "is false for a negative integer");
   });
 
-  test("Model: get", 2, function() {
+  test("get", 2, function() {
     equal(doc.get('title'), 'The Tempest');
     equal(doc.get('author'), 'Bill Shakespeare');
   });
 
-  test("Model: escape", 5, function() {
+  test("escape", 5, function() {
     equal(doc.escape('title'), 'The Tempest');
     doc.set({audience: 'Bill & Bob'});
     equal(doc.escape('audience'), 'Bill & Bob');
@@ -156,7 +131,7 @@ $(document).ready(function() {
     equal(doc.escape('audience'), '');
   });
 
-  test("Model: has", 10, function() {
+  test("has", 10, function() {
     var model = new Backbone.Model();
 
     strictEqual(model.has('name'), false);
@@ -186,7 +161,7 @@ $(document).ready(function() {
     strictEqual(model.has('undefined'), false);
   });
 
-  test("Model: set and unset", 8, function() {
+  test("set and unset", 8, function() {
     var a = new Backbone.Model({id: 'id', foo: 1, bar: 2, baz: 3});
     var changeCount = 0;
     a.on("change:foo", function() { changeCount += 1; });
@@ -209,7 +184,7 @@ $(document).ready(function() {
     equal(a.id, undefined, "Unsetting the id should remove the id property.");
   });
 
-  test("Model: multiple unsets", 1, function() {
+  test("multiple unsets", 1, function() {
     var i = 0;
     var counter = function(){ i++; };
     var model = new Backbone.Model({a: 1});
@@ -220,7 +195,7 @@ $(document).ready(function() {
     equal(i, 2, 'Unset does not fire an event for missing attributes.');
   });
 
-  test("Model: unset and changedAttributes", 2, function() {
+  test("unset and changedAttributes", 2, function() {
     var model = new Backbone.Model({a: 1});
     model.unset('a', {silent: true});
     var changedAttributes = model.changedAttributes();
@@ -230,7 +205,7 @@ $(document).ready(function() {
     ok('a' in changedAttributes, 'changedAttributes should contain unset properties when running changedAttributes again after an unset.');
   });
 
-  test("Model: using a non-default id attribute.", 5, function() {
+  test("using a non-default id attribute.", 5, function() {
     var MongoModel = Backbone.Model.extend({idAttribute : '_id'});
     var model = new MongoModel({id: 'eye-dee', _id: 25, title: 'Model'});
     equal(model.get('id'), 'eye-dee');
@@ -241,13 +216,13 @@ $(document).ready(function() {
     equal(model.isNew(), true);
   });
 
-  test("Model: set an empty string", 1, function() {
+  test("set an empty string", 1, function() {
     var model = new Backbone.Model({name : "Model"});
     model.set({name : ''});
     equal(model.get('name'), '');
   });
 
-  test("Model: clear", 3, function() {
+  test("clear", 3, function() {
     var changed;
     var model = new Backbone.Model({id: 1, name : "Model"});
     model.on("change:name", function(){ changed = true; });
@@ -260,7 +235,7 @@ $(document).ready(function() {
     equal(model.get('name'), undefined);
   });
 
-  test("Model: defaults", 4, function() {
+  test("defaults", 4, function() {
     var Defaulted = Backbone.Model.extend({
       defaults: {
         "one": 1,
@@ -283,7 +258,7 @@ $(document).ready(function() {
     equal(model.get('two'), null);
   });
 
-  test("Model: change, hasChanged, changedAttributes, previous, previousAttributes", 12, function() {
+  test("change, hasChanged, changedAttributes, previous, previousAttributes", 12, function() {
     var model = new Backbone.Model({name : "Tim", age : 10});
     equal(model.changedAttributes(), false);
     model.on('change', function() {
@@ -304,14 +279,14 @@ $(document).ready(function() {
 
   });
 
-  test("Model: changedAttributes", 3, function() {
+  test("changedAttributes", 3, function() {
     var model = new Backbone.Model({a: 'a', b: 'b'});
     equal(model.changedAttributes(), false);
     equal(model.changedAttributes({a: 'a'}), false);
     equal(model.changedAttributes({a: 'b'}).a, 'b');
   });
 
-  test("Model: change with options", 2, function() {
+  test("change with options", 2, function() {
     var value;
     var model = new Backbone.Model({name: 'Rob'});
     model.on('change', function(model, options) {
@@ -324,7 +299,7 @@ $(document).ready(function() {
     equal(value, 'Ms. Sue');
   });
 
-  test("Model: change after initialize", 1, function () {
+  test("change after initialize", 1, function () {
     var changed = 0;
     var attrs = {id: 1, label: 'c'};
     var obj = new Backbone.Model(attrs);
@@ -333,16 +308,18 @@ $(document).ready(function() {
     equal(changed, 0);
   });
 
-  test("Model: save within change event", 1, function () {
+  test("save within change event", 1, function () {
+    var env = this;
     var model = new Backbone.Model({firstName : "Taylor", lastName: "Swift"});
+    model.url = '/test';
     model.on('change', function () {
       model.save();
-      ok(_.isEqual(lastRequest.model, model));
+      ok(_.isEqual(env.syncArgs.model, model));
     });
     model.set({lastName: 'Hicks'});
   });
 
-  test("Model: validate after save", 1, function() {
+  test("validate after save", 1, function() {
     var lastError, model = new Backbone.Model();
     model.validate = function(attrs) {
       if (attrs.admin) return "Can't change admin status.";
@@ -357,7 +334,7 @@ $(document).ready(function() {
     equal(lastError, "Can't change admin status.");
   });
 
-  test("Model: isValid", 5, function() {
+  test("isValid", 5, function() {
     var model = new Backbone.Model({valid: true});
     model.validate = function(attrs) {
       if (!attrs.valid) return "invalid";
@@ -369,13 +346,13 @@ $(document).ready(function() {
     equal(model.isValid(), false);
   });
 
-  test("Model: save", 2, function() {
+  test("save", 2, function() {
     doc.save({title : "Henry V"});
-    equal(lastRequest.method, 'update');
-    ok(_.isEqual(lastRequest.model, doc));
+    equal(this.syncArgs.method, 'update');
+    ok(_.isEqual(this.syncArgs.model, doc));
   });
 
-  test("Model: save in positional style", 1, function() {
+  test("save in positional style", 1, function() {
     var model = new Backbone.Model();
     model.sync = function(method, model, options) {
       options.success();
@@ -386,29 +363,29 @@ $(document).ready(function() {
 
 
 
-  test("Model: fetch", 2, function() {
+  test("fetch", 2, function() {
     doc.fetch();
-    equal(lastRequest.method, 'read');
-    ok(_.isEqual(lastRequest.model, doc));
+    equal(this.syncArgs.method, 'read');
+    ok(_.isEqual(this.syncArgs.model, doc));
   });
 
-  test("Model: destroy", 3, function() {
+  test("destroy", 3, function() {
     doc.destroy();
-    equal(lastRequest.method, 'delete');
-    ok(_.isEqual(lastRequest.model, doc));
+    equal(this.syncArgs.method, 'delete');
+    ok(_.isEqual(this.syncArgs.model, doc));
 
     var newModel = new Backbone.Model;
     equal(newModel.destroy(), false);
   });
 
-  test("Model: non-persisted destroy", 1, function() {
+  test("non-persisted destroy", 1, function() {
     var a = new Backbone.Model({ 'foo': 1, 'bar': 2, 'baz': 3});
     a.sync = function() { throw "should not be called"; };
     a.destroy();
     ok(true, "non-persisted model should not call sync");
   });
 
-  test("Model: validate", 7, function() {
+  test("validate", 7, function() {
     var lastError;
     var model = new Backbone.Model();
     model.validate = function(attrs) {
@@ -429,7 +406,7 @@ $(document).ready(function() {
     equal(model.get('a'), 100);
   });
 
-  test("Model: validate on unset and clear", 6, function() {
+  test("validate on unset and clear", 6, function() {
     var error;
     var model = new Backbone.Model({name: "One"});
     model.validate = function(attrs) {
@@ -451,7 +428,7 @@ $(document).ready(function() {
     equal(model.get('name'), undefined);
   });
 
-  test("Model: validate with error callback", 8, function() {
+  test("validate with error callback", 8, function() {
     var lastError, boundError;
     var model = new Backbone.Model();
     model.validate = function(attrs) {
@@ -472,10 +449,10 @@ $(document).ready(function() {
     equal(result, false);
     equal(model.get('a'), 100);
     equal(lastError, "Can't change admin status.");
-    equal(boundError, undefined);
+    equal(boundError, true);
   });
 
-  test("Model: defaults always extend attrs (#459)", 2, function() {
+  test("defaults always extend attrs (#459)", 2, function() {
     var Defaulted = Backbone.Model.extend({
       defaults: {one: 1},
       initialize : function(attrs, opts) {
@@ -486,7 +463,7 @@ $(document).ready(function() {
     var emptyattrs = new Defaulted();
   });
 
-  test("Model: Inherit class properties", 6, function() {
+  test("Inherit class properties", 6, function() {
     var Parent = Backbone.Model.extend({
       instancePropSame: function() {},
       instancePropDiff: function() {}
@@ -510,7 +487,7 @@ $(document).ready(function() {
     notEqual(Child.prototype.instancePropDiff, undefined);
   });
 
-  test("Model: Nested change events don't clobber previous attributes", 4, function() {
+  test("Nested change events don't clobber previous attributes", 4, function() {
     new Backbone.Model()
     .on('change:state', function(model, newState) {
       equal(model.previous('state'), undefined);
@@ -595,8 +572,9 @@ $(document).ready(function() {
 
   test("save with `wait` succeeds without `validate`", 1, function() {
     var model = new Backbone.Model();
+    model.url = '/test';
     model.save({x: 1}, {wait: true});
-    ok(lastRequest.model === model);
+    ok(this.syncArgs.model === model);
   });
 
   test("`hasChanged` for falsey keys", 2, function() {
@@ -616,18 +594,20 @@ $(document).ready(function() {
   test("`save` with `wait` sends correct attributes", 5, function() {
     var changed = 0;
     var model = new Backbone.Model({x: 1, y: 2});
+    model.url = '/test';
     model.on('change:x', function() { changed++; });
     model.save({x: 3}, {wait: true});
-    deepEqual(JSON.parse(ajaxParams.data), {x: 3, y: 2});
+    deepEqual(JSON.parse(this.ajaxSettings.data), {x: 3, y: 2});
     equal(model.get('x'), 1);
     equal(changed, 0);
-    lastRequest.options.success({});
+    this.syncArgs.options.success({});
     equal(model.get('x'), 3);
     equal(changed, 1);
   });
 
   test("a failed `save` with `wait` doesn't leave attributes behind", 1, function() {
     var model = new Backbone.Model;
+    model.url = '/test';
     model.save({x: 1}, {wait: true});
     equal(model.get('x'), void 0);
   });
@@ -644,6 +624,7 @@ $(document).ready(function() {
 
   test("save with wait validates attributes", 1, function() {
     var model = new Backbone.Model();
+    model.url = '/test';
     model.validate = function() { ok(true); };
     model.save({x: 1}, {wait: true});
   });
@@ -759,9 +740,9 @@ $(document).ready(function() {
       model.set({b: 2}, {silent: true});
     });
     model.set({b: 0});
-    deepEqual(changes, [0, 1, 1]);
+    deepEqual(changes, [0, 1]);
     model.change();
-    deepEqual(changes, [0, 1, 1, 2, 1]);
+    deepEqual(changes, [0, 1, 2, 1]);
   });
 
   test("nested set multiple times", 1, function() {
@@ -776,24 +757,6 @@ $(document).ready(function() {
     model.set({a: true});
   });
 
-  test("Backbone.wrapError triggers `'error'`", 12, function() {
-    var resp = {};
-    var options = {};
-    var model = new Backbone.Model();
-    model.on('error', error);
-    var callback = Backbone.wrapError(null, model, options);
-    callback(model, resp);
-    callback(resp);
-    callback = Backbone.wrapError(error, model, options);
-    callback(model, resp);
-    callback(resp);
-    function error(_model, _resp, _options) {
-      ok(model === _model);
-      ok(resp === _resp);
-      ok(options === _options);
-    }
-  });
-
   test("#1179 - isValid returns true in the absence of validate.", 1, function() {
     var model = new Backbone.Model();
     model.validate = null;
@@ -831,8 +794,9 @@ $(document).ready(function() {
 
   test("#1412 - Trigger 'sync' event.", 3, function() {
     var model = new Backbone.Model({id: 1});
-    model.sync = function(method, model, options) { options.success(); };
-    model.on('sync', function() { ok(true); });
+    model.url = '/test';
+    model.on('sync', function(){ ok(true); });
+    Backbone.ajax = function(settings){ settings.success(); };
     model.fetch();
     model.save();
     model.destroy();
@@ -852,4 +816,66 @@ $(document).ready(function() {
     strictEqual(model.save(), false);
   });
 
+  test("#1377 - Save without attrs triggers 'error'.", 1, function() {
+    var Model = Backbone.Model.extend({
+      url: '/test/',
+      sync: function(method, model, options){ options.success(); },
+      validate: function(){ return 'invalid'; }
+    });
+    var model = new Model({id: 1});
+    model.on('error', function(){ ok(true); });
+    model.save();
+  });
+
+  test("#1545 - `undefined` can be passed to a model constructor without coersion", function() {
+    var Model = Backbone.Model.extend({
+      defaults: { one: 1 },
+      initialize : function(attrs, opts) {
+        equal(attrs, undefined);
+      }
+    });
+    var emptyattrs = new Model();
+    var undefinedattrs = new Model(undefined);
+  });
+
+  asyncTest("#1478 - Model `save` does not trigger change on unchanged attributes", 0, function() {
+    var Model = Backbone.Model.extend({
+      sync: function(method, model, options) {
+        setTimeout(function(){
+          options.success();
+          start();
+        }, 0);
+      }
+    });
+    new Model({x: true})
+    .on('change:x', function(){ ok(false); })
+    .save(null, {wait: true});
+  });
+
+  test("#1664 - Changing from one value, silently to another, back to original does not trigger change.", 0, function() {
+    var model = new Backbone.Model({x:1});
+    model.on('change:x', function() { ok(false); });
+    model.set({x:2},{silent:true});
+    model.set({x:3},{silent:true});
+    model.set({x:1});
+  });
+
+  test("#1664 - multiple silent changes nested inside a change event", 2, function() {
+    var changes = [];
+    var model = new Backbone.Model();
+    model.on('change', function() {
+      model.set({a:'c'}, {silent:true});
+      model.set({b:2}, {silent:true});
+      model.unset('c', {silent:true});
+      model.set({a:'a'}, {silent:true});
+      model.set({b:1}, {silent:true});
+      model.set({c:'item'}, {silent:true});
+    });
+    model.on('change:a change:b change:c', function(model, val) { changes.push(val); });
+    model.set({a:'a', b:1, c:'item'});
+    deepEqual(changes, ['a',1,'item']);
+    model.change();
+    deepEqual(changes, ['a',1,'item']);
+  });
+
 });

vendor/backbone/test/noconflict.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Backbone.noConflict");
 
-  test('Backbone.noConflict', 2, function() {
+  test('noConflict', 2, function() {
     var noconflictBackbone = Backbone.noConflict();
     equal(window.Backbone, undefined, 'Returned window.Backbone');
     window.Backbone = noconflictBackbone;

vendor/backbone/test/router.js

@@ -20,9 +20,11 @@ $(document).ready(function() {
       _.extend(this, _.pick($('<a></a>', {href: href})[0],
         'href',
         'hash',
+        'host',
         'search',
         'fragment',
-        'pathname'
+        'pathname',
+        'protocol'
       ));
       // In IE, anchor.pathname does not contain a leading slash though
       // window.location.pathname does.
@@ -39,7 +41,7 @@ $(document).ready(function() {
 
     setup: function() {
       location = new Location('http://example.com');
-      Backbone.history = new Backbone.History({location: location});
+      Backbone.history = _.extend(new Backbone.History, {location: location});
       router = new Router({testing: 101});
       Backbone.history.interval = 9;
       Backbone.history.start({pushState: false});
@@ -67,6 +69,7 @@ $(document).ready(function() {
       "contacts":                   "contacts",
       "contacts/new":               "newContact",
       "contacts/:id":               "loadContact",
+      "optional(/:item)":           "optionalItem",
       "splat/*args/end":            "splat",
       "*first/complex-:part/*rest": "complex",
       ":entity?*args":              "query",
@@ -103,6 +106,10 @@ $(document).ready(function() {
       this.contact = 'load';
     },
 
+    optionalItem: function(arg){
+      this.arg = arg !== undefined ? arg : null;
+    },
+
     splat : function(args) {
       this.args = args;
     },
@@ -124,11 +131,11 @@ $(document).ready(function() {
 
   });
 
-  test("Router: initialize", 1, function() {
+  test("initialize", 1, function() {
     equal(router.testing, 101);
   });
 
-  test("Router: routes (simple)", 4, function() {
+  test("routes (simple)", 4, function() {
     location.replace('http://example.com#search/news');
     Backbone.history.checkUrl();
     equal(router.query, 'news');
@@ -137,26 +144,26 @@ $(document).ready(function() {
     equal(lastArgs[0], 'news');
   });
 
-  test("Router: routes (two part)", 2, function() {
+  test("routes (two part)", 2, function() {
     location.replace('http://example.com#search/nyc/p10');
     Backbone.history.checkUrl();
     equal(router.query, 'nyc');
     equal(router.page, '10');
   });
 
-  test("Router: routes via navigate", 2, function() {
+  test("routes via navigate", 2, function() {
     Backbone.history.navigate('search/manhattan/p20', {trigger: true});
     equal(router.query, 'manhattan');
     equal(router.page, '20');
   });
 
-  test("Router: routes via navigate for backwards-compatibility", 2, function() {
+  test("routes via navigate for backwards-compatibility", 2, function() {
     Backbone.history.navigate('search/manhattan/p20', true);
     equal(router.query, 'manhattan');
     equal(router.page, '20');
   });
 
-  test("Router: route precedence via navigate", 6, function(){
+  test("route precedence via navigate", 6, function(){
     // check both 0.9.x and backwards-compatibility options
     _.each([ { trigger: true }, true ], function( options ){
       Backbone.history.navigate('contacts', options);
@@ -176,13 +183,13 @@ $(document).ready(function() {
     Backbone.history.navigate('/route');
   });
 
-  test("Router: use implicit callback if none provided", 1, function() {
+  test("use implicit callback if none provided", 1, function() {
     router.count = 0;
     router.navigate('implicit', {trigger: true});
     equal(router.count, 1);
   });
 
-  test("Router: routes via navigate with {replace: true}", 1, function() {
+  test("routes via navigate with {replace: true}", 1, function() {
     location.replace('http://example.com#start_here');
     Backbone.history.checkUrl();
     location.replace = function(href) {
@@ -191,13 +198,22 @@ $(document).ready(function() {
     Backbone.history.navigate('end_here', {replace: true});
   });
 
-  test("Router: routes (splats)", 1, function() {
+  test("routes (splats)", 1, function() {
     location.replace('http://example.com#splat/long-list/of/splatted_99args/end');
     Backbone.history.checkUrl();
     equal(router.args, 'long-list/of/splatted_99args');
   });
 
-  test("Router: routes (complex)", 3, function() {
+  test("routes (optional)", 2, function() {
+    location.replace('http://example.com#optional');
+    Backbone.history.checkUrl();
+    equal(router.arg, null);
+    location.replace('http://example.com#optional/thing');
+    Backbone.history.checkUrl();
+    equal(router.arg, 'thing');
+  });
+
+  test("routes (complex)", 3, function() {
     location.replace('http://example.com#one/two/three/complex-part/four/five/six/seven');
     Backbone.history.checkUrl();
     equal(router.first, 'one/two/three');
@@ -205,7 +221,7 @@ $(document).ready(function() {
     equal(router.rest, 'four/five/six/seven');
   });
 
-  test("Router: routes (query)", 5, function() {
+  test("routes (query)", 5, function() {
     location.replace('http://example.com#mandel?a=b&c=d');
     Backbone.history.checkUrl();
     equal(router.entity, 'mandel');
@@ -215,13 +231,13 @@ $(document).ready(function() {
     equal(lastArgs[1], 'a=b&c=d');
   });
 
-  test("Router: routes (anything)", 1, function() {
+  test("routes (anything)", 1, function() {
     location.replace('http://example.com#doesnt-match-a-route');
     Backbone.history.checkUrl();
     equal(router.anything, 'doesnt-match-a-route');
   });
 
-  test("Router: fires event when router doesn't have callback on it", 1, function() {
+  test("fires event when router doesn't have callback on it", 1, function() {
     router.on("route:noCallback", function(){ ok(true); });
     location.replace('http://example.com#noCallback');
     Backbone.history.checkUrl();
@@ -231,28 +247,25 @@ $(document).ready(function() {
     location.replace('http://example.com/root/foo');
 
     Backbone.history.stop();
-    Backbone.history = new Backbone.History({location: location});
+    Backbone.history = _.extend(new Backbone.History, {location: location});
     Backbone.history.start({root: '/root', hashChange: false, silent: true});
     strictEqual(Backbone.history.getFragment(), 'foo');
 
     Backbone.history.stop();
-    Backbone.history = new Backbone.History({location: location});
+    Backbone.history = _.extend(new Backbone.History, {location: location});
     Backbone.history.start({root: '/root/', hashChange: false, silent: true});
     strictEqual(Backbone.history.getFragment(), 'foo');
   });
 
   test("#1003 - History is started before navigate is called", 1, function() {
-    var history = new Backbone.History();
-    history.navigate = function(){
-      ok(Backbone.History.started);
-    };
     Backbone.history.stop();
-    history.start();
+    Backbone.history.navigate = function(){ ok(Backbone.History.started); };
+    Backbone.history.start();
     // If this is not an old IE navigate will not be called.
-    if (!history.iframe) ok(true);
+    if (!Backbone.history.iframe) ok(true);
   });
 
-  test("Router: route callback gets passed decoded values", 3, function() {
+  test("route callback gets passed decoded values", 3, function() {
     var route = 'has%2Fslash/complex-has%23hash/has%20space';
     Backbone.history.navigate(route, {trigger: true});
     equal(router.first, 'has/slash');
@@ -260,7 +273,7 @@ $(document).ready(function() {
     equal(router.rest, 'has space');
   });
 
-  test("Router: correctly handles URLs with % (#868)", 3, function() {
+  test("correctly handles URLs with % (#868)", 3, function() {
     location.replace('http://example.com#search/fat%3A1.5%25');
     Backbone.history.checkUrl();
     location.replace('http://example.com#search/fat');
@@ -273,7 +286,7 @@ $(document).ready(function() {
   test("#1185 - Use pathname when hashChange is not wanted.", 1, function() {
     Backbone.history.stop();
     location.replace('http://example.com/path/name#hash');
-    Backbone.history = new Backbone.History({location: location});
+    Backbone.history = _.extend(new Backbone.History, {location: location});
     Backbone.history.start({hashChange: false});
     var fragment = Backbone.history.getFragment();
     strictEqual(fragment, location.pathname.replace(/^\//, ''));
@@ -282,7 +295,7 @@ $(document).ready(function() {
   test("#1206 - Strip leading slash before location.assign.", 1, function() {
     Backbone.history.stop();
     location.replace('http://example.com/root/');
-    Backbone.history = new Backbone.History({location: location});
+    Backbone.history = _.extend(new Backbone.History, {location: location});
     Backbone.history.start({hashChange: false, root: '/root/'});
     location.assign = function(pathname) {
       strictEqual(pathname, '/root/fragment');
@@ -293,7 +306,7 @@ $(document).ready(function() {
   test("#1387 - Root fragment without trailing slash.", 1, function() {
     Backbone.history.stop();
     location.replace('http://example.com/root');
-    Backbone.history = new Backbone.History({location: location});
+    Backbone.history = _.extend(new Backbone.History, {location: location});
     Backbone.history.start({hashChange: false, root: '/root/', silent: true});
     strictEqual(Backbone.history.getFragment(), '');
   });
@@ -301,7 +314,7 @@ $(document).ready(function() {
   test("#1366 - History does not prepend root to fragment.", 2, function() {
     Backbone.history.stop();
     location.replace('http://example.com/root/');
-    Backbone.history = new Backbone.History({
+    Backbone.history = _.extend(new Backbone.History, {
       location: location,
       history: {
         pushState: function(state, title, url) {
@@ -318,4 +331,154 @@ $(document).ready(function() {
     strictEqual(Backbone.history.fragment, 'x');
   });
 
+  test("Normalize root.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url) {
+          strictEqual(url, '/root/fragment');
+        }
+      }
+    });
+    Backbone.history.start({
+      pushState: true,
+      root: '/root',
+      hashChange: false
+    });
+    Backbone.history.navigate('fragment');
+  });
+
+  test("Normalize root.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root#fragment');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url) {},
+        replaceState: function(state, title, url) {
+          strictEqual(url, '/root/fragment');
+        }
+      }
+    });
+    Backbone.history.start({
+      pushState: true,
+      root: '/root'
+    });
+  });
+
+  test("Normalize root.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root');
+    Backbone.history = _.extend(new Backbone.History, {location: location});
+    Backbone.history.loadUrl = function() { ok(true); };
+    Backbone.history.start({
+      pushState: true,
+      root: '/root'
+    });
+  });
+
+  test("Normalize root - leading slash.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(){}
+      }
+    });
+    Backbone.history.start({root: 'root'});
+    strictEqual(Backbone.history.root, '/root/');
+  });
+
+  test("Transition from hashChange to pushState.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root#x/y');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(state, title, url){
+          strictEqual(url, '/root/x/y');
+        }
+      }
+    });
+    Backbone.history.start({
+      root: 'root',
+      pushState: true
+    });
+  });
+
+  test("#1619: Router: Normalize empty root", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(){}
+      }
+    });
+    Backbone.history.start({root: ''});
+    strictEqual(Backbone.history.root, '/');
+  });
+
+  test("#1619: Router: nagivate with empty root", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url) {
+          strictEqual(url, '/fragment');
+        }
+      }
+    });
+    Backbone.history.start({
+      pushState: true,
+      root: '',
+      hashChange: false
+    });
+    Backbone.history.navigate('fragment');
+  });
+
+  test("Transition from pushState to hashChange.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root/x/y?a=b');
+    location.replace = function(url) {
+      strictEqual(url, '/root/?a=b#x/y');
+    };
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: null,
+        replaceState: null
+      }
+    });
+    Backbone.history.start({
+      root: 'root',
+      pushState: true
+    });
+  });
+
+  test("#1695 - hashChange to pushState with search.", 1, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root?a=b#x/y');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(state, title, url){
+          strictEqual(url, '/root/x/y?a=b');
+        }
+      }
+    });
+    Backbone.history.start({
+      root: 'root',
+      pushState: true
+    });
+  });
+
 });

vendor/backbone/test/sync.js

@@ -1,8 +1,5 @@
 $(document).ready(function() {
 
-  var ajax = Backbone.ajax;
-  var lastRequest = null;
-
   var Library = Backbone.Collection.extend({
     url : function() { return '/library'; }
   });
@@ -14,132 +11,126 @@ $(document).ready(function() {
     length : 123
   };
 
-  module("Backbone.sync", {
+  module("Backbone.sync", _.extend(new Environment, {
 
     setup : function() {
-      library = new Library();
-      Backbone.ajax = function(obj) {
-        lastRequest = obj;
-      };
+      Environment.prototype.setup.apply(this, arguments);
+      library = new Library;
       library.create(attrs, {wait: false});
-    },
-
-    teardown: function() {
-      Backbone.ajax = ajax;
     }
 
-  });
+  }));
 
-  test("sync: read", 4, function() {
+  test("read", 4, function() {
     library.fetch();
-    equal(lastRequest.url, '/library');
-    equal(lastRequest.type, 'GET');
-    equal(lastRequest.dataType, 'json');
-    ok(_.isEmpty(lastRequest.data));
+    equal(this.ajaxSettings.url, '/library');
+    equal(this.ajaxSettings.type, 'GET');
+    equal(this.ajaxSettings.dataType, 'json');
+    ok(_.isEmpty(this.ajaxSettings.data));
   });
 
-  test("sync: passing data", 3, function() {
+  test("passing data", 3, function() {
     library.fetch({data: {a: 'a', one: 1}});
-    equal(lastRequest.url, '/library');
-    equal(lastRequest.data.a, 'a');
-    equal(lastRequest.data.one, 1);
+    equal(this.ajaxSettings.url, '/library');
+    equal(this.ajaxSettings.data.a, 'a');
+    equal(this.ajaxSettings.data.one, 1);
   });
 
-  test("sync: create", 6, function() {
-    equal(lastRequest.url, '/library');
-    equal(lastRequest.type, 'POST');
-    equal(lastRequest.dataType, 'json');
-    var data = JSON.parse(lastRequest.data);
+  test("create", 6, function() {
+    equal(this.ajaxSettings.url, '/library');
+    equal(this.ajaxSettings.type, 'POST');
+    equal(this.ajaxSettings.dataType, 'json');
+    var data = JSON.parse(this.ajaxSettings.data);
     equal(data.title, 'The Tempest');
     equal(data.author, 'Bill Shakespeare');
     equal(data.length, 123);
   });
 
-  test("sync: update", 7, function() {
+  test("update", 7, function() {
     library.first().save({id: '1-the-tempest', author: 'William Shakespeare'});
-    equal(lastRequest.url, '/library/1-the-tempest');
-    equal(lastRequest.type, 'PUT');
-    equal(lastRequest.dataType, 'json');
-    var data = JSON.parse(lastRequest.data);
+    equal(this.ajaxSettings.url, '/library/1-the-tempest');
+    equal(this.ajaxSettings.type, 'PUT');
+    equal(this.ajaxSettings.dataType, 'json');
+    var data = JSON.parse(this.ajaxSettings.data);
     equal(data.id, '1-the-tempest');
     equal(data.title, 'The Tempest');
     equal(data.author, 'William Shakespeare');
     equal(data.length, 123);
   });
 
-  test("sync: update with emulateHTTP and emulateJSON", 7, function() {
+  test("update with emulateHTTP and emulateJSON", 7, function() {
     Backbone.emulateHTTP = Backbone.emulateJSON = true;
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'POST');
-    equal(lastRequest.dataType, 'json');
-    equal(lastRequest.data._method, 'PUT');
-    var data = JSON.parse(lastRequest.data.model);
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'POST');
+    equal(this.ajaxSettings.dataType, 'json');
+    equal(this.ajaxSettings.data._method, 'PUT');
+    var data = JSON.parse(this.ajaxSettings.data.model);
     equal(data.id, '2-the-tempest');
     equal(data.author, 'Tim Shakespeare');
     equal(data.length, 123);
     Backbone.emulateHTTP = Backbone.emulateJSON = false;
   });
 
-  test("sync: update with just emulateHTTP", 6, function() {
+  test("update with just emulateHTTP", 6, function() {
     Backbone.emulateHTTP = true;
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'POST');
-    equal(lastRequest.contentType, 'application/json');
-    var data = JSON.parse(lastRequest.data);
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'POST');
+    equal(this.ajaxSettings.contentType, 'application/json');
+    var data = JSON.parse(this.ajaxSettings.data);
     equal(data.id, '2-the-tempest');
     equal(data.author, 'Tim Shakespeare');
     equal(data.length, 123);
     Backbone.emulateHTTP = false;
   });
 
-  test("sync: update with just emulateJSON", 6, function() {
+  test("update with just emulateJSON", 6, function() {
     Backbone.emulateJSON = true;
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'PUT');
-    equal(lastRequest.contentType, 'application/x-www-form-urlencoded');
-    var data = JSON.parse(lastRequest.data.model);
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'PUT');
+    equal(this.ajaxSettings.contentType, 'application/x-www-form-urlencoded');
+    var data = JSON.parse(this.ajaxSettings.data.model);
     equal(data.id, '2-the-tempest');
     equal(data.author, 'Tim Shakespeare');
     equal(data.length, 123);
     Backbone.emulateJSON = false;
   });
 
-  test("sync: read model", 3, function() {
+  test("read model", 3, function() {
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
     library.first().fetch();
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'GET');
-    ok(_.isEmpty(lastRequest.data));
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'GET');
+    ok(_.isEmpty(this.ajaxSettings.data));
   });
 
-  test("sync: destroy", 3, function() {
+  test("destroy", 3, function() {
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
     library.first().destroy({wait: true});
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'DELETE');
-    equal(lastRequest.data, null);
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'DELETE');
+    equal(this.ajaxSettings.data, null);
   });
 
-  test("sync: destroy with emulateHTTP", 3, function() {
+  test("destroy with emulateHTTP", 3, function() {
     library.first().save({id: '2-the-tempest', author: 'Tim Shakespeare'});
     Backbone.emulateHTTP = Backbone.emulateJSON = true;
     library.first().destroy();
-    equal(lastRequest.url, '/library/2-the-tempest');
-    equal(lastRequest.type, 'POST');
-    equal(JSON.stringify(lastRequest.data), '{"_method":"DELETE"}');
+    equal(this.ajaxSettings.url, '/library/2-the-tempest');
+    equal(this.ajaxSettings.type, 'POST');
+    equal(JSON.stringify(this.ajaxSettings.data), '{"_method":"DELETE"}');
     Backbone.emulateHTTP = Backbone.emulateJSON = false;
   });
 
-  test("sync: urlError", 2, function() {
+  test("urlError", 2, function() {
     var model = new Backbone.Model();
     raises(function() {
       model.fetch();
     });
     model.fetch({url: '/one/two'});
-    equal(lastRequest.url, '/one/two');
+    equal(this.ajaxSettings.url, '/one/two');
   });
 
   test("#1052 - `options` is optional.", 0, function() {
@@ -157,4 +148,13 @@ $(document).ready(function() {
     Backbone.sync('create', model);
   });
 
+  test("Call provided error callback on error.", 1, function() {
+    var model = new Backbone.Model;
+    model.url = '/test';
+    Backbone.sync('read', model, {
+      error: function() { ok(true); }
+    });
+    this.ajaxSettings.error();
+  });
+
 });

vendor/backbone/test/vendor/qunit.css

@@ -1,11 +1,11 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.10.0 - A JavaScript Unit Testing Framework
  *
- * http://docs.jquery.com/QUnit
+ * http://qunitjs.com
  *
- * Copyright (c) 2012 John Resig, Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * or GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
  */
 
 /** Font Family and Sizes */
@@ -20,7 +20,7 @@
 
 /** Resets */
 
-#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
 	margin: 0;
 	padding: 0;
 }
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,9 +54,9 @@
 	color: #fff;
 }
 
-#qunit-header label {
+#qunit-testrunner-toolbar label {
 	display: inline-block;
-	padding-left: 0.5em;
+	padding: 0 .5em 0 .1em;
 }
 
 #qunit-banner {
@@ -67,6 +67,7 @@
 	padding: 0.5em 0 0.5em 2em;
 	color: #5E740B;
 	background-color: #eee;
+	overflow: hidden;
 }
 
 #qunit-userAgent {
@@ -76,6 +77,9 @@
 	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
 }
 
+#qunit-modulefilter-container {
+	float: right;
+}
 
 /** Tests: Pass/Fail */
 
@@ -113,13 +117,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -162,8 +162,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -172,9 +171,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -190,15 +189,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }

vendor/backbone/test/vendor/qunit.js

@@ -1,11 +1,11 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.10.0 - A JavaScript Unit Testing Framework
  *
- * http://docs.jquery.com/QUnit
+ * http://qunitjs.com
  *
- * Copyright (c) 2012 John Resig, Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * or GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
  */
 
 (function( window ) {
@@ -17,6 +17,8 @@ var QUnit,
 	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
 	toString = Object.prototype.toString,
 	hasOwn = Object.prototype.hasOwnProperty,
+	// Keep a local reference to Date (GH-283)
+	Date = window.Date,
 	defined = {
 	setTimeout: typeof window.setTimeout !== "undefined",
 	sessionStorage: (function() {
@@ -304,7 +306,8 @@ QUnit = {
 	// call on start of module test to prepend name to all tests
 	module: function( name, testEnvironment ) {
 		config.currentModule = name;
-		config.currentModuleTestEnviroment = testEnvironment;
+		config.currentModuleTestEnvironment = testEnvironment;
+		config.modules[name] = true;
 	},
 
 	asyncTest: function( testName, expected, callback ) {
@@ -336,7 +339,7 @@ QUnit = {
 			async: async,
 			callback: callback,
 			module: config.currentModule,
-			moduleTestEnvironment: config.currentModuleTestEnviroment,
+			moduleTestEnvironment: config.currentModuleTestEnvironment,
 			stack: sourceFromStacktrace( 2 )
 		});
 
@@ -349,7 +352,11 @@ QUnit = {
 
 	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
 	expect: function( asserts ) {
-		config.current.expected = asserts;
+		if (arguments.length === 1) {
+			config.current.expected = asserts;
+		} else {
+			return config.current.expected;
+		}
 	},
 
 	start: function( count ) {
@@ -403,6 +410,8 @@ QUnit = {
 QUnit.assert = {
 	/**
 	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
 	ok: function( result, msg ) {
@@ -413,6 +422,8 @@ QUnit.assert = {
 
 		var source,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: result,
 				message: msg
 			};
@@ -437,36 +448,59 @@ QUnit.assert = {
 	/**
 	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
+	 * @name equal
+	 * @function
 	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
 	equal: function( actual, expected, message ) {
 		QUnit.push( expected == actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notEqual
+	 * @function
+	 */
 	notEqual: function( actual, expected, message ) {
 		QUnit.push( expected != actual, actual, expected, message );
 	},
 
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
 	deepEqual: function( actual, expected, message ) {
 		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
 	notDeepEqual: function( actual, expected, message ) {
 		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
 	strictEqual: function( actual, expected, message ) {
 		QUnit.push( expected === actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
 	notStrictEqual: function( actual, expected, message ) {
 		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function( block, expected, message ) {
+	throws: function( block, expected, message ) {
 		var actual,
 			ok = false;
 
+		// 'expected' is optional
 		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
@@ -494,18 +528,29 @@ QUnit.assert = {
 			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.push( ok, actual, null, message );
+			QUnit.push( ok, actual, null, message );
+		} else {
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+		}
 	}
 };
 
-// @deprecated: Kept assertion helpers in root for backwards compatibility
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
 extend( QUnit, QUnit.assert );
 
 /**
- * @deprecated: Kept for backwards compatibility
- * next step: remove entirely
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
  */
 QUnit.equals = function() {
 	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
@@ -549,7 +594,23 @@ config = {
 	// when enabled, all tests must call expect()
 	requireExpects: false,
 
-	urlConfig: [ "noglobals", "notrycatch" ],
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
+
+	// Set of all modules.
+	modules: {},
 
 	// logging callback queues
 	begin: [],
@@ -661,17 +722,10 @@ extend( QUnit, {
 	},
 
 	// Resets the test setup. Useful for tests that modify the DOM.
-	// If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
 	reset: function() {
-		var fixture;
-
-		if ( window.jQuery ) {
-			jQuery( "#qunit-fixture" ).html( config.fixture );
-		} else {
-			fixture = id( "qunit-fixture" );
-			if ( fixture ) {
-				fixture.innerHTML = config.fixture;
-			}
+		var fixture = id( "qunit-fixture" );
+		if ( fixture ) {
+			fixture.innerHTML = config.fixture;
 		}
 	},
 
@@ -732,6 +786,8 @@ extend( QUnit, {
 
 		var output, source,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: result,
 				message: message,
 				actual: actual,
@@ -770,26 +826,36 @@ extend( QUnit, {
 		});
 	},
 
-	pushFailure: function( message, source ) {
+	pushFailure: function( message, source, actual ) {
 		if ( !config.current ) {
 			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
 
 		var output,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: false,
 				message: message
 			};
 
-		message = escapeInnerText(message ) || "error";
+		message = escapeInnerText( message ) || "error";
 		message = "<span class='test-message'>" + message + "</span>";
 		output = message;
 
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
 		if ( source ) {
 			details.source = source;
-			output += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 		}
 
+		output += "</table>";
+
 		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
@@ -859,7 +925,9 @@ QUnit.load = function() {
 	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes, moduleFilter,
+	    numModules = 0,
+	    moduleFilterHtml = "",
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
 
@@ -872,10 +940,26 @@ QUnit.load = function() {
 
 	for ( i = 0; i < len; i++ ) {
 		val = config.urlConfig[i];
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += "<label><input name='" + val + "' type='checkbox'" + ( config[val] ? " checked='checked'" : "" ) + ">" + val + "</label>";
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
+	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " + ( config.module === undefined  ? "selected" : "" ) + ">< All Modules ></option>";
+	for ( i in config.modules ) {
+		if ( config.modules.hasOwnProperty( i ) ) {
+			numModules += 1;
+			moduleFilterHtml += "<option value='" + encodeURIComponent(i) + "' " + ( config.module === i ? "selected" : "" ) + ">" + i + "</option>";
+		}
+	}
+	moduleFilterHtml += "</select>";
+
 	// `userAgent` initialized at top of scope
 	userAgent = id( "qunit-userAgent" );
 	if ( userAgent ) {
@@ -885,12 +969,7 @@ QUnit.load = function() {
 	// `banner` initialized at top of scope
 	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined }) + "'>" + banner.innerHTML + "</a> " + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
 	// `toolbar` initialized at top of scope
@@ -931,8 +1010,31 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
+
+		if (numModules > 1) {
+			moduleFilter = document.createElement( 'span' );
+			moduleFilter.setAttribute( 'id', 'qunit-modulefilter-container' );
+			moduleFilter.innerHTML = moduleFilterHtml;
+			addEvent( moduleFilter, "change", function() {
+				var selectBox = moduleFilter.getElementsByTagName("select")[0],
+				    selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
+
+				window.location = QUnit.url( { module: ( selectedModule === "" ) ? undefined : selectedModule } );
+			});
+			toolbar.appendChild(moduleFilter);
+		}
 	}
 
 	// `main` initialized at top of scope
@@ -970,9 +1072,9 @@ window.onerror = function ( error, filePath, linerNr ) {
 			}
 			QUnit.pushFailure( error, filePath + ":" + linerNr );
 		} else {
-			QUnit.test( "global failure", function() {
+			QUnit.test( "global failure", extend( function() {
 				QUnit.pushFailure( error, filePath + ":" + linerNr );
-			});
+			}, { validTest: validTest } ) );
 		}
 		return false;
 	}
@@ -1039,6 +1141,11 @@ function done() {
 		}
 	}
 
+	// scroll back to top to show results
+	if ( window.scrollTo ) {
+		window.scrollTo(0, 0);
+	}
+
 	runLoggingCallbacks( "done", QUnit, {
 		failed: config.stats.bad,
 		passed: passed,
@@ -1051,14 +1158,20 @@ function done() {
 function validTest( test ) {
 	var include,
 		filter = config.filter && config.filter.toLowerCase(),
-		module = config.module,
+		module = config.module && config.module.toLowerCase(),
 		fullName = (test.module + ": " + test.testName).toLowerCase();
 
+	// Internally-generated tests are always valid
+	if ( test.callback && test.callback.validTest === validTest ) {
+		delete test.callback.validTest;
+		return true;
+	}
+
 	if ( config.testNumber ) {
 		return test.testNumber === config.testNumber;
 	}
 
-	if ( module && test.module !== module ) {
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
 		return false;
 	}
 
@@ -1335,7 +1448,8 @@ QUnit.equiv = (function() {
 						a.global === b.global &&
 						// (gmi) ...
 						a.ignoreCase === b.ignoreCase &&
-						a.multiline === b.multiline;
+						a.multiline === b.multiline &&
+						a.sticky === b.sticky;
 				},
 
 				// - skip when the property is a method of an instance (OOP)

vendor/backbone/test/view.js

@@ -13,27 +13,28 @@ $(document).ready(function() {
 
   });
 
-  test("View: constructor", 4, function() {
+  test("constructor", 4, function() {
     equal(view.el.id, 'test-view');
     equal(view.el.className, 'test-view');
     equal(view.options.id, 'test-view');
     equal(view.options.className, 'test-view');
   });
 
-  test("View: jQuery", 2, function() {
-    view.setElement(document.body);
-    ok(view.$('#qunit-header a').get(0).innerHTML.match(/Backbone Test Suite/));
-    ok(view.$('#qunit-header a').get(1).innerHTML.match(/Backbone Speed Suite/));
+  test("jQuery", 1, function() {
+    var view = new Backbone.View;
+    view.setElement('<p><a><b>test</b></a></p>');
+    strictEqual(view.$('a b').html(), 'test');
   });
 
-  test("View: make", 3, function() {
+  test("make", 3, function() {
     var div = view.make('div', {id: 'test-div'}, "one two three");
+
     equal(div.tagName.toLowerCase(), 'div');
     equal(div.id, 'test-div');
     equal($(div).text(), 'one two three');
   });
 
-  test("View: make can take falsy values for content", 2, function() {
+  test("make can take falsy values for content", 2, function() {
     var div = view.make('div', {id: 'test-div'}, 0);
     equal($(div).text(), '0');
 
@@ -41,142 +42,178 @@ $(document).ready(function() {
     equal($(div).text(), '');
   });
 
-  test("View: initialize", 1, function() {
+  test("initialize", 1, function() {
     var View = Backbone.View.extend({
       initialize: function() {
         this.one = 1;
       }
     });
-    var view = new View;
-    equal(view.one, 1);
+
+    strictEqual(new View().one, 1);
   });
 
-  test("View: delegateEvents", 6, function() {
-    var counter = 0;
-    var counter2 = 0;
-    view.setElement(document.body);
-    view.increment = function(){ counter++; };
-    view.$el.bind('click', function(){ counter2++; });
-    var events = {"click #qunit-banner": "increment"};
+  test("delegateEvents", 6, function() {
+    var counter1 = 0, counter2 = 0;
+
+    var view = new Backbone.View({el: '<p><a id="test"></a></p>'});
+    view.increment = function(){ counter1++; };
+    view.$el.on('click', function(){ counter2++; });
+
+    var events = {'click #test': 'increment'};
+
     view.delegateEvents(events);
-    $('#qunit-banner').trigger('click');
-    equal(counter, 1);
+    view.$('#test').trigger('click');
+    equal(counter1, 1);
     equal(counter2, 1);
-    $('#qunit-banner').trigger('click');
-    equal(counter, 2);
+
+    view.$('#test').trigger('click');
+    equal(counter1, 2);
     equal(counter2, 2);
+
     view.delegateEvents(events);
-    $('#qunit-banner').trigger('click');
-    equal(counter, 3);
+    view.$('#test').trigger('click');
+    equal(counter1, 3);
     equal(counter2, 3);
   });
 
-  test("View: delegateEvents allows functions for callbacks", 3, function() {
+  test("delegateEvents allows functions for callbacks", 3, function() {
+    var view = new Backbone.View({el: '<p></p>'});
     view.counter = 0;
-    view.setElement("#qunit-banner");
-    var events = {"click": function() { this.counter++; }};
+
+    var events = {
+      click: function() {
+        this.counter++;
+      }
+    };
+
     view.delegateEvents(events);
-    $('#qunit-banner').trigger('click');
+    view.$el.trigger('click');
     equal(view.counter, 1);
-    $('#qunit-banner').trigger('click');
+
+    view.$el.trigger('click');
     equal(view.counter, 2);
+
     view.delegateEvents(events);
-    $('#qunit-banner').trigger('click');
+    view.$el.trigger('click');
     equal(view.counter, 3);
   });
 
-  test("View: undelegateEvents", 6, function() {
-    var counter = 0;
-    var counter2 = 0;
-    view.setElement(document.body);
-    view.increment = function(){ counter++; };
-    $(view.el).unbind('click');
-    $(view.el).bind('click', function(){ counter2++; });
-    var events = {"click #qunit-userAgent": "increment"};
+  test("undelegateEvents", 6, function() {
+    var counter1 = 0, counter2 = 0;
+
+    var view = new Backbone.View({el: '<p><a id="test"></a></p>'});
+    view.increment = function(){ counter1++; };
+    view.$el.on('click', function(){ counter2++; });
+
+    var events = {'click #test': 'increment'};
+
     view.delegateEvents(events);
-    $('#qunit-userAgent').trigger('click');
-    equal(counter, 1);
+    view.$('#test').trigger('click');
+    equal(counter1, 1);
     equal(counter2, 1);
+
     view.undelegateEvents();
-    $('#qunit-userAgent').trigger('click');
-    equal(counter, 1);
+    view.$('#test').trigger('click');
+    equal(counter1, 1);
     equal(counter2, 2);
+
     view.delegateEvents(events);
-    $('#qunit-userAgent').trigger('click');
-    equal(counter, 2);
+    view.$('#test').trigger('click');
+    equal(counter1, 2);
     equal(counter2, 3);
   });
 
-  test("View: _ensureElement with DOM node el", 1, function() {
-    var ViewClass = Backbone.View.extend({
+  test("_ensureElement with DOM node el", 1, function() {
+    var View = Backbone.View.extend({
       el: document.body
     });
-    var view = new ViewClass;
-    equal(view.el, document.body);
+
+    equal(new View().el, document.body);
   });
 
-  test("View: _ensureElement with string el", 3, function() {
-    var ViewClass = Backbone.View.extend({
+  test("_ensureElement with string el", 3, function() {
+    var View = Backbone.View.extend({
       el: "body"
     });
-    var view = new ViewClass;
-    strictEqual(view.el, document.body);
+    strictEqual(new View().el, document.body);
 
-    ViewClass = Backbone.View.extend({
+    View = Backbone.View.extend({
       el: "#testElement > h1"
     });
-    view = new ViewClass;
-    strictEqual(view.el, $("#testElement > h1").get(0));
+    strictEqual(new View().el, $("#testElement > h1").get(0));
 
-    ViewClass = Backbone.View.extend({
+    View = Backbone.View.extend({
       el: "#nonexistent"
     });
-    view = new ViewClass;
-    ok(!view.el);
+    ok(!new View().el);
   });
 
-  test("View: with attributes", 2, function() {
-    var view = new Backbone.View({attributes : {'class': 'one', id: 'two'}});
-    equal(view.el.className, 'one');
-    equal(view.el.id, 'two');
+  test("with className and id functions", 2, function() {
+    var View = Backbone.View.extend({
+      className: function() {
+        return 'className';
+      },
+      id: function() {
+        return 'id';
+      }
+    });
+
+    strictEqual(new View().el.className, 'className');
+    strictEqual(new View().el.id, 'id');
   });
 
-  test("View: with attributes as a function", 1, function() {
-    var viewClass = Backbone.View.extend({
+  test("with attributes", 2, function() {
+    var View = Backbone.View.extend({
+      attributes: {
+        id: 'id',
+        'class': 'class'
+      }
+    });
+
+    strictEqual(new View().el.className, 'class');
+    strictEqual(new View().el.id, 'id');
+  });
+
+  test("with attributes as a function", 1, function() {
+    var View = Backbone.View.extend({
       attributes: function() {
         return {'class': 'dynamic'};
       }
     });
-    equal((new viewClass).el.className, 'dynamic');
+
+    strictEqual(new View().el.className, 'dynamic');
   });
 
-  test("View: multiple views per element", 3, function() {
-    var count = 0, ViewClass = Backbone.View.extend({
-      el: $("body"),
+  test("multiple views per element", 3, function() {
+    var count = 0;
+    var $el = $('<p></p>');
+
+    var View = Backbone.View.extend({
+      el: $el,
       events: {
-        "click": "click"
-      },
-      click: function() {
-        count++;
+        click: function() {
+          count++;
+        }
       }
     });
 
-    var view1 = new ViewClass;
-    $("body").trigger("click");
+    var view1 = new View;
+    $el.trigger("click");
     equal(1, count);
 
-    var view2 = new ViewClass;
-    $("body").trigger("click");
+    var view2 = new View;
+    $el.trigger("click");
     equal(3, count);
 
     view1.delegateEvents();
-    $("body").trigger("click");
+    $el.trigger("click");
     equal(5, count);
   });
 
-  test("View: custom events, with namespaces", 2, function() {
+  test("custom events, with namespaces", 2, function() {
     var count = 0;
-    var ViewClass = Backbone.View.extend({
+
+    var View = Backbone.View.extend({
       el: $('body'),
       events: function() {
         return {"fake$event.namespaced": "run"};
@@ -186,9 +223,10 @@ $(document).ready(function() {
       }
     });
 
-    var view = new ViewClass;
+    var view = new View;
     $('body').trigger('fake$event').trigger('fake$event');
     equal(count, 2);
+
     $('body').unbind('.namespaced');
     $('body').trigger('fake$event');
     equal(count, 2);
@@ -196,35 +234,98 @@ $(document).ready(function() {
 
   test("#1048 - setElement uses provided object.", 2, function() {
     var $el = $('body');
+
     var view = new Backbone.View({el: $el});
     ok(view.$el === $el);
+
     view.setElement($el = $($el));
     ok(view.$el === $el);
   });
 
   test("#986 - Undelegate before changing element.", 1, function() {
-    var a = $('<button></button>');
-    var b = $('<button></button>');
+    var button1 = $('<button></button>');
+    var button2 = $('<button></button>');
+
     var View = Backbone.View.extend({
-      events: {click: function(e) { ok(view.el === e.target); }}
+      events: {
+        click: function(e) {
+          ok(view.el === e.target);
+        }
+      }
     });
-    var view = new View({el: a});
-    view.setElement(b);
-    a.trigger('click');
-    b.trigger('click');
+
+    var view = new View({el: button1});
+    view.setElement(button2);
+
+    button1.trigger('click');
+    button2.trigger('click');
   });
 
   test("#1172 - Clone attributes object", 2, function() {
-    var View = Backbone.View.extend({attributes: {foo: 'bar'}});
-    var v1 = new View({id: 'foo'});
-    strictEqual(v1.el.id, 'foo');
-    var v2 = new View();
-    ok(!v2.el.id);
+    var View = Backbone.View.extend({
+      attributes: {foo: 'bar'}
+    });
+
+    var view1 = new View({id: 'foo'});
+    strictEqual(view1.el.id, 'foo');
+
+    var view2 = new View();
+    ok(!view2.el.id);
   });
 
   test("#1228 - tagName can be provided as a function", 1, function() {
-    var View = Backbone.View.extend({tagName: function(){ return 'p'; }});
+    var View = Backbone.View.extend({
+      tagName: function() {
+        return 'p';
+      }
+    });
+
     ok(new View().$el.is('p'));
   });
 
+  test("dispose", 0, function() {
+    var View = Backbone.View.extend({
+      events: {
+        click: function() { ok(false); }
+      },
+      initialize: function() {
+        this.model.on('all x', function(){ ok(false); }, this);
+        this.collection.on('all x', function(){ ok(false); }, this);
+      }
+    });
+
+    var view = new View({
+      model: new Backbone.Model,
+      collection: new Backbone.Collection
+    });
+
+    view.dispose();
+    view.model.trigger('x');
+    view.collection.trigger('x');
+    view.$el.click();
+  });
+
+  test("dispose with non Backbone objects", 0, function() {
+    var view = new Backbone.View({model: {}, collection: {}});
+    view.dispose();
+  });
+
+  test("view#remove calls dispose.", 1, function() {
+    var view = new Backbone.View();
+
+    view.dispose = function() { ok(true); };
+    view.remove();
+  });
+
+  test("Provide function for el.", 1, function() {
+    var View = Backbone.View.extend({
+      el: function() {
+        return "<p><a></a></p>";
+      }
+    });
+
+    var view = new View;
+    ok(view.$el.is('p:has(a)'));
+  });
+
 });

vendor/benchmark.js/README.md

@@ -1,30 +1,35 @@
-# Benchmark.js <sup>v1.0.0-pre</sup>
+# Benchmark.js <sup>v1.0.0</sup>
+[![build status](https://secure.travis-ci.org/bestiejs/benchmark.js.png)](http://travis-ci.org/bestiejs/benchmark.js)
 
 A [robust](http://calendar.perfplanet.com/2010/bulletproof-javascript-benchmarks/ "Bulletproof JavaScript benchmarks") benchmarking library that works on nearly all JavaScript platforms<sup><a name="fnref1" href="#fn1">1</a></sup>, supports high-resolution timers, and returns statistically significant results. As seen on [jsPerf](http://jsperf.com/).
 
-## BestieJS
+## Download
 
-Benchmark.js is part of the BestieJS *"Best in Class"* module collection. This means we promote solid browser/environment support, ES5 precedents, unit testing, and plenty of documentation.
+ * [Development source](https://raw.github.com/bestiejs/benchmark.js/v1.0.0/benchmark.js)
 
-## Documentation
+## Dive in
 
-The documentation for Benchmark.js can be viewed here: <http://benchmarkjs.com/docs>
+We’ve got [API docs](http://benchmarkjs.com/docs) and [unit tests](http://benchmarkjs.com/tests).
 
 For a list of upcoming features, check out our [roadmap](https://github.com/bestiejs/benchmark.js/wiki/Roadmap).
 
+## Support
+
+Benchmark.js has been tested in at least Adobe AIR 3.1, Chrome 5-21, Firefox 1-15, IE 6-9, Opera 9.25-12, Safari 3-6, Node.js 0.8.8, Narwhal 0.3.2, RingoJS 0.8, and Rhino 1.7RC5.
+
 ## Installation and usage
 
 In a browser or Adobe AIR:
 
-~~~ html
+```html
 <script src="benchmark.js"></script>
-~~~
+```
 
 Optionally, expose Java’s nanosecond timer by adding the `nano` applet to the `<body>`:
 
-~~~ html
+```html
 <applet code="nano" archive="nano.jar"></applet>
-~~~
+```
 
 Or enable Chrome’s microsecond timer by using the [command line switch](http://peter.sh/experiments/chromium-command-line-switches/#enable-benchmarking):
 
@@ -32,37 +37,37 @@ Or enable Chrome’s microsecond timer by using the [command line switch](http:/
 
 Via [npm](http://npmjs.org/):
 
-~~~ bash
+```bash
 npm install benchmark
-~~~
+```
 
 In [Node.js](http://nodejs.org/) and [RingoJS v0.8.0+](http://ringojs.org/):
 
-~~~ js
+```js
 var Benchmark = require('benchmark');
-~~~
+```
 
 Optionally, use the [microtime module](https://github.com/wadey/node-microtime) by Wade Simmons:
 
-~~~ bash
+```bash
 npm install microtime
-~~~
+```
 
-In [Narwhal](http://narwhaljs.org/) and [RingoJS v0.7.0-](http://ringojs.org/):
+In [RingoJS v0.7.0-](http://ringojs.org/):
 
-~~~ js
+```js
 var Benchmark = require('benchmark').Benchmark;
-~~~
+```
 
 In [Rhino](http://www.mozilla.org/rhino/):
 
-~~~ js
+```js
 load('benchmark.js');
-~~~
+```
 
 In an AMD loader like [RequireJS](http://requirejs.org/):
 
-~~~ js
+```js
 require({
   'paths': {
     'benchmark': 'path/to/benchmark'
@@ -84,11 +89,11 @@ require({
   Benchmark.platform = platform;
   console.log(Benchmark.platform.name);
 });
-~~~
+```
 
 Usage example:
 
-~~~ js
+```js
 var suite = new Benchmark.Suite;
 
 // add tests
@@ -112,12 +117,11 @@ suite.add('RegExp#test', function() {
 // > RegExp#test x 4,161,532 +-0.99% (59 cycles)
 // > String#indexOf x 6,139,623 +-1.00% (131 cycles)
 // > Fastest is String#indexOf
-~~~
+```
 
-## Footnotes
+## BestieJS
 
-  1. Benchmark.js has been tested in at least Adobe AIR 2.6, Chrome 5-15, Firefox 1.5-8, IE 6-10, Opera 9.25-11.52, Safari 2-5.1.1, Node.js 0.4.8-0.6.1, Narwhal 0.3.2, RingoJS 0.7-0.8, and Rhino 1.7RC3.
-     <a name="fn1" title="Jump back to footnote 1 in the text." href="#fnref1">&#8617;</a>
+Benchmark.js is part of the BestieJS *"Best in Class"* module collection. This means we promote solid browser/environment support, ES5 precedents, unit testing, and plenty of documentation.
 
 ## Authors
 

vendor/benchmark.js/benchmark.js

@@ -1,5 +1,5 @@
 /*!
- * Benchmark.js v1.0.0-pre <http://benchmarkjs.com/>
+ * Benchmark.js v1.0.0 <http://benchmarkjs.com/>
  * Copyright 2010-2012 Mathias Bynens <http://mths.be/>
  * Based on JSLitmus.js, copyright Robert Kieffer <http://broofa.com/>
  * Modified by John-David Dalton <http://allyoucanleet.com/>
@@ -244,6 +244,36 @@
     } catch(e) {
       support.getAllKeys = false;
     }
+
+    /**
+     * Detect if own properties are iterated before inherited properties (all but IE < 9).
+     *
+     * @name iteratesOwnLast
+     * @memberOf Benchmark.support
+     * @type Boolean
+     */
+    support.iteratesOwnFirst = (function() {
+      var props = [];
+      function ctor() { this.x = 1; }
+      ctor.prototype = { 'y': 1 };
+      for (var prop in new ctor) { props.push(prop); }
+      return props[0] == 'x';
+    }());
+
+    /**
+     * Detect if a node's [[Class]] is resolvable (all but IE < 9)
+     * and that the JS engine errors when attempting to coerce an object to a
+     * string without a `toString` property value of `typeof` "function".
+     *
+     * @name nodeClass
+     * @memberOf Benchmark.support
+     * @type Boolean
+     */
+    try {
+      support.nodeClass = ({ 'toString': 0 } + '', toString.call(doc || 0) != '[object Object]');
+    } catch(e) {
+      support.nodeClass = true;
+    }
   }());
 
   /**
@@ -583,14 +613,17 @@
     while (++index < length) {
       if ((index - start) in tail) {
         object[index] = tail[index - start];
-      } else {
+      } else if (index in object) {
         delete object[index];
       }
     }
     // delete excess elements
     deleteCount = deleteCount > elementCount ? deleteCount - elementCount : 0;
     while (deleteCount--) {
-      delete object[length + deleteCount];
+      index = length + deleteCount;
+      if (index in object) {
+        delete object[index];
+      }
     }
     object.length = length;
     return result;
@@ -941,7 +974,13 @@
       // escape the `{` for Firefox 1
       result = (/^[^{]+\{([\s\S]*)}\s*$/.exec(fn) || 0)[1];
     }
-    return (result || '').replace(/^\s+|\s+$/g, '');
+    // trim string
+    result = (result || '').replace(/^\s+|\s+$/g, '');
+
+    // detect strings containing only the "use strict" directive
+    return /^(?:\/\*+[\w|\W]*?\*\/|\/\/.*?[\n\r\u2028\u2029]|\s)*(["'])use strict\1;?$/.test(result)
+      ? ''
+      : result;
   }
 
   /**
@@ -994,36 +1033,43 @@
   }
 
   /**
-   * Checks if the specified `value` is an object created by the `Object`
-   * constructor assuming objects created by the `Object` constructor have no
-   * inherited enumerable properties and assuming there are no `Object.prototype`
-   * extensions.
+   * Checks if a given `value` is an object created by the `Object` constructor
+   * assuming objects created by the `Object` constructor have no inherited
+   * enumerable properties and that there are no `Object.prototype` extensions.
    *
    * @private
    * @param {Mixed} value The value to check.
-   * @returns {Boolean} Returns `true` if `value` is an object, else `false`.
+   * @returns {Boolean} Returns `true` if the `value` is a plain `Object` object, else `false`.
    */
-  function isObject(value) {
-    var ctor,
-        result = !!value && toString.call(value) == '[object Object]';
-
-    if (result && noArgumentsClass) {
-      // avoid false positives for `arguments` objects in IE < 9
-      result = !isArguments(value);
+  function isPlainObject(value) {
+    // avoid non-objects and false positives for `arguments` objects in IE < 9
+    var result = false;
+    if (!(value && typeof value == 'object') || isArguments(value)) {
+      return result;
     }
-    if (result) {
-      // IE < 9 presents nodes like `Object` objects:
-      // IE < 8 are missing the node's constructor property
-      // IE 8 node constructors are typeof "object"
-      ctor = value.constructor;
-      // check if the constructor is `Object` as `Object instanceof Object` is `true`
-      if ((result = isClassOf(ctor, 'Function') && ctor instanceof ctor)) {
-        // An object's own properties are iterated before inherited properties.
-        // If the last iterated key belongs to an object's own property then
-        // there are no inherited enumerable properties.
-        forProps(value, function(subValue, subKey) { result = subKey; });
-        result = result === true || hasKey(value, result);
+    // IE < 9 presents DOM nodes as `Object` objects except they have `toString`
+    // methods that are `typeof` "string" and still can coerce nodes to strings.
+    // Also check that the constructor is `Object` (i.e. `Object instanceof Object`)
+    var ctor = value.constructor;
+    if ((support.nodeClass || !(typeof value.toString != 'function' && typeof (value + '') == 'string')) &&
+        (!isClassOf(ctor, 'Function') || ctor instanceof ctor)) {
+      // In most environments an object's own properties are iterated before
+      // its inherited properties. If the last iterated property is an object's
+      // own property then there are no inherited enumerable properties.
+      if (support.iteratesOwnFirst) {
+        forProps(value, function(subValue, subKey) {
+          result = subKey;
+        });
+        return result === false || hasKey(value, result);
       }
+      // IE < 9 iterates inherited properties before own properties. If the first
+      // iterated property is an object's own property then there are no inherited
+      // enumerable properties.
+      forProps(value, function(subValue, subKey) {
+        result = !hasKey(value, subKey);
+        return false;
+      });
+      return result === false;
     }
     return result;
   }
@@ -1265,7 +1311,7 @@
               break;
 
             case '[object Object]':
-              isObject(value) && (clone = new ctor);
+              isPlainObject(value) && (clone = {});
               break;
 
             case '[object Number]':
@@ -2405,13 +2451,12 @@
 
       var source = {
         'setup': getSource(bench.setup, preprocess('m$.setup()')),
-        'fn': getSource(fn, preprocess('f$(' + fnArg + ')')),
+        'fn': getSource(fn, preprocess('m$.fn(' + fnArg + ')')),
         'fnArg': fnArg,
         'teardown': getSource(bench.teardown, preprocess('m$.teardown()'))
       };
 
-      var compiled = bench.compiled,
-          count = bench.count = clone.count,
+      var count = bench.count = clone.count,
           decompilable = support.decompilation || stringable,
           id = bench.id,
           isEmpty = !(source.fn || stringable),
@@ -2433,77 +2478,77 @@
         }
       }
 
-      if (!compiled) {
-        // compile in setup/teardown functions and the test loop
-        compiled = bench.compiled = createFunction(preprocess('t$'), interpolate(
-          preprocess(deferred
-            ? 'var d$=this,#{fnArg}=d$,m$=d$.benchmark._original,f$=m$.fn,su$=m$.setup,td$=m$.teardown;' +
-              // when `deferred.cycles` is `0` then...
-              'if(!d$.cycles){' +
-              // set `deferred.fn`
-              'd$.fn=function(){var #{fnArg}=d$;if(typeof f$=="function"){try{#{fn}\n}catch(e$){f$(d$)}}else{#{fn}\n}};' +
-              // set `deferred.teardown`
-              'd$.teardown=function(){d$.cycles=0;if(typeof td$=="function"){try{#{teardown}\n}catch(e$){td$()}}else{#{teardown}\n}};' +
-              // execute the benchmark's `setup`
-              'if(typeof su$=="function"){try{#{setup}\n}catch(e$){su$()}}else{#{setup}\n};' +
-              // start timer
-              't$.start(d$);' +
-              // execute `deferred.fn` and return a dummy object
-              '}d$.fn();return{}'
+      // Compile in setup/teardown functions and the test loop.
+      // Create a new compiled test, instead of using the cached `bench.compiled`,
+      // to avoid potential engine optimizations enabled over the life of the test.
+      var compiled = bench.compiled = createFunction(preprocess('t$'), interpolate(
+        preprocess(deferred
+          ? 'var d$=this,#{fnArg}=d$,m$=d$.benchmark._original,f$=m$.fn,su$=m$.setup,td$=m$.teardown;' +
+            // when `deferred.cycles` is `0` then...
+            'if(!d$.cycles){' +
+            // set `deferred.fn`
+            'd$.fn=function(){var #{fnArg}=d$;if(typeof f$=="function"){try{#{fn}\n}catch(e$){f$(d$)}}else{#{fn}\n}};' +
+            // set `deferred.teardown`
+            'd$.teardown=function(){d$.cycles=0;if(typeof td$=="function"){try{#{teardown}\n}catch(e$){td$()}}else{#{teardown}\n}};' +
+            // execute the benchmark's `setup`
+            'if(typeof su$=="function"){try{#{setup}\n}catch(e$){su$()}}else{#{setup}\n};' +
+            // start timer
+            't$.start(d$);' +
+            // execute `deferred.fn` and return a dummy object
+            '}d$.fn();return{}'
 
-            : 'var r$,s$,m$=this,f$=m$.fn,i$=m$.count,n$=t$.ns;#{setup}\n#{begin};' +
-              'while(i$--){#{fn}\n}#{end};#{teardown}\nreturn{elapsed:r$,uid:"#{uid}"}'),
+          : 'var r$,s$,m$=this,f$=m$.fn,i$=m$.count,n$=t$.ns;#{setup}\n#{begin};' +
+            'while(i$--){#{fn}\n}#{end};#{teardown}\nreturn{elapsed:r$,uid:"#{uid}"}'),
+        source
+      ));
+
+      try {
+        if (isEmpty) {
+          // Firefox may remove dead code from Function#toString results
+          // http://bugzil.la/536085
+          throw new Error('The test "' + name + '" is empty. This may be the result of dead code removal.');
+        }
+        else if (!deferred) {
+          // pretest to determine if compiled code is exits early, usually by a
+          // rogue `return` statement, by checking for a return object with the uid
+          bench.count = 1;
+          compiled = (compiled.call(bench, timer) || {}).uid == uid && compiled;
+          bench.count = count;
+        }
+      } catch(e) {
+        compiled = null;
+        clone.error = e || new Error(String(e));
+        bench.count = count;
+      }
+      // fallback when a test exits early or errors during pretest
+      if (decompilable && !compiled && !deferred && !isEmpty) {
+        compiled = createFunction(preprocess('t$'), interpolate(
+          preprocess(
+            (clone.error && !stringable
+              ? 'var r$,s$,m$=this,f$=m$.fn,i$=m$.count'
+              : 'function f$(){#{fn}\n}var r$,s$,m$=this,i$=m$.count'
+            ) +
+            ',n$=t$.ns;#{setup}\n#{begin};m$.f$=f$;while(i$--){m$.f$()}#{end};' +
+            'delete m$.f$;#{teardown}\nreturn{elapsed:r$}'
+          ),
           source
         ));
 
         try {
-          if (isEmpty) {
-            // Firefox may remove dead code from Function#toString results
-            // http://bugzil.la/536085
-            throw new Error('The test "' + name + '" is empty. This may be the result of dead code removal.');
-          }
-          else if (!deferred) {
-            // pretest to determine if compiled code is exits early, usually by a
-            // rogue `return` statement, by checking for a return object with the uid
-            bench.count = 1;
-            compiled = (compiled.call(bench, timer) || {}).uid == uid && compiled;
-            bench.count = count;
-          }
-        } catch(e) {
-          compiled = null;
-          clone.error = e || new Error(String(e));
+          // pretest one more time to check for errors
+          bench.count = 1;
+          compiled.call(bench, timer);
+          bench.compiled = compiled;
           bench.count = count;
+          delete clone.error;
         }
-        // fallback when a test exits early or errors during pretest
-        if (decompilable && !compiled && !deferred && !isEmpty) {
-          compiled = createFunction(preprocess('t$'), interpolate(
-            preprocess(
-              (clone.error && !stringable
-                ? 'var r$,s$,m$=this,f$=m$.fn,i$=m$.count'
-                : 'function f$(){#{fn}\n}var r$,s$,m$=this,i$=m$.count'
-              ) +
-              ',n$=t$.ns;#{setup}\n#{begin};m$.f$=f$;while(i$--){m$.f$()}#{end};' +
-              'delete m$.f$;#{teardown}\nreturn{elapsed:r$}'
-            ),
-            source
-          ));
-
-          try {
-            // pretest one more time to check for errors
-            bench.count = 1;
-            compiled.call(bench, timer);
+        catch(e) {
+          bench.count = count;
+          if (clone.error) {
+            compiled = null;
+          } else {
             bench.compiled = compiled;
-            bench.count = count;
-            delete clone.error;
-          }
-          catch(e) {
-            bench.count = count;
-            if (clone.error) {
-              compiled = null;
-            } else {
-              bench.compiled = compiled;
-              clone.error = e || new Error(String(e));
-            }
+            clone.error = e || new Error(String(e));
           }
         }
       }
@@ -2698,20 +2743,18 @@
         sample = bench.stats.sample;
 
     /**
-     * Adds a number of clones to the queue.
+     * Adds a clone to the queue.
      */
-    function enqueue(count) {
-      while (count--) {
-        queue.push(bench.clone({
-          '_original': bench,
-          'events': {
-            'abort': [update],
-            'cycle': [update],
-            'error': [update],
-            'start': [update]
-          }
-        }));
-      }
+    function enqueue() {
+      queue.push(bench.clone({
+        '_original': bench,
+        'events': {
+          'abort': [update],
+          'cycle': [update],
+          'error': [update],
+          'start': [update]
+        }
+      }));
     }
 
     /**
@@ -2817,14 +2860,14 @@
       }
       // if time permits, increase sample size to reduce the margin of error
       if (queue.length < 2 && !maxedOut) {
-        enqueue(1);
+        enqueue();
       }
       // abort the invoke cycle when done
       event.aborted = done;
     }
 
     // init queue and begin
-    enqueue(minSamples);
+    enqueue();
     invoke(queue, {
       'name': 'run',
       'args': { 'async': async },
@@ -3048,6 +3091,7 @@
 
       /**
        * The maximum time a benchmark is allowed to run before finishing (secs).
+       *
        * Note: Cycle delays aren't counted toward the maximum time.
        *
        * @memberOf Benchmark.options
@@ -3221,7 +3265,7 @@
      * @memberOf Benchmark
      * @type String
      */
-    'version': '1.0.0-pre',
+    'version': '1.0.0',
 
     // an object of environment/feature detection flags
     'support': support,

vendor/docdown/README.md

@@ -1,4 +1,4 @@
-# Docdown <sup>v1.0.0-pre</sup>
+# Docdown <sup>v1.0.0</sup>
 
 A simple JSDoc to Markdown documentation generator.
 
@@ -12,7 +12,7 @@ For a list of upcoming features, check out our [roadmap](https://github.com/jdal
 
 Usage example:
 
-~~~ php
+```php
 require("docdown.php");
 
 // generate Markdown
@@ -20,18 +20,7 @@ $markdown = docdown(array(
   "path" => $filepath,
   "url"  => "https://github.com/username/project/blob/master/my.js"
 ));
-~~~
-
-## Cloning this repo
-
-To clone this repository just use:
-
-~~~ bash
-git clone https://github.com/docdown/docdown.git
-cd docdown
-~~~
-
-Feel free to fork and send pull requests if you see improvements!
+```
 
 ## Author
 

vendor/docdown/docdown.php

@@ -8,7 +8,7 @@ require(dirname(__FILE__) . '/src/DocDown/Generator.php');
 
 /**
  * Generates Markdown from JSDoc entries in a given file.
- * 
+ *
  * @param {Array} [$options=array()] The options array.
  * @returns {String} The generated Markdown.
  * @example

vendor/docdown/src/DocDown/Alias.php

@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * A class to represent a JSDoc entry alias.
+ */
+class Alias {
+
+  /**
+   * The alias owner.
+   *
+   * @memberOf Alias
+   * @type Object
+   */
+  public $owner;
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * The Alias constructor.
+   *
+   * @constructor
+   * @param {String} $name The alias name.
+   * @param {Object} $owner The alias owner.
+   */
+  public function __construct( $name, $owner ) {
+    $this->owner = $owner;
+    $this->_name = $name;
+    $this->_call = $owner->getCall();
+    $this->_category = $owner->getCategory();
+    $this->_desc = $owner->getDesc();
+    $this->_example = $owner->getExample();
+    $this->_lineNumber = $owner->getLineNumber();
+    $this->_members = $owner->getMembers();
+    $this->_params = $owner->getParams();
+    $this->_returns = $owner->getReturns();
+    $this->_type = $owner->getType();
+    $this->_isCtor = $owner->isCtor();
+    $this->_isPlugin = $owner->isPlugin();
+    $this->_isPrivate = $owner->isPrivate();
+    $this->_isStatic = $owner->isStatic();
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Extracts the entry's `alias` objects.
+   *
+   * @memberOf Alias
+   * @param {Number} $index The index of the array value to return.
+   * @returns {Array|String} The entry's `alias` objects.
+   */
+  public function getAliases( $index = null ) {
+    $result = array();
+    return $index !== null
+      ? @$result[$index]
+      : $result;
+  }
+
+  /**
+   * Extracts the function call from the owner entry.
+   *
+   * @memberOf Alias
+   * @returns {String} The function call.
+   */
+  public function getCall() {
+    return $this->_call;
+  }
+
+  /**
+   * Extracts the owner entry's `category` data.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's `category` data.
+   */
+  public function getCategory() {
+    return $this->_category;
+  }
+
+  /**
+   * Extracts the owner entry's description.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's description.
+   */
+  public function getDesc() {
+    return $this->_desc;
+  }
+
+  /**
+   * Extracts the owner entry's `example` data.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's `example` data.
+   */
+  public function getExample() {
+    return $this->_example;
+  }
+
+  /**
+   * Resolves the owner entry's line number.
+   *
+   * @memberOf Alias
+   * @returns {Number} The owner entry's line number.
+   */
+  public function getLineNumber() {
+    return $this->_lineNumber;
+  }
+
+  /**
+   * Extracts the owner entry's `member` data.
+   *
+   * @memberOf Alias
+   * @param {Number} $index The index of the array value to return.
+   * @returns {Array|String} The owner entry's `member` data.
+   */
+  public function getMembers( $index = null ) {
+    return $index !== null
+      ? @$this->_members[$index]
+      : $this->_members;
+  }
+
+  /**
+   * Extracts the owner entry's `name` data.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's `name` data.
+   */
+  public function getName() {
+    return $this->_name;
+  }
+
+  /**
+   * Extracts the owner entry's `param` data.
+   *
+   * @memberOf Alias
+   * @param {Number} $index The index of the array value to return.
+   * @returns {Array} The owner entry's `param` data.
+   */
+  public function getParams( $index = null ) {
+    return $index !== null
+      ? @$this->_params[$index]
+      : $this->_params;
+  }
+
+  /**
+   * Extracts the owner entry's `returns` data.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's `returns` data.
+   */
+  public function getReturns() {
+    return $this->_returns;
+  }
+
+  /**
+   * Extracts the owner entry's `type` data.
+   *
+   * @memberOf Alias
+   * @returns {String} The owner entry's `type` data.
+   */
+  public function getType() {
+    return $this->_type;
+  }
+
+  /**
+   * Checks if the entry is an alias.
+   *
+   * @memberOf Alias
+   * @returns {Boolean} Returns `true`.
+   */
+  public function isAlias() {
+    return true;
+  }
+
+  /**
+   * Checks if the owner entry is a constructor.
+   *
+   * @memberOf Alias
+   * @returns {Boolean} Returns `true` if a constructor, else `false`.
+   */
+  public function isCtor() {
+    return $this->_isCtor;
+  }
+
+  /**
+   * Checks if the owner entry *is* assigned to a prototype.
+   *
+   * @memberOf Alias
+   * @returns {Boolean} Returns `true` if assigned to a prototype, else `false`.
+   */
+  public function isPlugin() {
+    return $this->_isPlugin;
+  }
+
+  /**
+   * Checks if the owner entry is private.
+   *
+   * @memberOf Alias
+   * @returns {Boolean} Returns `true` if private, else `false`.
+   */
+  public function isPrivate() {
+    return $this->_isPrivate;
+  }
+
+  /**
+   * Checks if the owner entry is *not* assigned to a prototype.
+   *
+   * @memberOf Alias
+   * @returns {Boolean} Returns `true` if not assigned to a prototype, else `false`.
+   */
+  public function isStatic() {
+    return $this->_isStatic;
+  }
+}
+?>

vendor/docdown/src/DocDown/Entry.php

@@ -1,5 +1,7 @@
 <?php
 
+require(dirname(__FILE__) . "/Alias.php");
+
 /**
  * A class to simplify parsing a single JSDoc entry.
  */
@@ -37,7 +39,7 @@ class Entry {
    * @constructor
    * @param {String} $entry The documentation entry to analyse.
    * @param {String} $source The source code.
-   * @param {String} $lang The language highlighter used for code examples.
+   * @param {String} [$lang ='js'] The language highlighter used for code examples.
    */
   public function __construct( $entry, $source, $lang = 'js' ) {
     $this->entry = $entry;
@@ -70,16 +72,46 @@ class Entry {
    * @returns {Boolean} Returns `true` if the entry is a function reference, else `false`.
    */
   private function isFunction() {
-    return !!(
-      $this->isCtor() ||
-      count($this->getParams()) ||
-      count($this->getReturns()) ||
-      preg_match('/\*\s*@function\b/', $this->entry)
-    );
+    if (!isset($this->_isFunction)) {
+      $this->_isFunction = !!(
+        $this->isCtor() ||
+        count($this->getParams()) ||
+        count($this->getReturns()) ||
+        preg_match('/\* *@function\b/', $this->entry)
+      );
+    }
+    return $this->_isFunction;
   }
 
   /*--------------------------------------------------------------------------*/
 
+  /**
+   * Extracts the entry's `alias` objects.
+   *
+   * @memberOf Entry
+   * @param {Number} $index The index of the array value to return.
+   * @returns {Array|String} The entry's `alias` objects.
+   */
+  public function getAliases( $index = null ) {
+    if (!isset($this->_aliases)) {
+      preg_match('#\* *@alias\s+([^\n]+)#', $this->entry, $result);
+
+      if (count($result)) {
+        $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
+        $result = preg_split('/,\s*/', $result);
+        natsort($result);
+
+        foreach ($result as $resultIndex => $value) {
+          $result[$resultIndex] = new Alias($value, $this);
+        }
+      }
+      $this->_aliases = $result;
+    }
+    return $index !== null
+      ? @$this->_aliases[$index]
+      : $this->_aliases;
+  }
+
   /**
    * Extracts the function call from the entry.
    *
@@ -87,13 +119,17 @@ class Entry {
    * @returns {String} The function call.
    */
   public function getCall() {
+    if (isset($this->_call)) {
+      return $this->_call;
+    }
+
     preg_match('#\*/\s*(?:function ([^(]*)|(.*?)(?=[:=,]|return\b))#', $this->entry, $result);
     if ($result = array_pop($result)) {
       $result = array_pop(explode('var ', trim(trim(array_pop(explode('.', $result))), "'")));
     }
     // resolve name
     // avoid $this->getName() because it calls $this->getCall()
-    preg_match('#\*\s*@name\s+([^\n]+)#', $this->entry, $name);
+    preg_match('#\* *@name\s+([^\n]+)#', $this->entry, $name);
     if (count($name)) {
       $name = trim($name[1]);
     } else {
@@ -111,178 +147,263 @@ class Entry {
       $result = $name .'('. implode(array_slice($result, 1), ', ') .')';
       $result = str_replace(', [', ' [, ', str_replace('], [', ', ', $result));
     }
-    return $result ? $result : $name;
+
+    $this->_call = $result ? $result : $name;
+    return $this->_call;
   }
 
   /**
-   * Extracts the entry description.
+   * Extracts the entry's `category` data.
    *
    * @memberOf Entry
-   * @returns {String} The entry description.
+   * @returns {String} The entry's `category` data.
+   */
+  public function getCategory() {
+    if (isset($this->_category)) {
+      return $this->_category;
+    }
+
+    preg_match('#\* *@category\s+([^\n]+)#', $this->entry, $result);
+    if (count($result)) {
+      $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
+    } else {
+      $result = $this->getType() == 'Function' ? 'Methods' : 'Properties';
+    }
+    $this->_category = $result;
+    return $result;
+  }
+
+  /**
+   * Extracts the entry's description.
+   *
+   * @memberOf Entry
+   * @returns {String} The entry's description.
    */
   public function getDesc() {
+    if (isset($this->_desc)) {
+      return $this->_desc;
+    }
+
     preg_match('#/\*\*(?:\s*\*)?([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
     if (count($result)) {
       $type = $this->getType();
       $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
       $result = ($type == 'Function' ? '' : '(' . str_replace('|', ', ', trim($type, '{}')) . '): ') . $result;
     }
+    $this->_desc = $result;
     return $result;
   }
 
   /**
-   * Extracts the entry `example` data.
+   * Extracts the entry's `example` data.
    *
    * @memberOf Entry
-   * @returns {String} The entry `example` data.
+   * @returns {String} The entry's `example` data.
    */
   public function getExample() {
-    preg_match('#\*\s*@example\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
+    if (isset($this->_example)) {
+      return $this->_example;
+    }
+
+    preg_match('#\* *@example\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
     if (count($result)) {
       $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', "\n", $result[1]));
-      $result = '~~~ ' . $this->lang . "\n" . $result . "\n~~~";
+      $result = '```' . $this->lang . "\n" . $result . "\n```";
     }
+    $this->_example = $result;
     return $result;
   }
 
   /**
-   * Resolves the line number of the entry.
+   * Resolves the entry's line number.
    *
    * @memberOf Entry
-   * @returns {Number} The line number.
+   * @returns {Number} The entry's line number.
    */
   public function getLineNumber() {
-    preg_match_all('/\n/', substr($this->source, 0, strrpos($this->source, $this->entry) + strlen($this->entry)), $lines);
-    return count(array_pop($lines)) + 1;
+    if (!isset($this->_lineNumber)) {
+      preg_match_all('/\n/', substr($this->source, 0, strrpos($this->source, $this->entry) + strlen($this->entry)), $lines);
+      $this->_lineNumber = count(array_pop($lines)) + 1;
+    }
+    return $this->_lineNumber;
   }
 
   /**
-   * Extracts the entry `member` data.
+   * Extracts the entry's `member` data.
    *
    * @memberOf Entry
    * @param {Number} $index The index of the array value to return.
-   * @returns {Array|String} The entry `member` data.
+   * @returns {Array|String} The entry's `member` data.
    */
   public function getMembers( $index = null ) {
-    preg_match('#\*\s*@member(?:Of)?\s+([^\n]+)#', $this->entry, $result);
-    if (count($result)) {
-      $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
-      $result = preg_split('/,\s*/', $result);
+    if (!isset($this->_members)) {
+      preg_match('#\* *@member(?:Of)?\s+([^\n]+)#', $this->entry, $result);
+      if (count($result)) {
+        $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
+        $result = preg_split('/,\s*/', $result);
+        natsort($result);
+      }
+      $this->_members = $result;
     }
-    return $index !== null ? @$result[$index] : $result;
+    return $index !== null
+      ? @$this->_members[$index]
+      : $this->_members;
   }
 
   /**
-   * Extracts the entry `name` data.
+   * Extracts the entry's `name` data.
    *
    * @memberOf Entry
-   * @returns {String} The entry `name` data.
+   * @returns {String} The entry's `name` data.
    */
   public function getName() {
-    preg_match('#\*\s*@name\s+([^\n]+)#', $this->entry, $result);
+    if (isset($this->_name)) {
+      return $this->_name;
+    }
+
+    preg_match('#\* *@name\s+([^\n]+)#', $this->entry, $result);
     if (count($result)) {
       $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
     } else {
       $result = array_shift(explode('(', $this->getCall()));
     }
+    $this->_name = $result;
     return $result;
   }
 
   /**
-   * Extracts the entry `param` data.
+   * Extracts the entry's `param` data.
    *
    * @memberOf Entry
    * @param {Number} $index The index of the array value to return.
-   * @returns {Array} The entry `param` data.
+   * @returns {Array} The entry's `param` data.
    */
   public function getParams( $index = null ) {
-    preg_match_all('#\*\s*@param\s+\{([^}]+)\}\s+(\[[^]]+\]|[$\w]+)\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#i', $this->entry, $result);
-    if (count($result = array_filter(array_slice($result, 1)))) {
-      // repurpose array
-      foreach ($result as $param) {
-        foreach ($param as $key => $value) {
-          if (!is_array($result[0][$key])) {
-            $result[0][$key] = array();
+    if (!isset($this->_params)) {
+      preg_match_all('#\* *@param\s+\{([^}]+)\}\s+(\[.+\]|[$\w|]+(?:\[.+\])?)\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#i', $this->entry, $result);
+      if (count($result = array_filter(array_slice($result, 1)))) {
+        // repurpose array
+        foreach ($result as $param) {
+          foreach ($param as $key => $value) {
+            if (!is_array($result[0][$key])) {
+              $result[0][$key] = array();
+            }
+            $result[0][$key][] = trim(preg_replace('/(?:^|\n)\s*\* */', ' ', $value));
           }
-          $result[0][$key][] = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $value));
         }
+        $result = $result[0];
       }
-      $result = $result[0];
+      $this->_params = $result;
     }
-    return $index !== null ? @$result[$index] : $result;
+    return $index !== null
+      ? @$this->_params[$index]
+      : $this->_params;
   }
 
   /**
-   * Extracts the entry `returns` data.
+   * Extracts the entry's `returns` data.
    *
    * @memberOf Entry
-   * @returns {String} The entry `returns` data.
+   * @returns {String} The entry's `returns` data.
    */
   public function getReturns() {
-    preg_match('#\*\s*@returns\s+\{([^}]+)\}\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
+    if (isset($this->_returns)) {
+      return $this->_returns;
+    }
+
+    preg_match('#\* *@returns\s+\{([^}]+)\}\s+([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
     if (count($result)) {
       $result = array_map('trim', array_slice($result, 1));
       $result[0] = str_replace('|', ', ', $result[0]);
       $result[1] = preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]);
     }
+    $this->_returns = $result;
     return $result;
   }
 
   /**
-   * Extracts the entry `type` data.
+   * Extracts the entry's `type` data.
    *
    * @memberOf Entry
-   * @returns {String} The entry `type` data.
+   * @returns {String} The entry's `type` data.
    */
   public function getType() {
-    preg_match('#\*\s*@type\s+([^\n]+)#', $this->entry, $result);
+    if (isset($this->_type)) {
+      return $this->_type;
+    }
+
+    preg_match('#\* *@type\s+([^\n]+)#', $this->entry, $result);
     if (count($result)) {
       $result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
     } else {
       $result = $this->isFunction() ? 'Function' : 'Unknown';
     }
+    $this->_type = $result;
     return $result;
   }
 
   /**
-   * Checks if an entry is a constructor.
+   * Checks if the entry is an alias.
    *
    * @memberOf Entry
-   * @returns {Boolean} Returns true if a constructor, else false.
+   * @returns {Boolean} Returns `false`.
+   */
+  public function isAlias() {
+    return false;
+  }
+
+  /**
+   * Checks if the entry is a constructor.
+   *
+   * @memberOf Entry
+   * @returns {Boolean} Returns `true` if a constructor, else `false`.
    */
   public function isCtor() {
-    return !!preg_match('/\*\s*@constructor\b/', $this->entry);
+    if (!isset($this->_isCtor)) {
+      $this->_isCtor = !!preg_match('/\* *@constructor\b/', $this->entry);
+    }
+    return $this->_isCtor;
   }
 
   /**
-   * Checks if an entry *is* assigned to a prototype.
+   * Checks if the entry *is* assigned to a prototype.
    *
    * @memberOf Entry
-   * @returns {Boolean} Returns true if assigned to a prototype, else false.
+   * @returns {Boolean} Returns `true` if assigned to a prototype, else `false`.
    */
   public function isPlugin() {
-    return !$this->isCtor() && !$this->isPrivate() && !$this->isStatic();
+    if (!isset($this->_isPlugin)) {
+      $this->_isPlugin = !$this->isCtor() && !$this->isPrivate() && !$this->isStatic();
+    }
+    return $this->_isPlugin;
   }
 
   /**
-   * Checks if an entry is private.
+   * Checks if the entry is private.
    *
    * @memberOf Entry
-   * @returns {Boolean} Returns true if private, else false.
+   * @returns {Boolean} Returns `true` if private, else `false`.
    */
   public function isPrivate() {
-    return !!preg_match('/\*\s*@private\b/', $this->entry) || strrpos($this->entry, '@') === false;
+    if (!isset($this->_isPrivate)) {
+      $this->_isPrivate = !!preg_match('/\* *@private\b/', $this->entry) || !preg_match('/\* *@[a-z]+\b/', $this->entry);
+    }
+    return $this->_isPrivate;
   }
 
   /**
-   * Checks if an entry is *not* assigned to a prototype.
+   * Checks if the entry is *not* assigned to a prototype.
    *
    * @memberOf Entry
-   * @returns {Boolean} Returns true if not assigned to a prototype, else false.
+   * @returns {Boolean} Returns `true` if not assigned to a prototype, else `false`.
    */
   public function isStatic() {
+    if (isset($this->_isStatic)) {
+      return $this->_isStatic;
+    }
+
     $public = !$this->isPrivate();
-    $result = $public && !!preg_match('/\*\s*@static\b/', $this->entry);
+    $result = $public && !!preg_match('/\* *@static\b/', $this->entry);
 
     // set in cases where it isn't explicitly stated
     if ($public && !$result) {
@@ -298,6 +419,7 @@ class Entry {
         $result = true;
       }
     }
+    $this->_isStatic = $result;
     return $result;
   }
 }

vendor/docdown/src/DocDown/Generator.php

@@ -7,6 +7,15 @@ require(dirname(__FILE__) . "/Entry.php");
  */
 class Generator {
 
+  /**
+   * The HTML for the close tag.
+   *
+   * @static
+   * @memberOf Generator
+   * @type String
+   */
+  public $closeTag = "\n<!-- /div -->\n";
+
   /**
    * An array of JSDoc entries.
    *
@@ -15,6 +24,15 @@ class Generator {
    */
   public $entries = array();
 
+  /**
+   * The HTML for the open tag.
+   *
+   * @static
+   * @memberOf Generator
+   * @type String
+   */
+  public $openTag = "\n<!-- div -->\n";
+
   /**
    * An options array used to configure the generator.
    *
@@ -24,7 +42,7 @@ class Generator {
   public $options = array();
 
   /**
-   * The entire file's source code.
+   * The file's source code.
    *
    * @memberOf Generator
    * @type String
@@ -65,6 +83,9 @@ class Generator {
     if (!isset($options['lang'])) {
       $options['lang'] = 'js';
     }
+    if (!isset($options['toc'])) {
+      $options['toc'] = 'properties';
+    }
 
     $this->options = $options;
     $this->source = str_replace(PHP_EOL, "\n", $options['source']);
@@ -86,7 +107,7 @@ class Generator {
    * @param {String} $string The string to format.
    * @returns {String} The formatted string.
    */
-  private static function format($string) {
+  private static function format( $string ) {
     $counter = 0;
 
     // tokenize inline code snippets
@@ -121,7 +142,7 @@ class Generator {
    * @param {Array|Object} $object The template object.
    * @returns {String} The modified string.
    */
-  private static function interpolate($string, $object) {
+  private static function interpolate( $string, $object ) {
     preg_match_all('/#\{([^}]+)\}/', $string, $tokens);
     $tokens = array_unique(array_pop($tokens));
 
@@ -149,6 +170,63 @@ class Generator {
 
   /*--------------------------------------------------------------------------*/
 
+  /**
+   * Adds the given `$entries` to the `$result` array.
+   *
+   * @private
+   * @memberOf Generator
+   * @param {Array} $result The result array to modify.
+   * @param {Array} $entries The entries to add to the `$result`.
+   */
+  private function addEntries( &$result, $entries ) {
+    foreach ($entries as $entry) {
+      // skip aliases
+      if ($entry->isAlias()) {
+        continue;
+      }
+      // name and description
+      array_push(
+        $result,
+        $this->openTag,
+        Generator::interpolate("### <a id=\"#{hash}\"></a>`#{member}#{separator}#{call}`\n<a href=\"##{hash}\">#</a> [&#x24C8;](#{href} \"View in source\") [&#x24C9;][1]\n\n#{desc}", $entry)
+      );
+
+      // @alias
+      if (count($aliases = $entry->getAliases())) {
+        array_push($result, '', '#### Aliases');
+        foreach ($aliases as $index => $alias) {
+          $aliases[$index] = $alias->getName();
+        }
+        $result[] = '*' . implode(', ', $aliases) . '*';
+      }
+      // @param
+      if (count($params = $entry->getParams())) {
+        array_push($result, '', '#### Arguments');
+        foreach ($params as $index => $param) {
+          $result[] = Generator::interpolate('#{num}. `#{name}` (#{type}): #{desc}', array(
+            'desc' => $param[2],
+            'name' => $param[1],
+            'num'  => $index + 1,
+            'type' => $param[0]
+          ));
+        }
+      }
+      // @returns
+      if (count($returns = $entry->getReturns())) {
+        array_push(
+          $result, '',
+          '#### Returns',
+          Generator::interpolate('(#{type}): #{desc}', array('desc' => $returns[1], 'type' => $returns[0]))
+        );
+      }
+      // @example
+      if ($example = $entry->getExample()) {
+        array_push($result, '', '#### Example', $example);
+      }
+      array_push($result, "\n* * *", $this->closeTag);
+    }
+  }
+
   /**
    * Resolves the entry's hash used to navigate the documentation.
    *
@@ -163,7 +241,7 @@ class Generator {
     $member = !$member ? $entry->getMembers(0) : $member;
     $result = ($member ? $member . ($entry->isPlugin() ? 'prototype' : '') : '') . $entry->getCall();
     $result = preg_replace('/\(\[|\[\]/', '', $result);
-    $result = preg_replace('/[ =\'"{}.()\]]/', '', $result);
+    $result = preg_replace('/[ =|\'"{}.()\]]/', '', $result);
     $result = preg_replace('/[[#,]/', '-', $result);
     return strtolower($result);
   }
@@ -204,43 +282,85 @@ class Generator {
    */
   public function generate() {
     $api = array();
+    $byCategory = $this->options['toc'] == 'categories';
+    $categories = array();
+    $closeTag = $this->closeTag;
     $compiling = false;
-    $openTag = "\n<!-- div -->\n";
-    $closeTag = "\n<!-- /div -->\n";
+    $openTag = $this->openTag;
     $result = array('# ' . $this->options['title']);
+    $toc = 'toc';
 
     // initialize $api array
     foreach ($this->entries as $entry) {
+      // skip invalid or private entries
+      $name = $entry->getName();
+      if (!$name || $entry->isPrivate()) {
+        continue;
+      }
 
-      if (!$entry->isPrivate()) {
-        $name = $entry->getName();
-        $members = $entry->getMembers();
-        $members = count($members) ? $members : array('');
+      $members = $entry->getMembers();
+      $members = count($members) ? $members : array('');
 
-        foreach ($members as $member) {
-          // create api category arrays
-          if (!isset($api[$member]) && $member) {
-            $api[$member] = new Entry('', '', $entry->lang);
-            $api[$member]->static = array();
-            $api[$member]->plugin = array();
+      foreach ($members as $member) {
+        // create api category arrays
+        if ($member && !isset($api[$member])) {
+          // create temporary entry to be replaced later
+          $api[$member] = new stdClass;
+          $api[$member]->static = array();
+          $api[$member]->plugin = array();
+        }
+
+        // append entry to api member
+        if (!$member || $entry->isCtor() || ($entry->getType() == 'Object' &&
+            !preg_match('/[=:]\s*(?:null|undefined)\s*[,;]?$/', $entry->entry))) {
+
+          // assign the real entry, replacing the temporary entry if it exist
+          $member = ($member ? $member . ($entry->isPlugin() ? '#' : '.') : '') . $name;
+          $entry->static = @$api[$member] ? $api[$member]->static : array();
+          $entry->plugin = @$api[$member] ? $api[$member]->plugin : array();
+
+          $api[$member] = $entry;
+          foreach ($entry->getAliases() as $alias) {
+            $api[$member] = $alias;
+            $alias->static = array();
+            $alias->plugin = array();
           }
-          // append entry to api category
-          if (!$member || $entry->isCtor() || ($entry->getType() == 'Object' &&
-              !preg_match('/[=:]\s*null\s*[,;]?$/', $entry->entry))) {
-            $member = ($member ? $member . ($entry->isPlugin() ? '#' : '.') : '') . $name;
-            $entry->static = @$api[$member] ? $api[$member]->static : array();
-            $entry->plugin = @$api[$member] ? $api[$member]->plugin : array();
-            $api[$member]  = $entry;
+        }
+        else if ($entry->isStatic()) {
+          $api[$member]->static[] = $entry;
+          foreach ($entry->getAliases() as $alias) {
+            $api[$member]->static[] = $alias;
           }
-          else if ($entry->isStatic()) {
-            $api[$member]->static[] = $entry;
-          } else if (!$entry->isCtor()) {
-            $api[$member]->plugin[] = $entry;
+        }
+        else if (!$entry->isCtor()) {
+          $api[$member]->plugin[] = $entry;
+          foreach ($entry->getAliases() as $alias) {
+            $api[$member]->plugin[] = $alias;
           }
         }
       }
     }
 
+    // add properties to each entry
+    foreach ($api as $entry) {
+      $entry->hash = $this->getHash($entry);
+      $entry->href = $this->getLineUrl($entry);
+
+      $member = $entry->getMembers(0);
+      $member = ($member ? $member . ($entry->isPlugin() ? '.prototype.' : '.') : '') . $entry->getName();
+      $entry->member = preg_replace('/' . $entry->getName() . '$/', '', $member);
+
+      // add properties to static and plugin sub-entries
+      foreach (array('static', 'plugin') as $kind) {
+        foreach ($entry->{$kind} as $subentry) {
+          $subentry->hash = $this->getHash($subentry);
+          $subentry->href = $this->getLineUrl($subentry);
+          $subentry->member = $member;
+          $subentry->separator = $this->getSeparator($subentry);
+        }
+      }
+    }
+
     /*------------------------------------------------------------------------*/
 
     // custom sort for root level entries
@@ -248,19 +368,19 @@ class Generator {
     function sortCompare($a, $b) {
       $score = array( 'a' => 0, 'b' => 0);
       foreach (array( 'a' => $a, 'b' => $b) as $key => $value) {
-        // capitalized keys that represent constructor properties are last
+        // capitalized properties are last
         if (preg_match('/[#.][A-Z]/', $value)) {
           $score[$key] = 0;
         }
-        // lowercase keys with prototype properties are next to last
+        // lowercase prototype properties are next to last
         else if (preg_match('/#[a-z]/', $value)) {
           $score[$key] = 1;
         }
-        // lowercase keys with static properties next to first
+        // lowercase static properties next to first
         else if (preg_match('/\.[a-z]/', $value)) {
           $score[$key] = 2;
         }
-        // lowercase keys with no properties are first
+        // root properties are first
         else if (preg_match('/^[^#.]+$/', $value)) {
           $score[$key] = 3;
         }
@@ -290,43 +410,90 @@ class Generator {
 
     /*------------------------------------------------------------------------*/
 
+    // add categories
+    foreach ($api as $entry) {
+      $categories[$entry->getCategory()][] = $entry;
+      foreach (array('static', 'plugin') as $kind) {
+        foreach ($entry->{$kind} as $subentry) {
+          $categories[$subentry->getCategory()][] = $subentry;
+        }
+      }
+    }
+
+    // sort categories
+    ksort($categories);
+
+    foreach(array('Methods', 'Properties') as $category) {
+      if (isset($categories[$category])) {
+        $entries = $categories[$category];
+        unset($categories[$category]);
+        $categories[$category] = $entries;
+      }
+    }
+
+    /*------------------------------------------------------------------------*/
+
     // compile TOC
     $result[] = $openTag;
 
-    foreach ($api as $key => $entry) {
-      $entry->hash = $this->getHash($entry);
-      $entry->href = $this->getLineUrl($entry);
-
-      $member = $entry->getMembers(0);
-      $member = ($member ? $member . ($entry->isPlugin() ? '.prototype.' : '.') : '') . $entry->getName();
-
-      $entry->member = preg_replace('/' . $entry->getName() . '$/', '', $member);
-
-      $compiling = $compiling ? ($result[] = $closeTag) : true;
-
-      // add root entry
-      array_push(
-        $result,
-        $openTag, '## ' . (count($result) == 2 ? '<a id="toc"></a>' : '') . '`' . $member . '`',
-        Generator::interpolate('* [`' . $member . '`](##{hash})', $entry)
-      );
-
-      // add static and plugin sub-entries
-      foreach (array('static', 'plugin') as $kind) {
-        if ($kind == 'plugin' && count($entry->plugin)) {
-          array_push(
-            $result,
-            $closeTag,
-            $openTag,
-            '## `' . $member . ($entry->isCtor() ? '.prototype`' : '`')
-          );
+    // compile TOC by categories
+    if ($byCategory) {
+      foreach ($categories as $category => $entries) {
+        if ($compiling)  {
+          $result[] = $closeTag;
+        } else {
+          $compiling = true;
         }
-        foreach ($entry->{$kind} as $subentry) {
-          $subentry->hash = $this->getHash($subentry);
-          $subentry->href = $this->getLineUrl($subentry);
-          $subentry->member = $member;
-          $subentry->separator = $this->getSeparator($subentry);
-          $result[] = Generator::interpolate('* [`#{member}#{separator}#{name}`](##{hash})', $subentry);
+        // assign TOC hash
+        if (count($result) == 2) {
+          $toc = $category;
+        }
+        // add category
+        array_push(
+          $result,
+          $openTag, '## ' . (count($result) == 2 ? '<a id="' . $toc . '"></a>' : '') . '`' . $category . '`'
+        );
+        // add entries
+        foreach ($entries as $entry) {
+          $result[] = Generator::interpolate('* [`#{member}#{separator}#{name}`](##{hash})', $entry);
+        }
+      }
+    }
+    // compile TOC by namespace
+    else {
+      foreach ($api as $entry) {
+        if ($compiling) {
+          $result[] = $closeTag;
+        } else {
+          $compiling = true;
+        }
+        $member = $entry->member . $entry->getName();
+
+        // assign TOC hash
+        if (count($result) == 2) {
+          $toc = $member;
+        }
+        // add root entry
+        array_push(
+          $result,
+          $openTag, '## ' . (count($result) == 2 ? '<a id="' . $toc . '"></a>' : '') . '`' . $member . '`',
+          Generator::interpolate('* [`' . $member . '`](##{hash})', $entry)
+        );
+
+        // add static and plugin sub-entries
+        foreach (array('static', 'plugin') as $kind) {
+          if ($kind == 'plugin' && count($entry->plugin)) {
+            array_push(
+              $result,
+              $closeTag,
+              $openTag,
+              '## `' . $member . ($entry->isCtor() ? '.prototype`' : '`')
+            );
+          }
+          foreach ($entry->{$kind} as $subentry) {
+            $subentry->member = $member;
+            $result[] = Generator::interpolate('* [`#{member}#{separator}#{name}`](##{hash})', $subentry);
+          }
         }
       }
     }
@@ -339,69 +506,57 @@ class Generator {
     $compiling = false;
     $result[] = $openTag;
 
-    foreach ($api as $entry) {
-      // add root entry
-      $member = $entry->member . $entry->getName();
-      $compiling = $compiling ? ($result[] = $closeTag) : true;
-
-      array_push($result, $openTag, '## `' . $member . '`');
-
-      foreach (array($entry, 'static', 'plugin') as $kind) {
-        $subentries = is_string($kind) ? $entry->{$kind} : array($kind);
-
-        // title
-        if ($kind != 'static' && $entry->getType() != 'Object' &&
-              count($subentries) && $subentries[0] != $kind) {
-          if ($kind == 'plugin') {
-            $result[] = $closeTag;
-          }
-          array_push(
-            $result,
-            $openTag,
-            '## `' . $member . ($kind == 'plugin' ? '.prototype`' : '`')
-          );
+    if ($byCategory) {
+      foreach ($categories as $category => $entries) {
+        if ($compiling)  {
+          $result[] = $closeTag;
+        } else {
+          $compiling = true;
         }
+        if ($category != 'Methods' && $category != 'Properties') {
+          $category = '“' . $category . '” Methods';
+        }
+        array_push($result, $openTag, '## `' . $category . '`');
+        $this->addEntries($result, $entries);
+      }
+    }
+    else {
+      foreach ($api as $entry) {
+        // skip aliases
+        if ($entry->isAlias()) {
+          continue;
+        }
+        if ($compiling)  {
+          $result[] = $closeTag;
+        } else {
+          $compiling = true;
+        }
+        // add root entry name
+        $member = $entry->member . $entry->getName();
+        array_push($result, $openTag, '## `' . $member . '`');
 
-        // body
-        foreach ($subentries as $subentry) {
-          // description
-          array_push(
-            $result,
-            $openTag,
-            Generator::interpolate("### <a id=\"#{hash}\"></a>`#{member}#{separator}#{call}`\n<a href=\"##{hash}\">#</a> [&#x24C8;](#{href} \"View in source\") [&#x24C9;][1]\n\n#{desc}", $subentry)
-          );
+        foreach (array($entry, 'static', 'plugin') as $kind) {
+          $subentries = is_string($kind) ? $entry->{$kind} : array($kind);
 
-          // @param
-          if (count($params = $subentry->getParams())) {
-            array_push($result, '', '#### Arguments');
-            foreach ($params as $index => $param) {
-              $result[] = Generator::interpolate('#{num}. `#{name}` (#{type}): #{desc}', array(
-                'desc' => $param[2],
-                'name' => $param[1],
-                'num'  => $index + 1,
-                'type' => $param[0]
-              ));
+          // add sub-entry name
+          if ($kind != 'static' && $entry->getType() != 'Object' &&
+                count($subentries) && $subentries[0] != $kind) {
+            if ($kind == 'plugin') {
+              $result[] = $closeTag;
             }
-          }
-          // @returns
-          if (count($returns = $subentry->getReturns())) {
             array_push(
-              $result, '',
-              '#### Returns',
-              Generator::interpolate('(#{type}): #{desc}', array('desc' => $returns[1], 'type' => $returns[0]))
+              $result,
+              $openTag,
+              '## `' . $member . ($kind == 'plugin' ? '.prototype`' : '`')
             );
           }
-          // @example
-          if ($example = $subentry->getExample()) {
-            array_push($result, '', '#### Example', $example);
-          }
-          array_push($result, "\n* * *", $closeTag);
+          $this->addEntries($result, $subentries);
         }
       }
     }
 
     // close tags add TOC link reference
-    array_push($result, $closeTag, $closeTag, '', '  [1]: #toc "Jump back to the TOC."');
+    array_push($result, $closeTag, $closeTag, '', '  [1]: #' . $toc . ' "Jump back to the TOC."');
 
     // cleanup whitespace
     return trim(preg_replace('/ +\n/', "\n", join($result, "\n")));

vendor/platform.js/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright 2011-2012 John-David Dalton <http://allyoucanleet.com/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/platform.js/README.md

@@ -0,0 +1,98 @@
+# Platform.js <sup>v1.0.0</sup>
+
+A platform detection library that works on nearly all JavaScript platforms<sup><a name="fnref1" href="#fn1">1</a></sup>.
+
+## Disclaimer
+
+Platform.js is for informational purposes only and **not** intended as a substitution for [feature detection/inference](http://allyoucanleet.com/post/18087210413/feature-testing-costs#screencast2) checks.
+
+## BestieJS
+
+Platform.js is part of the BestieJS *"Best in Class"* module collection. This means we promote solid browser/environment support, ES5 precedents, unit testing, and plenty of documentation.
+
+## Documentation
+
+The documentation for Platform.js can be viewed here: [/doc/README.md](https://github.com/bestiejs/platform.js/blob/master/doc/README.md#readme)
+
+For a list of upcoming features, check out our [roadmap](https://github.com/bestiejs/platform.js/wiki/Roadmap).
+
+## Support
+
+Platform.js has been tested in at least Adobe AIR 3.1, Chrome 5-21, Firefox 1-14, IE 6-9, Opera 9.25-12, Safari 3-6, Node.js 0.8.6, Narwhal 0.3.2, RingoJS 0.8, and Rhino 1.7RC5.
+
+## Installation and usage
+
+In a browser or Adobe AIR:
+
+```html
+<script src="platform.js"></script>
+```
+
+Via [npm](http://npmjs.org/):
+
+```bash
+npm install platform
+```
+
+In [Node.js](http://nodejs.org/) and [RingoJS](http://ringojs.org/):
+
+```js
+var platform = require('platform');
+```
+
+In [Rhino](http://www.mozilla.org/rhino/):
+
+```js
+load('platform.js');
+```
+
+In an AMD loader like [RequireJS](http://requirejs.org/):
+
+```js
+require({
+  'paths': {
+    'platform': 'path/to/platform'
+  }
+},
+['platform'], function(platform) {
+  console.log(platform.name);
+});
+```
+
+Usage example:
+
+```js
+// on IE10 x86 platform preview running in IE7 compatibility mode on Windows 7 64 bit edition
+platform.name; // 'IE'
+platform.version; // '10.0'
+platform.layout; // 'Trident'
+platform.os; // 'Windows Server 2008 R2 / 7 x64'
+platform.description; // 'IE 10.0 x86 (platform preview; running in IE 7 mode) on Windows Server 2008 R2 / 7 x64'
+
+// or on an iPad
+platform.name; // 'Safari'
+platform.version; // '5.1'
+platform.product; // 'iPad'
+platform.manufacturer; // 'Apple'
+platform.layout; // 'WebKit'
+platform.os; // 'iOS 5.0'
+platform.description; // 'Safari 5.1 on Apple iPad (iOS 5.0)'
+
+// or parsing a given UA string
+var info = platform.parse('Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7.2; en; rv:2.0) Gecko/20100101 Firefox/4.0 Opera 11.52');
+info.name; // 'Opera'
+info.version; // '11.52'
+info.layout; // 'Presto'
+info.os; // 'Mac OS X 10.7.2'
+info.description; // 'Opera 11.52 (identifying as Firefox 4.0) on Mac OS X 10.7.2'
+```
+
+## Author
+
+* [John-David Dalton](http://allyoucanleet.com/)
+  [![twitter/jdalton](http://gravatar.com/avatar/299a3d891ff1920b69c364d061007043?s=70)](https://twitter.com/jdalton "Follow @jdalton on Twitter")
+
+## Contributors
+
+* [Mathias Bynens](http://mathiasbynens.be/)
+  [![twitter/mathias](http://gravatar.com/avatar/24e08a9ea84deb17ae121074d0f17125?s=70)](https://twitter.com/mathias "Follow @mathias on Twitter")

vendor/platform.js/platform.js

@@ -0,0 +1,996 @@
+/*!
+ * Platform.js v1.0.0 <http://mths.be/platform>
+ * Copyright 2010-2012 John-David Dalton <http://allyoucanleet.com/>
+ * Available under MIT license <http://mths.be/mit>
+ */
+;(function(window) {
+  'use strict';
+
+  /** Backup possible window/global object */
+  var oldWin = window;
+
+  /** Detect free variable `exports` */
+  var freeExports = typeof exports == 'object' && exports;
+
+  /** Detect free variable `global` */
+  var freeGlobal = typeof global == 'object' && global &&
+    (global == global.global ? (window = global) : global);
+
+  /** Opera regexp */
+  var reOpera = /Opera/;
+
+  /** Used to resolve a value's internal [[Class]] */
+  var toString = {}.toString;
+
+  /** Detect Java environment */
+  var java = /Java/.test(getClassOf(window.java)) && window.java;
+
+  /** A character to represent alpha */
+  var alpha = java ? 'a' : '\u03b1';
+
+  /** A character to represent beta */
+  var beta = java ? 'b' : '\u03b2';
+
+  /** Browser document object */
+  var doc = window.document || {};
+
+  /** Used to check for own properties of an object */
+  var hasOwnProperty = {}.hasOwnProperty;
+
+  /** Browser navigator object */
+  var nav = window.navigator || {};
+
+  /**
+   * Detect Opera browser
+   * http://www.howtocreate.co.uk/operaStuff/operaObject.html
+   * http://dev.opera.com/articles/view/opera-mini-web-content-authoring-guidelines/#operamini
+   */
+  var opera = window.operamini || window.opera;
+
+  /** Opera [[Class]] */
+  var operaClass = reOpera.test(operaClass = getClassOf(opera)) ? operaClass : (opera = null);
+
+  /** Possible global object */
+  var thisBinding = this;
+
+  /** Browser user agent string */
+  var userAgent = nav.userAgent || '';
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Capitalizes a string value.
+   *
+   * @private
+   * @param {String} string The string to capitalize.
+   * @returns {String} The capitalized string.
+   */
+  function capitalize(string) {
+    string = String(string);
+    return string.charAt(0).toUpperCase() + string.slice(1);
+  }
+
+  /**
+   * An iteration utility for arrays and objects.
+   *
+   * @private
+   * @param {Array|Object} object The object to iterate over.
+   * @param {Function} callback The function called per iteration.
+   */
+  function each(object, callback) {
+    var index = -1,
+        length = object.length;
+
+    if (length == length >>> 0) {
+      while (++index < length) {
+        callback(object[index], index, object);
+      }
+    } else {
+      forOwn(object, callback);
+    }
+  }
+
+  /**
+   * Trim and conditionally capitalize string values.
+   *
+   * @private
+   * @param {String} string The string to format.
+   * @returns {String} The formatted string.
+   */
+  function format(string) {
+    string = trim(string);
+    return /^(?:webOS|i(?:OS|P))/.test(string)
+      ? string
+      : capitalize(string);
+  }
+
+  /**
+   * Iterates over an object's own properties, executing the `callback` for each.
+   *
+   * @private
+   * @param {Object} object The object to iterate over.
+   * @param {Function} callback The function executed per own property.
+   */
+  function forOwn(object, callback) {
+    for (var key in object) {
+      hasKey(object, key) && callback(object[key], key, object);
+    }
+  }
+
+  /**
+   * Gets the internal [[Class]] of a value.
+   *
+   * @private
+   * @param {Mixed} value The value.
+   * @returns {String} The [[Class]].
+   */
+  function getClassOf(value) {
+    return value == null
+      ? capitalize(value)
+      : toString.call(value).slice(8, -1);
+  }
+
+  /**
+   * Checks if an object has the specified key as a direct property.
+   *
+   * @private
+   * @param {Object} object The object to check.
+   * @param {String} key The key to check for.
+   * @returns {Boolean} Returns `true` if key is a direct property, else `false`.
+   */
+  function hasKey() {
+    // lazy define for others (not as accurate)
+    hasKey = function(object, key) {
+      var parent = object != null && (object.constructor || Object).prototype;
+      return !!parent && key in Object(object) && !(key in parent && object[key] === parent[key]);
+    };
+    // for modern browsers
+    if (getClassOf(hasOwnProperty) == 'Function') {
+      hasKey = function(object, key) {
+        return object != null && hasOwnProperty.call(object, key);
+      };
+    }
+    // for Safari 2
+    else if ({}.__proto__ == Object.prototype) {
+      hasKey = function(object, key) {
+        var result = false;
+        if (object != null) {
+          object = Object(object);
+          object.__proto__ = [object.__proto__, object.__proto__ = null, result = key in object][0];
+        }
+        return result;
+      };
+    }
+    return hasKey.apply(this, arguments);
+  }
+
+  /**
+   * Host objects can return type values that are different from their actual
+   * data type. The objects we are concerned with usually return non-primitive
+   * types of object, function, or unknown.
+   *
+   * @private
+   * @param {Mixed} object The owner of the property.
+   * @param {String} property The property to check.
+   * @returns {Boolean} Returns `true` if the property value is a non-primitive, else `false`.
+   */
+  function isHostType(object, property) {
+    var type = object != null ? typeof object[property] : 'number';
+    return !/^(?:boolean|number|string|undefined)$/.test(type) &&
+      (type == 'object' ? !!object[property] : true);
+  }
+
+  /**
+   * Prepares a string for use in a RegExp constructor by making hyphens and
+   * spaces optional.
+   *
+   * @private
+   * @param {String} string The string to qualify.
+   * @returns {String} The qualified string.
+   */
+  function qualify(string) {
+    return String(string).replace(/([ -])(?!$)/g, '$1?');
+  }
+
+  /**
+   * A bare-bones` Array#reduce` like utility function.
+   *
+   * @private
+   * @param {Array} array The array to iterate over.
+   * @param {Function} callback The function called per iteration.
+   * @param {Mixed} accumulator Initial value of the accumulator.
+   * @returns {Mixed} The accumulator.
+   */
+  function reduce(array, callback) {
+    var accumulator = null;
+    each(array, function(value, index) {
+      accumulator = callback(accumulator, value, index, array);
+    });
+    return accumulator;
+  }
+
+  /**
+   * Removes leading and trailing whitespace from a string.
+   *
+   * @private
+   * @param {String} string The string to trim.
+   * @returns {String} The trimmed string.
+   */
+  function trim(string) {
+    return String(string).replace(/^ +| +$/g, '');
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Creates a new platform object.
+   *
+   * @memberOf platform
+   * @param {String} [ua = navigator.userAgent] The user agent string.
+   * @returns {Object} A platform object.
+   */
+  function parse(ua) {
+
+    ua || (ua = userAgent);
+
+    /** Temporary variable used over the script's lifetime */
+    var data;
+
+    /** The CPU architecture */
+    var arch = ua;
+
+    /** Platform description array */
+    var description = [];
+
+    /** Platform alpha/beta indicator */
+    var prerelease = null;
+
+    /** A flag to indicate that environment features should be used to resolve the platform */
+    var useFeatures = ua == userAgent;
+
+    /** The browser/environment version */
+    var version = useFeatures && opera && typeof opera.version == 'function' && opera.version();
+
+    /* Detectable layout engines (order is important) */
+    var layout = getLayout([
+      { 'label': 'WebKit', 'pattern': 'AppleWebKit' },
+      'iCab',
+      'Presto',
+      'NetFront',
+      'Tasman',
+      'Trident',
+      'KHTML',
+      'Gecko'
+    ]);
+
+    /* Detectable browser names (order is important) */
+    var name = getName([
+      'Adobe AIR',
+      'Arora',
+      'Avant Browser',
+      'Camino',
+      'Epiphany',
+      'Fennec',
+      'Flock',
+      'Galeon',
+      'GreenBrowser',
+      'iCab',
+      'Iceweasel',
+      'Iron',
+      'K-Meleon',
+      'Konqueror',
+      'Lunascape',
+      'Maxthon',
+      'Midori',
+      'Nook Browser',
+      'PhantomJS',
+      'Raven',
+      'Rekonq',
+      'RockMelt',
+      'SeaMonkey',
+      { 'label': 'Silk', 'pattern': '(?:Cloud9|Silk-Accelerated)' },
+      'Sleipnir',
+      'SlimBrowser',
+      'Sunrise',
+      'Swiftfox',
+      'WebPositive',
+      'Opera Mini',
+      'Opera',
+      'Chrome',
+      { 'label': 'Chrome Mobile', 'pattern': '(?:CriOS|CrMo)' },
+      { 'label': 'Firefox', 'pattern': '(?:Firefox|Minefield)' },
+      { 'label': 'IE', 'pattern': 'MSIE' },
+      'Safari'
+    ]);
+
+    /* Detectable products (order is important) */
+    var product = getProduct([
+      'BlackBerry',
+      { 'label': 'Galaxy S', 'pattern': 'GT-I9000' },
+      { 'label': 'Galaxy S2', 'pattern': 'GT-I9100' },
+      'Google TV',
+      'iPad',
+      'iPod',
+      'iPhone',
+      'Kindle',
+      { 'label': 'Kindle Fire', 'pattern': '(?:Cloud9|Silk-Accelerated)' },
+      'Nook',
+      'PlayBook',
+      'PlayStation Vita',
+      'TouchPad',
+      'Transformer',
+      'Xoom'
+    ]);
+
+    /* Detectable manufacturers */
+    var manufacturer = getManufacturer({
+      'Apple': { 'iPad': 1, 'iPhone': 1, 'iPod': 1 },
+      'Amazon': { 'Kindle': 1, 'Kindle Fire': 1 },
+      'Asus': { 'Transformer': 1 },
+      'Barnes & Noble': { 'Nook': 1 },
+      'BlackBerry': { 'PlayBook': 1 },
+      'Google': { 'Google TV': 1 },
+      'HP': { 'TouchPad': 1 },
+      'LG': { },
+      'Motorola': { 'Xoom': 1 },
+      'Nokia': { },
+      'Samsung': { 'Galaxy S': 1, 'Galaxy S2': 1 },
+      'Sony': { 'PlayStation Vita': 1 }
+    });
+
+    /* Detectable OSes (order is important) */
+    var os = getOS([
+      'Android',
+      'CentOS',
+      'Debian',
+      'Fedora',
+      'FreeBSD',
+      'Gentoo',
+      'Haiku',
+      'Kubuntu',
+      'Linux Mint',
+      'Red Hat',
+      'SuSE',
+      'Ubuntu',
+      'Xubuntu',
+      'Cygwin',
+      'Symbian OS',
+      'hpwOS',
+      'webOS ',
+      'webOS',
+      'Tablet OS',
+      'Linux',
+      'Mac OS X',
+      'Macintosh',
+      'Mac',
+      'Windows 98;',
+      'Windows '
+    ]);
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Picks the layout engine from an array of guesses.
+     *
+     * @private
+     * @param {Array} guesses An array of guesses.
+     * @returns {String|Null} The detected layout engine.
+     */
+    function getLayout(guesses) {
+      return reduce(guesses, function(result, guess) {
+        return result || RegExp('\\b' + (
+          guess.pattern || qualify(guess)
+        ) + '\\b', 'i').exec(ua) && (guess.label || guess);
+      });
+    }
+
+    /**
+     * Picks the manufacturer from an array of guesses.
+     *
+     * @private
+     * @param {Array} guesses An array of guesses.
+     * @returns {String|Null} The detected manufacturer.
+     */
+    function getManufacturer(guesses) {
+      return reduce(guesses, function(result, value, key) {
+        // lookup the manufacturer by product or scan the UA for the manufacturer
+        return result || (
+          value[product] ||
+          value[0/*Opera 9.25 fix*/, /^[a-z]+(?: +[a-z]+\b)*/i.exec(product)] ||
+          RegExp('\\b' + (key.pattern || qualify(key)) + '(?:\\b|\\w*\\d)', 'i').exec(ua)
+        ) && (key.label || key);
+      });
+    }
+
+    /**
+     * Picks the browser name from an array of guesses.
+     *
+     * @private
+     * @param {Array} guesses An array of guesses.
+     * @returns {String|Null} The detected browser name.
+     */
+    function getName(guesses) {
+      return reduce(guesses, function(result, guess) {
+        return result || RegExp('\\b' + (
+          guess.pattern || qualify(guess)
+        ) + '\\b', 'i').exec(ua) && (guess.label || guess);
+      });
+    }
+
+    /**
+     * Picks the OS name from an array of guesses.
+     *
+     * @private
+     * @param {Array} guesses An array of guesses.
+     * @returns {String|Null} The detected OS name.
+     */
+    function getOS(guesses) {
+      return reduce(guesses, function(result, guess) {
+        var pattern = guess.pattern || qualify(guess);
+        if (!result && (result =
+            RegExp('\\b' + pattern + '(?:/[\\d.]+|[ \\w.]*)', 'i').exec(ua))) {
+          // platform tokens defined at
+          // http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
+          // http://web.archive.org/web/20081122053950/http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
+          data = {
+            '6.2':  '8',
+            '6.1':  'Server 2008 R2 / 7',
+            '6.0':  'Server 2008 / Vista',
+            '5.2':  'Server 2003 / XP 64-bit',
+            '5.1':  'XP',
+            '5.01': '2000 SP1',
+            '5.0':  '2000',
+            '4.0':  'NT',
+            '4.90': 'ME'
+          };
+          // detect Windows version from platform tokens
+          if (/^Win/i.test(result) &&
+              (data = data[0/*Opera 9.25 fix*/, /[\d.]+$/.exec(result)])) {
+            result = 'Windows ' + data;
+          }
+          // correct character case and cleanup
+          result = format(String(result)
+            .replace(RegExp(pattern, 'i'), guess.label || guess)
+            .replace(/ ce$/i, ' CE')
+            .replace(/hpw/i, 'web')
+            .replace(/Macintosh/, 'Mac OS')
+            .replace(/_PowerPC/i, ' OS')
+            .replace(/(OS X) [^ \d]+/i, '$1')
+            .replace(/\/(\d)/, ' $1')
+            .replace(/_/g, '.')
+            .replace(/(?: BePC|[ .]*fc[ \d.]+)$/i, '')
+            .replace(/x86\.64/gi, 'x86_64')
+            .split(' on ')[0]);
+        }
+        return result;
+      });
+    }
+
+    /**
+     * Picks the product name from an array of guesses.
+     *
+     * @private
+     * @param {Array} guesses An array of guesses.
+     * @returns {String|Null} The detected product name.
+     */
+    function getProduct(guesses) {
+      return reduce(guesses, function(result, guess) {
+        var pattern = guess.pattern || qualify(guess);
+        if (!result && (result =
+              RegExp('\\b' + pattern + ' *\\d+[.\\w_]*', 'i').exec(ua) ||
+              RegExp('\\b' + pattern + '(?:; *(?:[a-z]+[_-])?[a-z]+\\d+|[^ ();-]*)', 'i').exec(ua)
+            )) {
+          // split by forward slash and append product version if needed
+          if ((result = String(guess.label || result).split('/'))[1] && !/[\d.]+/.test(result[0])) {
+            result[0] += ' ' + result[1];
+          }
+          // correct character case and cleanup
+          guess = guess.label || guess;
+          result = format(result[0]
+            .replace(RegExp(pattern, 'i'), guess)
+            .replace(RegExp('; *(?:' + guess + '[_-])?', 'i'), ' ')
+            .replace(RegExp('(' + guess + ')(\\w)', 'i'), '$1 $2'));
+        }
+        return result;
+      });
+    }
+
+    /**
+     * Resolves the version using an array of UA patterns.
+     *
+     * @private
+     * @param {Array} patterns An array of UA patterns.
+     * @returns {String|Null} The detected version.
+     */
+    function getVersion(patterns) {
+      return reduce(patterns, function(result, pattern) {
+        return result || (RegExp(pattern +
+          '(?:-[\\d.]+/|(?: for [\\w-]+)?[ /-])([\\d.]+[^ ();/_-]*)', 'i').exec(ua) || 0)[1] || null;
+      });
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * Returns `platform.description` when the platform object is coerced to a string.
+     *
+     * @name toString
+     * @memberOf platform
+     * @returns {String} Returns `platform.description` if available, else an empty string.
+     */
+    function toStringPlatform() {
+      return this.description || '';
+    }
+
+    /*------------------------------------------------------------------------*/
+
+    // convert layout to an array so we can add extra details
+    layout && (layout = [layout]);
+
+    // detect product names that contain their manufacturer's name
+    if (manufacturer && !product) {
+      product = getProduct([manufacturer]);
+    }
+    // clean up Google TV
+    if ((data = /Google TV/.exec(product))) {
+      product = data[0];
+    }
+    // detect simulators
+    if (/\bSimulator\b/i.test(ua)) {
+      product = (product ? product + ' ' : '') + 'Simulator';
+    }
+    // detect iOS
+    if (/^iP/.test(product)) {
+      name || (name = 'Safari');
+      os = 'iOS' + ((data = / OS ([\d_]+)/i.exec(ua))
+        ? ' ' + data[1].replace(/_/g, '.')
+        : '');
+    }
+    // detect Kubuntu
+    else if (name == 'Konqueror' && !/buntu/i.test(os)) {
+      os = 'Kubuntu';
+    }
+    // detect Android browsers
+    else if (manufacturer && manufacturer != 'Google' &&
+        /Chrome|Vita/.test(name + ';' + product)) {
+      name = 'Android Browser';
+      os = /Android/.test(os) ? os : 'Android';
+    }
+    // detect false positives for Firefox/Safari
+    else if (!name || (data = !/\bMinefield\b/i.test(ua) && /Firefox|Safari/.exec(name))) {
+      // escape the `/` for Firefox 1
+      if (name && !product && /[\/,]|^[^(]+?\)/.test(ua.slice(ua.indexOf(data + '/') + 8))) {
+        // clear name of false positives
+        name = null;
+      }
+      // reassign a generic name
+      if ((data = product || manufacturer || os) &&
+          (product || manufacturer || /Android|Symbian OS|Tablet OS|webOS/.test(os))) {
+        name = /[a-z]+(?: Hat)?/i.exec(/Android/.test(os) ? os : data) + ' Browser';
+      }
+    }
+    // detect non-Opera versions (order is important)
+    if (!version) {
+      version = getVersion([
+        '(?:Cloud9|CriOS|CrMo|Opera ?Mini|Raven|Silk(?!/[\\d.]+$))',
+        'Version',
+        qualify(name),
+        '(?:Firefox|Minefield|NetFront)'
+      ]);
+    }
+    // detect stubborn layout engines
+    if (layout == 'iCab' && parseFloat(version) > 3) {
+      layout = ['WebKit'];
+    } else if (data =
+        /Opera/.test(name) && 'Presto' ||
+        /\b(?:Midori|Nook|Safari)\b/i.test(ua) && 'WebKit' ||
+        !layout && /\bMSIE\b/i.test(ua) && (/^Mac/.test(os) ? 'Tasman' : 'Trident')) {
+      layout = [data];
+    }
+    // leverage environment features
+    if (useFeatures) {
+      // detect server-side environments
+      // Rhino has a global function while others have a global object
+      if (isHostType(window, 'global')) {
+        if (java) {
+          data = java.lang.System;
+          arch = data.getProperty('os.arch');
+          os = os || data.getProperty('os.name') + ' ' + data.getProperty('os.version');
+        }
+        if (typeof exports == 'object' && exports) {
+          // if `thisBinding` is the [ModuleScope]
+          if (thisBinding == oldWin && typeof system == 'object' && (data = [system])[0]) {
+            os || (os = data[0].os || null);
+            try {
+              data[1] = require('ringo/engine').version;
+              version = data[1].join('.');
+              name = 'RingoJS';
+            } catch(e) {
+              if (data[0].global == freeGlobal) {
+                name = 'Narwhal';
+              }
+            }
+          } else if (typeof process == 'object' && (data = process)) {
+            name = 'Node.js';
+            arch = data.arch;
+            os = data.platform;
+            version = /[\d.]+/.exec(data.version)[0];
+          }
+        } else if (getClassOf(window.environment) == 'Environment') {
+          name = 'Rhino';
+        }
+      }
+      // detect Adobe AIR
+      else if (getClassOf(data = window.runtime) == 'ScriptBridgingProxyObject') {
+        name = 'Adobe AIR';
+        os = data.flash.system.Capabilities.os;
+      }
+      // detect PhantomJS
+      else if (getClassOf(data = window.phantom) == 'RuntimeObject') {
+        name = 'PhantomJS';
+        version = (data = data.version || null) && (data.major + '.' + data.minor + '.' + data.patch);
+      }
+      // detect IE compatibility modes
+      else if (typeof doc.documentMode == 'number' && (data = /\bTrident\/(\d+)/i.exec(ua))) {
+        // we're in compatibility mode when the Trident version + 4 doesn't
+        // equal the document mode
+        version = [version, doc.documentMode];
+        if ((data = +data[1] + 4) != version[1]) {
+          description.push('IE ' + version[1] + ' mode');
+          layout[1] = '';
+          version[1] = data;
+        }
+        version = name == 'IE' ? String(version[1].toFixed(1)) : version[0];
+      }
+      os = os && format(os);
+    }
+    // detect prerelease phases
+    if (version && (data =
+        /(?:[ab]|dp|pre|[ab]\d+pre)(?:\d+\+?)?$/i.exec(version) ||
+        /(?:alpha|beta)(?: ?\d)?/i.exec(ua + ';' + (useFeatures && nav.appMinorVersion)) ||
+        /\bMinefield\b/i.test(ua) && 'a')) {
+      prerelease = /b/i.test(data) ? 'beta' : 'alpha';
+      version = version.replace(RegExp(data + '\\+?$'), '') +
+        (prerelease == 'beta' ? beta : alpha) + (/\d+\+?/.exec(data) || '');
+    }
+    // rename code name "Fennec"
+    if (name == 'Fennec') {
+      name = 'Firefox Mobile';
+    }
+    // obscure Maxthon's unreliable version
+    else if (name == 'Maxthon' && version) {
+      version = version.replace(/\.[\d.]+/, '.x');
+    }
+    // detect Silk desktop/accelerated modes
+    else if (name == 'Silk') {
+      if (!/Mobi/i.test(ua)) {
+        os = 'Android';
+        description.unshift('desktop mode');
+      }
+      if (/Accelerated *= *true/i.test(ua)) {
+        description.unshift('accelerated');
+      }
+    }
+    // detect Windows Phone desktop mode
+    else if (name == 'IE' && (data = (/; *(?:XBLWP|ZuneWP)(\d+)/i.exec(ua) || 0)[1])) {
+      name += ' Mobile';
+      os = 'Windows Phone OS ' + data + '.x';
+      description.unshift('desktop mode');
+    }
+    // add mobile postfix
+    else if ((name == 'IE' || name && !product && !/Browser|Mobi/.test(name)) &&
+        (os == 'Windows CE' || /Mobi/i.test(ua))) {
+      name += ' Mobile';
+    }
+    // detect IE platform preview
+    else if (name == 'IE' && useFeatures && typeof external == 'object' && !external) {
+      description.unshift('platform preview');
+    }
+    // detect BlackBerry OS version
+    // http://docs.blackberry.com/en/developers/deliverables/18169/HTTP_headers_sent_by_BB_Browser_1234911_11.jsp
+    else if (/BlackBerry/.test(product) && (data =
+        (RegExp(product.replace(/ +/g, ' *') + '/([.\\d]+)', 'i').exec(ua) || 0)[1] ||
+        version)) {
+      os = 'Device Software ' + data;
+      version = null;
+    }
+    // detect Opera identifying/masking itself as another browser
+    // http://www.opera.com/support/kb/view/843/
+    else if (this != forOwn && (
+          (useFeatures && opera) ||
+          (/Opera/.test(name) && /\b(?:MSIE|Firefox)\b/i.test(ua)) ||
+          (name == 'Firefox' && /OS X (?:\d+\.){2,}/.test(os)) ||
+          (name == 'IE' && (
+            (os && !/^Win/.test(os) && version > 5.5) ||
+            /Windows XP/.test(os) && version > 8 ||
+            version == 8 && !/Trident/.test(ua)
+          ))
+        ) && !reOpera.test(data = parse.call(forOwn, ua.replace(reOpera, '') + ';')) && data.name) {
+
+      // when "indentifying", the UA contains both Opera and the other browser's name
+      data = 'ing as ' + data.name + ((data = data.version) ? ' ' + data : '');
+      if (reOpera.test(name)) {
+        if (/IE/.test(data) && os == 'Mac OS') {
+          os = null;
+        }
+        data = 'identify' + data;
+      }
+      // when "masking", the UA contains only the other browser's name
+      else {
+        data = 'mask' + data;
+        if (operaClass) {
+          name = format(operaClass.replace(/([a-z])([A-Z])/g, '$1 $2'));
+        } else {
+          name = 'Opera';
+        }
+        if (/IE/.test(data)) {
+          os = null;
+        }
+        if (!useFeatures) {
+          version = null;
+        }
+      }
+      layout = ['Presto'];
+      description.push(data);
+    }
+    // detect WebKit Nightly and approximate Chrome/Safari versions
+    if ((data = (/\bAppleWebKit\/([\d.]+\+?)/i.exec(ua) || 0)[1])) {
+      // correct build for numeric comparison
+      // (e.g. "532.5" becomes "532.05")
+      data = [parseFloat(data.replace(/\.(\d)$/, '.0$1')), data];
+      // nightly builds are postfixed with a `+`
+      if (name == 'Safari' && data[1].slice(-1) == '+') {
+        name = 'WebKit Nightly';
+        prerelease = 'alpha';
+        version = data[1].slice(0, -1);
+      }
+      // clear incorrect browser versions
+      else if (version == data[1] ||
+          version == (/\bSafari\/([\d.]+\+?)/i.exec(ua) || 0)[1]) {
+        version = null;
+      }
+      // use the full Chrome version when available
+      data = [data[0], (/\bChrome\/([\d.]+)/i.exec(ua) || 0)[1]];
+
+      // detect JavaScriptCore
+      // http://stackoverflow.com/questions/6768474/how-can-i-detect-which-javascript-engine-v8-or-jsc-is-used-at-runtime-in-androi
+      if (!useFeatures || (/internal|\n/i.test(toString.toString()) && !data[1])) {
+        layout[1] = 'like Safari';
+        data = (data = data[0], data < 400 ? 1 : data < 500 ? 2 : data < 526 ? 3 : data < 533 ? 4 : data < 534 ? '4+' : data < 535 ? 5 : '5');
+      } else {
+        layout[1] = 'like Chrome';
+        data = data[1] || (data = data[0], data < 530 ? 1 : data < 532 ? 2 : data < 532.05 ? 3 : data < 533 ? 4 : data < 534.03 ? 5 : data < 534.07 ? 6 : data < 534.10 ? 7 : data < 534.13 ? 8 : data < 534.16 ? 9 : data < 534.24 ? 10 : data < 534.30 ? 11 : data < 535.01 ? 12 : data < 535.02 ? '13+' : data < 535.07 ? 15 : data < 535.11 ? 16 : data < 535.19 ? 17 : data < 536.05 ? 18 : data < 536.10 ? 19 : data < 537.01 ? 20 : '21');
+      }
+      // add the postfix of ".x" or "+" for approximate versions
+      layout[1] += ' ' + (data += typeof data == 'number' ? '.x' : /[.+]/.test(data) ? '' : '+');
+      // obscure version for some Safari 1-2 releases
+      if (name == 'Safari' && (!version || parseInt(version) > 45)) {
+        version = data;
+      }
+    }
+    // detect Opera desktop modes
+    if (name == 'Opera' &&  (data = /(?:zbov|zvav)$/.exec(os))) {
+      name += ' ';
+      description.unshift('desktop mode');
+      if (data == 'zvav') {
+        name += 'Mini';
+        version = null;
+      } else {
+        name += 'Mobile';
+      }
+    }
+    // detect Chrome desktop mode
+    else if (name == 'Safari' && /Chrome/.exec(layout[1])) {
+      description.unshift('desktop mode');
+      name = 'Chrome Mobile';
+      version = null;
+
+      if (/Mac OS X/.test(os)) {
+        manufacturer = 'Apple';
+        os = 'iOS 4.3+';
+      } else {
+        os = null;
+      }
+    }
+    // strip incorrect OS versions
+    if (version && version.indexOf(data = /[\d.]+$/.exec(os)) == 0 &&
+        ua.indexOf('/' + data + '-') > -1) {
+      os = trim(os.replace(data, ''));
+    }
+    // add layout engine
+    if (layout && !/Avant|Nook/.test(name) && (
+        /Browser|Lunascape|Maxthon/.test(name) ||
+        /^(?:Adobe|Arora|Midori|Phantom|Rekonq|Rock|Sleipnir|Web)/.test(name) && layout[1])) {
+      // don't add layout details to description if they are falsey
+      (data = layout[layout.length - 1]) && description.push(data);
+    }
+    // combine contextual information
+    if (description.length) {
+      description = ['(' + description.join('; ') + ')'];
+    }
+    // append manufacturer
+    if (manufacturer && product && product.indexOf(manufacturer) < 0) {
+      description.push('on ' + manufacturer);
+    }
+    // append product
+    if (product) {
+      description.push((/^on /.test(description[description.length -1]) ? '' : 'on ') + product);
+    }
+    // parse OS into an object
+    if (os) {
+      data = / ([\d.+]+)$/.exec(os);
+      os = {
+        'architecture': 32,
+        'family': data ? os.replace(data[0], '') : os,
+        'version': data ? data[1] : null,
+        'toString': function() {
+          var version = this.version;
+          return this.family + (version ? ' ' + version : '') + (this.architecture == 64 ? ' 64-bit' : '');
+        }
+      };
+    }
+    // add browser/OS architecture
+    if ((data = /\b(?:AMD|IA|Win|WOW|x86_|x)64\b/i.exec(arch)) && !/\bi686\b/i.test(arch)) {
+      if (os) {
+        os.architecture = 64;
+        os.family = os.family.replace(RegExp(' *' + data), '');
+      }
+      if (name && (/WOW64/i.test(ua) ||
+          (useFeatures && /\w(?:86|32)$/.test(nav.cpuClass || nav.platform)))) {
+        description.unshift('32-bit');
+      }
+    }
+
+    ua || (ua = null);
+
+    /*------------------------------------------------------------------------*/
+
+    /**
+     * The platform object.
+     *
+     * @name platform
+     * @type Object
+     */
+    return {
+
+      /**
+       * The browser/environment version.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'version': name && version && (description.unshift(version), version),
+
+      /**
+       * The name of the browser/environment.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'name': name && (description.unshift(name), name),
+
+      /**
+       * The name of the operating system.
+       *
+       * @memberOf platform
+       * @type Object
+       */
+      'os': os
+        ? (name &&
+            !(os == String(os).split(' ')[0] && (os == name.split(' ')[0] || product)) &&
+              description.push(product ? '(' + os + ')' : 'on ' + os), os)
+        : {
+
+          /**
+           * The CPU architecture the OS is built for.
+           *
+           * @memberOf platform.os
+           * @type String|Null
+           */
+          'architecture': null,
+
+          /**
+           * The family of the OS.
+           *
+           * @memberOf platform.os
+           * @type String|Null
+           */
+          'family': null,
+
+          /**
+           * The version of the OS.
+           *
+           * @memberOf platform.os
+           * @type String|Null
+           */
+          'version': null,
+
+          /**
+           * Returns the OS string.
+           *
+           * @memberOf platform.os
+           * @returns {String} The OS string.
+           */
+          'toString': function() { return 'null'; }
+        },
+
+      /**
+       * The platform description.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'description': description.length ? description.join(' ') : ua,
+
+      /**
+       * The name of the browser layout engine.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'layout': layout && layout[0],
+
+      /**
+       * The name of the product's manufacturer.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'manufacturer': manufacturer,
+
+      /**
+       * The alpha/beta release indicator.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'prerelease': prerelease,
+
+      /**
+       * The name of the product hosting the browser.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'product': product,
+
+      /**
+       * The browser's user agent string.
+       *
+       * @memberOf platform
+       * @type String|Null
+       */
+      'ua': ua,
+
+      // parses a user agent string into a platform object
+      'parse': parse,
+
+      // returns the platform description
+      'toString': toStringPlatform
+    };
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  // expose platform
+  // some AMD build optimizers, like r.js, check for specific condition patterns like the following:
+  if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
+    // define as an anonymous module so, through path mapping, it can be aliased
+    define(function() {
+      return parse();
+    });
+  }
+  // check for `exports` after `define` in case a build optimizer adds an `exports` object
+  else if (freeExports) {
+    // in Narwhal, Node.js, or RingoJS
+    forOwn(parse(), function(value, key) {
+      freeExports[key] = value;
+    });
+  }
+  // in a browser or Rhino
+  else {
+    // use square bracket notation so Closure Compiler won't munge `platform`
+    // http://code.google.com/closure/compiler/docs/api-tutorial3.html#export
+    window['platform'] = parse();
+  }
+}(this));

vendor/qunit-clib/README.md

@@ -1,15 +1,19 @@
-# QUnit CLIB <sup>v1.0.0-pre</sup>
+# QUnit CLIB <sup>v1.0.0</sup>
 ## command-line interface boilerplate
 
-QUnit CLIB helps extend QUnit's CLI support to many common CLI environments<sup><a name="fnref1" href="#fn1">1</a></sup>.
+QUnit CLIB helps extend QUnit's CLI support to many common CLI environments.
 
 ## Screenshot
 
 ![QUnit CLIB brings QUnit to your favorite shell.](http://i.imgur.com/jpu9l.png)
 
+## Support
+
+QUnit CLIB has been tested in at least Node.js 0.4.8-0.8.6, Narwhal v0.3.2, RingoJS v0.8.0, and Rhino v1.7RC3-RC5.
+
 ## Usage
 
-~~~ js
+```js
 (function(window) {
 
   // use a single load function
@@ -39,25 +43,13 @@ QUnit CLIB helps extend QUnit's CLI support to many common CLI environments<sup>
     QUnit.start();
   }
 }(typeof global == 'object' && global || this));
-~~~
-
-## Cloning this repo
-
-To clone this repository just use:
-
-~~~ bash
-git clone https://github.com/jdalton/qunit-clib.git
-cd qunit-clib
-~~~
-
-Feel free to fork and send pull requests if you see improvements!
+```
 
 ## Footnotes
 
-  1. QUnit CLIB has been tested in at least Node.js v0.4.8-0.6.1, Narwhal v0.3.2, RingoJS v0.7.0-0.8.0, and Rhino v1.7RC3.
-     <a name="fn1" title="Jump back to footnote 1 in the text." href="#fnref1">&#8617;</a>
+  1. QUnit v1.3.0 does not work with Narwhal or Ringo < v0.8.0
 
-  2. QUnit v1.3.0 does not work with Narwhal or Ringo < v0.8.0
+  2. Rhino v1.7RC4 does not support timeout fallbacks `clearTimeout` and `setTimeout`
 
 ## Author
 

vendor/qunit-clib/qunit-clib.js

@@ -1,10 +1,11 @@
 /*!
- * QUnit CLI Boilerplate v1.0.0-pre
+ * QUnit CLI Boilerplate v1.0.0
  * Copyright 2011-2012 John-David Dalton <http://allyoucanleet.com/>
  * Based on a gist by Jörn Zaefferer <https://gist.github.com/722381>
  * Available under MIT license <http://mths.be/mit>
  */
 ;(function(global) {
+  'use strict';
 
   /** Add `console.log()` support for Narwhal, Rhino, and RingoJS */
   global.console || (global.console = { 'log': global.print });
@@ -24,7 +25,8 @@
   var toString = {}.toString;
 
   /** Used by timer methods */
-  var timer,
+  var doneCalled,
+      timer,
       counter = 0,
       ids = {};
 
@@ -90,6 +92,8 @@
    * @returns {Number} The the ID of the timeout.
    */
   function schedule(fn, delay, args, repeated) {
+    // Rhino 1.7RC4 will error assigning `task` below
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=775566
     var task = ids[++counter] = new JavaAdapter(java.util.TimerTask, {
       'run': function() {
         fn.apply(global, args);
@@ -149,26 +153,31 @@
    *  `runtime`, and `total`.
    */
   function done(details) {
-    // stop `asyncTest()` from erroneously calling `done()` twice in environments w/o timeouts
-    if (!QUnit.doneCalled) {
-      console.log(hr);
-      console.log('    PASS: ' + details.passed + '  FAIL: ' + details.failed + '  TOTAL: ' + details.total);
-      console.log('    Finished in ' + details.runtime + ' milliseconds.');
-      console.log(hr);
-
-      // exit out of Rhino
-      try {
-        quit();
-      } catch(e) { }
-
-      // exit out of Node.js
-      try {
-        process.exit();
-      } catch(e) { }
-
-      // prevent multiple calls to `done()`
-      QUnit.doneCalled = true;
+    // stop `asyncTest()` from erroneously calling `done()` twice in
+    // environments w/o timeouts
+    if (doneCalled) {
+      return;
     }
+    doneCalled = true;
+    console.log(hr);
+    console.log('    PASS: ' + details.passed + '  FAIL: ' + details.failed + '  TOTAL: ' + details.total);
+    console.log('    Finished in ' + details.runtime + ' milliseconds.');
+    console.log(hr);
+
+    // exit out of Rhino
+    try {
+      quit();
+    } catch(e) { }
+
+    // exit out of Node.js
+    try {
+      if (details.failed) {
+        console.error('Error: ' + details.failed + ' of ' + details.total + ' tests failed.');
+        process.exit(1);
+      } else {
+        process.exit(0);
+      }
+    } catch(e) { }
   }
 
   /**
@@ -181,12 +190,13 @@
   function log(details) {
     var expected = details.expected,
         result = details.result,
-        type = typeof expected != 'undefined' ? 'EQ' : 'OK',
-        assertion = [
-          result ? 'PASS' : 'FAIL',
-          type,
-          details.message || 'ok'
-        ];
+        type = typeof expected != 'undefined' ? 'EQ' : 'OK';
+
+    var assertion = [
+      result ? 'PASS' : 'FAIL',
+      type,
+      details.message || 'ok'
+    ];
 
     if (!result && type == 'EQ') {
       assertion.push('Expected: ' + expected + ', Actual: ' + details.actual);
@@ -215,7 +225,7 @@
    * @returns {String} The result string.
    */
   var parseObject = (function() {
-    var _parseObject = QUnit.jsDump.parsers.object;
+    var func = QUnit.jsDump.parsers.object;
     return function(object) {
       // fork to support Rhino's error objects
       if (typeof object.rhinoException == 'object') {
@@ -224,7 +234,7 @@
           '", fileName: "' + object.fileName +
           '", lineNumber: ' + object.lineNumber + ' }';
       }
-      return _parseObject(object);
+      return func(object);
     };
   }());
 
@@ -237,16 +247,16 @@
    */
   function testDone(details) {
     var assertions = QUnit.config.testStats.assertions,
-        name = details.name;
+        testName = details.name;
 
     if (details.failed > 0) {
-      console.log(' FAIL - '+ name);
+      console.log(' FAIL - '+ testName);
       each(assertions, function(value) {
         console.log('    ' + value);
       });
     }
     else {
-      console.log(' PASS - ' + name);
+      console.log(' PASS - ' + testName);
     }
     assertions.length = 0;
   }
@@ -274,8 +284,11 @@
   // exclude `module` because some environments have it as a built-in object
   each(['asyncTest', 'deepEqual', 'equal', 'equals', 'expect', 'notDeepEqual',
         'notEqual', 'notStrictEqual', 'ok', 'raises', 'same', 'start', 'stop',
-        'strictEqual', 'test'], function(name) {
-    global[name] = QUnit[name];
+        'strictEqual', 'test', 'throws'], function(funcName) {
+    var func = QUnit[funcName];
+    if (func) {
+      global[funcName] = func;
+    }
   });
 
   // expose timer methods to global
@@ -301,11 +314,11 @@
   QUnit.moduleStart(moduleStart);
   QUnit.testDone(testDone);
 
-  // wrap `parseObject`
+  // add wrapped function
   QUnit.jsDump.parsers.object = parseObject;
 
-  // must call `QUnit.start()` in the test file if using QUnit < 1.3.0 with Node.js
-  // or any version of QUnit with Narwhal, Rhino, or RingoJS
+  // must call `QUnit.start()` in the test file if using QUnit < 1.3.0 with
+  // Node.js or any version of QUnit with Narwhal, Rhino, or RingoJS
   QUnit.init();
 
 }(typeof global == 'object' && global || this));

vendor/qunit/README.md

@@ -41,8 +41,9 @@ Releases
 --------
 
 Install git-extras and run `git changelog` to update History.md.
-Update qunit/qunit.js|css to the release version, commit and tag, update them
-again to the next version, commit and push commits and tags.
+Update qunit/qunit.js|css and package.json to the release version, commit and
+tag, update them again to the next version, commit and push commits and tags
+(`git push --tags origin master`).
 
-Put the 'v' in front of the tag (unlike the 1.1.0 release). Clean up the changelog,
-removing merge commits or whitespace cleanups.
+Put the 'v' in front of the tag, e.g. `v1.8.0`. Clean up the changelog, removing merge commits
+or whitespace cleanups.

vendor/qunit/qunit/qunit.css

@@ -1,5 +1,5 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,9 +54,9 @@
 	color: #fff;
 }
 
-#qunit-header label {
+#qunit-testrunner-toolbar label {
 	display: inline-block;
-	padding-left: 0.5em;
+	padding: 0 .5em 0 .1em;
 }
 
 #qunit-banner {
@@ -113,13 +113,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -162,8 +158,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -172,9 +167,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -190,15 +185,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }

vendor/qunit/qunit/qunit.js

@@ -1,5 +1,5 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.9.0 - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
@@ -403,6 +403,8 @@ QUnit = {
 QUnit.assert = {
 	/**
 	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
 	ok: function( result, msg ) {
@@ -437,36 +439,59 @@ QUnit.assert = {
 	/**
 	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
+	 * @name equal
+	 * @function
 	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
 	equal: function( actual, expected, message ) {
 		QUnit.push( expected == actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notEqual
+	 * @function
+	 */
 	notEqual: function( actual, expected, message ) {
 		QUnit.push( expected != actual, actual, expected, message );
 	},
 
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
 	deepEqual: function( actual, expected, message ) {
 		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
 	notDeepEqual: function( actual, expected, message ) {
 		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
 	strictEqual: function( actual, expected, message ) {
 		QUnit.push( expected === actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
 	notStrictEqual: function( actual, expected, message ) {
 		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function( block, expected, message ) {
+	throws: function( block, expected, message ) {
 		var actual,
 			ok = false;
 
+		// 'expected' is optional
 		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
@@ -494,18 +519,29 @@ QUnit.assert = {
 			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.push( ok, actual, null, message );
+			QUnit.push( ok, actual, null, message );
+		} else {
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+		}
 	}
 };
 
-// @deprecated: Kept assertion helpers in root for backwards compatibility
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
 extend( QUnit, QUnit.assert );
 
 /**
- * @deprecated: Kept for backwards compatibility
- * next step: remove entirely
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
  */
 QUnit.equals = function() {
 	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
@@ -549,7 +585,20 @@ config = {
 	// when enabled, all tests must call expect()
 	requireExpects: false,
 
-	urlConfig: [ "noglobals", "notrycatch" ],
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
 
 	// logging callback queues
 	begin: [],
@@ -770,7 +819,7 @@ extend( QUnit, {
 		});
 	},
 
-	pushFailure: function( message, source ) {
+	pushFailure: function( message, source, actual ) {
 		if ( !config.current ) {
 			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
@@ -781,15 +830,23 @@ extend( QUnit, {
 				message: message
 			};
 
-		message = escapeInnerText(message ) || "error";
+		message = escapeInnerText( message ) || "error";
 		message = "<span class='test-message'>" + message + "</span>";
 		output = message;
 
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
 		if ( source ) {
 			details.source = source;
-			output += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 		}
 
+		output += "</table>";
+
 		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
@@ -859,7 +916,7 @@ QUnit.load = function() {
 	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes,
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
 
@@ -872,8 +929,15 @@ QUnit.load = function() {
 
 	for ( i = 0; i < len; i++ ) {
 		val = config.urlConfig[i];
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += "<label><input name='" + val + "' type='checkbox'" + ( config[val] ? " checked='checked'" : "" ) + ">" + val + "</label>";
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
 	// `userAgent` initialized at top of scope
@@ -885,12 +949,7 @@ QUnit.load = function() {
 	// `banner` initialized at top of scope
 	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined }) + "'>" + banner.innerHTML + "</a> " + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
 	// `toolbar` initialized at top of scope
@@ -931,8 +990,18 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
 	}
 
 	// `main` initialized at top of scope
@@ -1051,14 +1120,14 @@ function done() {
 function validTest( test ) {
 	var include,
 		filter = config.filter && config.filter.toLowerCase(),
-		module = config.module,
+		module = config.module && config.module.toLowerCase(),
 		fullName = (test.module + ": " + test.testName).toLowerCase();
 
 	if ( config.testNumber ) {
 		return test.testNumber === config.testNumber;
 	}
 
-	if ( module && test.module !== module ) {
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
 		return false;
 	}
 

vendor/underscore/test/arrays.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Arrays");
 
-  test("arrays: first", function() {
+  test("first", function() {
     equal(_.first([1,2,3]), 1, 'can pull out the first element of an array');
     equal(_([1, 2, 3]).first(), 1, 'can perform OO-style "first()"');
     equal(_.first([1,2,3], 0).join(', '), "", 'can pass an index to first');
@@ -14,9 +14,11 @@ $(document).ready(function() {
     equal(result.join(','), '1,1', 'works well with _.map');
     result = (function() { return _.take([1,2,3], 2); })();
     equal(result.join(','), '1,2', 'aliased as take');
+
+    equal(_.first(null), undefined, 'handles nulls');
   });
 
-  test("arrays: rest", function() {
+  test("rest", function() {
     var numbers = [1, 2, 3, 4];
     equal(_.rest(numbers).join(", "), "2, 3, 4", 'working rest()');
     equal(_.rest(numbers, 0).join(", "), "1, 2, 3, 4", 'working rest(0)');
@@ -25,9 +27,11 @@ $(document).ready(function() {
     equal(result.join(', '), '2, 3, 4', 'aliased as tail and works on arguments object');
     result = _.map([[1,2,3],[1,2,3]], _.rest);
     equal(_.flatten(result).join(','), '2,3,2,3', 'works well with _.map');
+    result = (function(){ return _(arguments).drop(); })(1, 2, 3, 4);
+    equal(result.join(', '), '2, 3, 4', 'aliased as drop and works on arguments object');
   });
 
-  test("arrays: initial", function() {
+  test("initial", function() {
     equal(_.initial([1,2,3,4,5]).join(", "), "1, 2, 3, 4", 'working initial()');
     equal(_.initial([1,2,3,4],2).join(", "), "1, 2", 'initial can take an index');
     var result = (function(){ return _(arguments).initial(); })(1, 2, 3, 4);
@@ -36,7 +40,7 @@ $(document).ready(function() {
     equal(_.flatten(result).join(','), '1,2,1,2', 'initial works with _.map');
   });
 
-  test("arrays: last", function() {
+  test("last", function() {
     equal(_.last([1,2,3]), 3, 'can pull out the last element of an array');
     equal(_.last([1,2,3], 0).join(', '), "", 'can pass an index to last');
     equal(_.last([1,2,3], 2).join(', '), '2, 3', 'can pass an index to last');
@@ -45,15 +49,17 @@ $(document).ready(function() {
     equal(result, 4, 'works on an arguments object');
     result = _.map([[1,2,3],[1,2,3]], _.last);
     equal(result.join(','), '3,3', 'works well with _.map');
+
+    equal(_.last(null), undefined, 'handles nulls');
   });
 
-  test("arrays: compact", function() {
+  test("compact", function() {
     equal(_.compact([0, 1, false, 2, false, 3]).length, 3, 'can trim out all falsy values');
     var result = (function(){ return _(arguments).compact().length; })(0, 1, false, 2, false, 3);
     equal(result, 3, 'works on an arguments object');
   });
 
-  test("arrays: flatten", function() {
+  test("flatten", function() {
     if (window.JSON) {
       var list = [1, [2], [3, [[[4]]]]];
       equal(JSON.stringify(_.flatten(list)), '[1,2,3,4]', 'can flatten nested arrays');
@@ -63,7 +69,7 @@ $(document).ready(function() {
     }
   });
 
-  test("arrays: without", function() {
+  test("without", function() {
     var list = [1, 2, 1, 0, 3, 1, 4];
     equal(_.without(list, 0, 1).join(', '), '2, 3, 4', 'can remove all instances of an object');
     var result = (function(){ return _.without(arguments, 0, 1); })(1, 2, 1, 0, 3, 1, 4);
@@ -74,7 +80,7 @@ $(document).ready(function() {
     ok(_.without(list, list[0]).length == 1, 'ditto.');
   });
 
-  test("arrays: uniq", function() {
+  test("uniq", function() {
     var list = [1, 2, 1, 3, 1, 4];
     equal(_.uniq(list).join(', '), '1, 2, 3, 4', 'can find the unique values of an unsorted array');
 
@@ -93,7 +99,7 @@ $(document).ready(function() {
     equal(result.join(', '), '1, 2, 3, 4', 'works on an arguments object');
   });
 
-  test("arrays: intersection", function() {
+  test("intersection", function() {
     var stooges = ['moe', 'curly', 'larry'], leaders = ['moe', 'groucho'];
     equal(_.intersection(stooges, leaders).join(''), 'moe', 'can take the set intersection of two arrays');
     equal(_(stooges).intersection(leaders).join(''), 'moe', 'can perform an OO-style intersection');
@@ -101,7 +107,7 @@ $(document).ready(function() {
     equal(result.join(''), 'moe', 'works on an arguments object');
   });
 
-  test("arrays: union", function() {
+  test("union", function() {
     var result = _.union([1, 2, 3], [2, 30, 1], [1, 40]);
     equal(result.join(' '), '1 2 3 30 40', 'takes the union of a list of arrays');
 
@@ -109,7 +115,7 @@ $(document).ready(function() {
     equal(result.join(' '), '1 2 3 30 40 1', 'takes the union of a list of nested arrays');
   });
 
-  test("arrays: difference", function() {
+  test("difference", function() {
     var result = _.difference([1, 2, 3], [2, 30, 40]);
     equal(result.join(' '), '1 3', 'takes the difference of two arrays');
 
@@ -117,19 +123,28 @@ $(document).ready(function() {
     equal(result.join(' '), '3 4', 'takes the difference of three arrays');
   });
 
-  test('arrays: zip', function() {
+  test('zip', function() {
     var names = ['moe', 'larry', 'curly'], ages = [30, 40, 50], leaders = [true];
     var stooges = _.zip(names, ages, leaders);
     equal(String(stooges), 'moe,30,true,larry,40,,curly,50,', 'zipped together arrays of different lengths');
   });
 
-  test('arrays: zipObject', function() {
-    var result = _.zipObject(['moe', 'larry', 'curly'], [30, 40, 50]);
+  test('object', function() {
+    var result = _.object(['moe', 'larry', 'curly'], [30, 40, 50]);
     var shouldBe = {moe: 30, larry: 40, curly: 50};
     ok(_.isEqual(result, shouldBe), 'two arrays zipped together into an object');
+
+    result = _.object([['one', 1], ['two', 2], ['three', 3]]);
+    shouldBe = {one: 1, two: 2, three: 3};
+    ok(_.isEqual(result, shouldBe), 'an array of pairs zipped together into an object');
+
+    var stooges = {moe: 30, larry: 40, curly: 50};
+    ok(_.isEqual(_.object(_.pairs(stooges)), stooges), 'an object converted to pairs and back to an object');
+
+    ok(_.isEqual(_.object(null), {}), 'handles nulls');
   });
 
-  test("arrays: indexOf", function() {
+  test("indexOf", function() {
     var numbers = [1, 2, 3];
     numbers.indexOf = null;
     equal(_.indexOf(numbers, 2), 1, 'can compute indexOf, even without the native function');
@@ -148,19 +163,30 @@ $(document).ready(function() {
     numbers = [1, 40, 40, 40, 40, 40, 40, 40, 50, 60, 70]; num = 40;
     index = _.indexOf(numbers, num, true);
     equal(index, 1, '40 is in the list');
+
+    numbers = [1, 2, 3, 1, 2, 3, 1, 2, 3];
+    index = _.indexOf(numbers, 2, 5);
+    equal(index, 7, 'supports the fromIndex argument');
   });
 
-  test("arrays: lastIndexOf", function() {
-    var numbers = [1, 0, 1, 0, 0, 1, 0, 0, 0];
+  test("lastIndexOf", function() {
+    var numbers = [1, 0, 1];
+    equal(_.lastIndexOf(numbers, 1), 2);
+
+    numbers = [1, 0, 1, 0, 0, 1, 0, 0, 0];
     numbers.lastIndexOf = null;
     equal(_.lastIndexOf(numbers, 1), 5, 'can compute lastIndexOf, even without the native function');
     equal(_.lastIndexOf(numbers, 0), 8, 'lastIndexOf the other element');
     var result = (function(){ return _.lastIndexOf(arguments, 1); })(1, 0, 1, 0, 0, 1, 0, 0, 0);
     equal(result, 5, 'works on an arguments object');
     equal(_.indexOf(null, 2), -1, 'handles nulls properly');
+
+    numbers = [1, 2, 3, 1, 2, 3, 1, 2, 3];
+    index = _.lastIndexOf(numbers, 2, 2);
+    equal(index, 1, 'supports the fromIndex argument');
   });
 
-  test("arrays: range", function() {
+  test("range", function() {
     equal(_.range(0).join(''), '', 'range with 0 as a first argument generates an empty array');
     equal(_.range(4).join(' '), '0 1 2 3', 'range with a single positive argument generates an array of elements 0,1,2,...,n-1');
     equal(_.range(5, 8).join(' '), '5 6 7', 'range with two arguments a & b, a<b generates an array of elements a,a+1,a+2,...,b-2,b-1');

vendor/underscore/test/chaining.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Chaining");
 
-  test("chaining: map/flatten/reduce", function() {
+  test("map/flatten/reduce", function() {
     var lyrics = [
       "I'm a lumberjack and I'm okay",
       "I sleep all night and I work all day",
@@ -20,7 +20,7 @@ $(document).ready(function() {
     ok(counts['a'] == 16 && counts['e'] == 10, 'counted all the letters in the song');
   });
 
-  test("chaining: select/reject/sortBy", function() {
+  test("select/reject/sortBy", function() {
     var numbers = [1,2,3,4,5,6,7,8,9,10];
     numbers = _(numbers).chain().select(function(n) {
       return n % 2 == 0;
@@ -32,7 +32,7 @@ $(document).ready(function() {
     equal(numbers.join(', '), "10, 6, 2", "filtered and reversed the numbers");
   });
 
-  test("chaining: select/reject/sortBy in functional style", function() {
+  test("select/reject/sortBy in functional style", function() {
     var numbers = [1,2,3,4,5,6,7,8,9,10];
     numbers = _.chain(numbers).select(function(n) {
       return n % 2 == 0;
@@ -44,7 +44,7 @@ $(document).ready(function() {
     equal(numbers.join(', '), "10, 6, 2", "filtered and reversed the numbers");
   });
 
-  test("chaining: reverse/concat/unshift/pop/map", function() {
+  test("reverse/concat/unshift/pop/map", function() {
     var numbers = [1,2,3,4,5];
     numbers = _(numbers).chain()
       .reverse()

vendor/underscore/test/collections.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Collections");
 
-  test("collections: each", function() {
+  test("each", function() {
     _.each([1, 2, 3], function(num, i) {
       equal(num, i + 1, 'each iterators provide value and iteration count');
     });
@@ -31,7 +31,7 @@ $(document).ready(function() {
     equal(answers, 0, 'handles a null properly');
   });
 
-  test('collections: map', function() {
+  test('map', function() {
     var doubled = _.map([1, 2, 3], function(num){ return num * 2; });
     equal(doubled.join(', '), '2, 4, 6', 'doubled numbers');
 
@@ -44,8 +44,13 @@ $(document).ready(function() {
     var doubled = _([1, 2, 3]).map(function(num){ return num * 2; });
     equal(doubled.join(', '), '2, 4, 6', 'OO-style doubled numbers');
 
+    if (document.querySelectorAll) {
+      var ids = _.map(document.querySelectorAll('#map-test *'), function(n){ return n.id; });
+      deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on NodeLists.');
+    }
+
     var ids = _.map($('#map-test').children(), function(n){ return n.id; });
-    deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on NodeLists.');
+    deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on jQuery Array-likes.');
 
     var ids = _.map(document.images, function(n){ return n.id; });
     ok(ids[0] == 'chart_image', 'can use collection methods on HTMLCollections');
@@ -54,7 +59,7 @@ $(document).ready(function() {
     ok(_.isArray(ifnull) && ifnull.length === 0, 'handles a null properly');
   });
 
-  test('collections: reduce', function() {
+  test('reduce', function() {
     var sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; }, 0);
     equal(sum, 6, 'can sum up an array');
 
@@ -84,7 +89,7 @@ $(document).ready(function() {
     raises(function() { _.reduce([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
   });
 
-  test('collections: reduceRight', function() {
+  test('reduceRight', function() {
     var list = _.reduceRight(["foo", "bar", "baz"], function(memo, str){ return memo + str; }, '');
     equal(list, 'bazbarfoo', 'can perform right folds');
 
@@ -102,24 +107,60 @@ $(document).ready(function() {
     }
     ok(ifnull instanceof TypeError, 'handles a null (without inital value) properly');
 
+    var sum = _.reduceRight({a: 1, b: 2, c: 3}, function(sum, num){ return sum + num; });
+    equal(sum, 6, 'default initial value on object');
+
     ok(_.reduceRight(null, function(){}, 138) === 138, 'handles a null (with initial value) properly');
 
     equal(_.reduceRight([], function(){}, undefined), undefined, 'undefined can be passed as a special case');
     raises(function() { _.reduceRight([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
+
+    // Assert that the correct arguments are being passed.
+
+    var args,
+        memo = {},
+        object = {a: 1, b: 2},
+        lastKey = _.keys(object).pop();
+
+    var expected = lastKey == 'a'
+      ? [memo, 1, 'a', object]
+      : [memo, 2, 'b', object];
+
+    _.reduceRight(object, function() {
+      args || (args = _.toArray(arguments));
+    }, memo);
+
+    deepEqual(args, expected);
+
+    // And again, with numeric keys.
+
+    object = {'2': 'a', '1': 'b'};
+    lastKey = _.keys(object).pop();
+    args = null;
+
+    expected = lastKey == '2'
+      ? [memo, 'a', '2', object]
+      : [memo, 'b', '1', object];
+
+    _.reduceRight(object, function() {
+      args || (args = _.toArray(arguments));
+    }, memo);
+
+    deepEqual(args, expected);
   });
 
-  test('collections: find', function() {
+  test('find', function() {
     var array = [1, 2, 3, 4];
     strictEqual(_.find(array, function(n) { return n > 2; }), 3, 'should return first found `value`');
     strictEqual(_.find(array, function() { return false; }), void 0, 'should return `undefined` if `value` is not found');
   });
 
-  test('collections: detect', function() {
+  test('detect', function() {
     var result = _.detect([1, 2, 3], function(num){ return num * 2 == 4; });
     equal(result, 2, 'found the first "2" and broke the loop');
   });
 
-  test('collections: select', function() {
+  test('select', function() {
     var evens = _.select([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
     equal(evens.join(', '), '2, 4, 6', 'selected each even number');
 
@@ -127,12 +168,12 @@ $(document).ready(function() {
     equal(evens.join(', '), '2, 4, 6', 'aliased as "filter"');
   });
 
-  test('collections: reject', function() {
+  test('reject', function() {
     var odds = _.reject([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
     equal(odds.join(', '), '1, 3, 5', 'rejected each even number');
   });
 
-  test('collections: all', function() {
+  test('all', function() {
     ok(_.all([], _.identity), 'the empty set');
     ok(_.all([true, true, true], _.identity), 'all true values');
     ok(!_.all([true, false, true], _.identity), 'one false value');
@@ -141,9 +182,10 @@ $(document).ready(function() {
     ok(_.all([1], _.identity) === true, 'cast to boolean - true');
     ok(_.all([0], _.identity) === false, 'cast to boolean - false');
     ok(_.every([true, true, true], _.identity), 'aliased as "every"');
+    ok(!_.all([undefined, undefined, undefined], _.identity), 'works with arrays of undefined');
   });
 
-  test('collections: any', function() {
+  test('any', function() {
     var nativeSome = Array.prototype.some;
     Array.prototype.some = null;
     ok(!_.any([]), 'the empty set');
@@ -159,21 +201,21 @@ $(document).ready(function() {
     Array.prototype.some = nativeSome;
   });
 
-  test('collections: include', function() {
+  test('include', function() {
     ok(_.include([1,2,3], 2), 'two is in the array');
     ok(!_.include([1,3,9], 2), 'two is not in the array');
     ok(_.contains({moe:1, larry:3, curly:9}, 3) === true, '_.include on objects checks their values');
     ok(_([1,2,3]).include(2), 'OO-style include');
   });
 
-  test('collections: invoke', function() {
+  test('invoke', function() {
     var list = [[5, 1, 7], [3, 2, 1]];
     var result = _.invoke(list, 'sort');
     equal(result[0].join(', '), '1, 5, 7', 'first array sorted');
     equal(result[1].join(', '), '1, 2, 3', 'second array sorted');
   });
 
-  test('collections: invoke w/ function reference', function() {
+  test('invoke w/ function reference', function() {
     var list = [[5, 1, 7], [3, 2, 1]];
     var result = _.invoke(list, Array.prototype.sort);
     equal(result[0].join(', '), '1, 5, 7', 'first array sorted');
@@ -181,7 +223,7 @@ $(document).ready(function() {
   });
 
   // Relevant when using ClojureScript
-  test('collections: invoke when strings have a call method', function() {
+  test('invoke when strings have a call method', function() {
     String.prototype.call = function() {
       return 42;
     };
@@ -195,12 +237,22 @@ $(document).ready(function() {
     equal(s.call, undefined, "call function removed");
   });
 
-  test('collections: pluck', function() {
+  test('pluck', function() {
     var people = [{name : 'moe', age : 30}, {name : 'curly', age : 50}];
     equal(_.pluck(people, 'name').join(', '), 'moe, curly', 'pulls names out of objects');
   });
 
-  test('collections: max', function() {
+  test('where', function() {
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
+    var result = _.where(list, {a: 1});
+    equal(result.length, 3);
+    equal(result[result.length - 1].b, 4);
+    result = _.where(list, {b: 2});
+    equal(result.length, 2);
+    equal(result[0].a, 1);
+  });
+
+  test('max', function() {
     equal(3, _.max([1, 2, 3]), 'can perform a regular Math.max');
 
     var neg = _.max([1, 2, 3], function(num){ return -num; });
@@ -212,7 +264,7 @@ $(document).ready(function() {
     equal(299999, _.max(_.range(1,300000)), "Maximum value of a too-big array");
   });
 
-  test('collections: min', function() {
+  test('min', function() {
     equal(1, _.min([1, 2, 3]), 'can perform a regular Math.min');
 
     var neg = _.min([1, 2, 3], function(num){ return -num; });
@@ -228,7 +280,7 @@ $(document).ready(function() {
     equal(1, _.min(_.range(1,300000)), "Minimum value of a too-big array");
   });
 
-  test('collections: sortBy', function() {
+  test('sortBy', function() {
     var people = [{name : 'curly', age : 50}, {name : 'moe', age : 30}];
     people = _.sortBy(people, function(person){ return person.age; });
     equal(_.pluck(people, 'name').join(', '), 'moe, curly', 'stooges sorted by age');
@@ -239,9 +291,32 @@ $(document).ready(function() {
     var list = ["one", "two", "three", "four", "five"];
     var sorted = _.sortBy(list, 'length');
     equal(sorted.join(' '), 'one two four five three', 'sorted by length');
+
+    function Pair(x, y) {
+      this.x = x;
+      this.y = y;
+    }
+
+    var collection = [
+      new Pair(1, 1), new Pair(1, 2),
+      new Pair(1, 3), new Pair(1, 4),
+      new Pair(1, 5), new Pair(1, 6),
+      new Pair(2, 1), new Pair(2, 2),
+      new Pair(2, 3), new Pair(2, 4),
+      new Pair(2, 5), new Pair(2, 6),
+      new Pair(undefined, 1), new Pair(undefined, 2),
+      new Pair(undefined, 3), new Pair(undefined, 4),
+      new Pair(undefined, 5), new Pair(undefined, 6)
+    ];
+
+    var actual = _.sortBy(collection, function(pair) {
+      return pair.x;
+    });
+
+    deepEqual(actual, collection, 'sortBy should be stable');
   });
 
-  test('collections: groupBy', function() {
+  test('groupBy', function() {
     var parity = _.groupBy([1, 2, 3, 4, 5, 6], function(num){ return num % 2; });
     ok('0' in parity && '1' in parity, 'created a group for each value');
     equal(parity[0].join(', '), '2, 4, 6', 'put each even number in the right group');
@@ -251,25 +326,70 @@ $(document).ready(function() {
     equal(grouped['3'].join(' '), 'one two six ten');
     equal(grouped['4'].join(' '), 'four five nine');
     equal(grouped['5'].join(' '), 'three seven eight');
+
+    var context = {};
+    _.groupBy([{}], function(){ ok(this === context); }, context);
+
+    grouped = _.groupBy([4.2, 6.1, 6.4], function(num) {
+      return Math.floor(num) > 4 ? 'hasOwnProperty' : 'constructor';
+    });
+    equal(grouped.constructor.length, 1);
+    equal(grouped.hasOwnProperty.length, 2);
+
+    var array = [{}];
+    _.groupBy(array, function(value, index, obj){ ok(obj === array); });
   });
 
-  test('collections: sortedIndex', function() {
+  test('countBy', function() {
+    var parity = _.countBy([1, 2, 3, 4, 5], function(num){ return num % 2 == 0; });
+    equal(parity['true'], 2);
+    equal(parity['false'], 3);
+
+    var list = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"];
+    var grouped = _.countBy(list, 'length');
+    equal(grouped['3'], 4);
+    equal(grouped['4'], 3);
+    equal(grouped['5'], 3);
+
+    var context = {};
+    _.countBy([{}], function(){ ok(this === context); }, context);
+
+    grouped = _.countBy([4.2, 6.1, 6.4], function(num) {
+      return Math.floor(num) > 4 ? 'hasOwnProperty' : 'constructor';
+    });
+    equal(grouped.constructor, 1);
+    equal(grouped.hasOwnProperty, 2);
+
+    var array = [{}];
+    _.countBy(array, function(value, index, obj){ ok(obj === array); });
+  });
+
+  test('sortedIndex', function() {
     var numbers = [10, 20, 30, 40, 50], num = 35;
     var indexForNum = _.sortedIndex(numbers, num);
     equal(indexForNum, 3, '35 should be inserted at index 3');
 
     var indexFor30 = _.sortedIndex(numbers, 30);
     equal(indexFor30, 2, '30 should be inserted at index 2');
+
+    var objects = [{x: 10}, {x: 20}, {x: 30}, {x: 40}];
+    var iterator = function(obj){ return obj.x; };
+    strictEqual(_.sortedIndex(objects, {x: 25}, iterator), 2);
+    strictEqual(_.sortedIndex(objects, {x: 35}, 'x'), 3);
+
+    var context = {1: 2, 2: 3, 3: 4};
+    iterator = function(obj){ return this[obj]; };
+    strictEqual(_.sortedIndex([1, 3], 2, iterator, context), 1);
   });
 
-  test('collections: shuffle', function() {
+  test('shuffle', function() {
     var numbers = _.range(10);
     var shuffled = _.shuffle(numbers).sort();
     notStrictEqual(numbers, shuffled, 'original object is unmodified');
     equal(shuffled.join(','), numbers.join(','), 'contains the same members before and after shuffle');
   });
 
-  test('collections: toArray', function() {
+  test('toArray', function() {
     ok(!_.isArray(arguments), 'arguments object is not an array');
     ok(_.isArray(_.toArray(arguments)), 'arguments object converted into array');
     var a = [1,2,3];
@@ -278,19 +398,21 @@ $(document).ready(function() {
 
     var numbers = _.toArray({one : 1, two : 2, three : 3});
     equal(numbers.join(', '), '1, 2, 3', 'object flattened into array');
-
-    var objectWithToArrayFunction = {toArray: function() {
-        return [1, 2, 3];
-    }};
-    equal(_.toArray(objectWithToArrayFunction).join(', '), '1, 2, 3', 'toArray method used if present');
-
-    var objectWithToArrayValue = {toArray: 1};
-    equal(_.toArray(objectWithToArrayValue).join(', '), '1', 'toArray property ignored if not a function');
   });
 
-  test('collections: size', function() {
+  test('size', function() {
     equal(_.size({one : 1, two : 2, three : 3}), 3, 'can compute the size of an object');
     equal(_.size([1, 2, 3]), 3, 'can compute the size of an array');
+
+    var func = function() {
+      return _.size(arguments);
+    };
+
+    equal(func(1, 2, 3, 4), 4, 'can test the size of the arguments object');
+
+    equal(_.size('hello'), 5, 'can compute the size of a string');
+
+    equal(_.size(null), 0, 'handles nulls');
   });
 
 });

vendor/underscore/test/functions.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Functions");
 
-  test("functions: bind", function() {
+  test("bind", function() {
     var context = {name : 'moe'};
     var func = function(arg) { return "name: " + (this.name || arg); };
     var bound = _.bind(func, context);
@@ -38,7 +38,7 @@ $(document).ready(function() {
     equal(Boundf().hello, "moe curly", "When called without the new operator, it's OK to be bound to the context");
   });
 
-  test("functions: bindAll", function() {
+  test("bindAll", function() {
     var curly = {name : 'curly'}, moe = {
       name    : 'moe',
       getName : function() { return 'name: ' + this.name; },
@@ -61,7 +61,7 @@ $(document).ready(function() {
     equal(curly.sayHi(), 'hi: moe', 'calling bindAll with no arguments binds all functions to the object');
   });
 
-  test("functions: memoize", function() {
+  test("memoize", function() {
     var fib = function(n) {
       return n < 2 ? n : fib(n - 1) + fib(n - 2);
     };
@@ -77,20 +77,20 @@ $(document).ready(function() {
     equal(fastO('toString'), 'toString', 'checks hasOwnProperty');
   });
 
-  asyncTest("functions: delay", 2, function() {
+  asyncTest("delay", 2, function() {
     var delayed = false;
     _.delay(function(){ delayed = true; }, 100);
     setTimeout(function(){ ok(!delayed, "didn't delay the function quite yet"); }, 50);
     setTimeout(function(){ ok(delayed, 'delayed the function'); start(); }, 150);
   });
 
-  asyncTest("functions: defer", 1, function() {
+  asyncTest("defer", 1, function() {
     var deferred = false;
     _.defer(function(bool){ deferred = bool; }, true);
     _.delay(function(){ ok(deferred, "deferred the function"); start(); }, 50);
   });
 
-  asyncTest("functions: throttle", 2, function() {
+  asyncTest("throttle", 2, function() {
     var counter = 0;
     var incr = function(){ counter++; };
     var throttledIncr = _.throttle(incr, 100);
@@ -105,7 +105,7 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 4, "incr was throttled"); start(); }, 400);
   });
 
-  asyncTest("functions: throttle arguments", 2, function() {
+  asyncTest("throttle arguments", 2, function() {
     var value = 0;
     var update = function(val){ value = val; };
     var throttledUpdate = _.throttle(update, 100);
@@ -117,7 +117,7 @@ $(document).ready(function() {
     _.delay(function(){ equal(value, 6, "updated to latest value"); start(); }, 400);
   });
 
-  asyncTest("functions: throttle once", 2, function() {
+  asyncTest("throttle once", 2, function() {
     var counter = 0;
     var incr = function(){ return ++counter; };
     var throttledIncr = _.throttle(incr, 100);
@@ -128,7 +128,7 @@ $(document).ready(function() {
     }, 220);
   });
 
-  asyncTest("functions: throttle twice", 1, function() {
+  asyncTest("throttle twice", 1, function() {
     var counter = 0;
     var incr = function(){ counter++; };
     var throttledIncr = _.throttle(incr, 100);
@@ -136,7 +136,34 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 2, "incr was called twice"); start(); }, 220);
   });
 
-  asyncTest("functions: debounce", 1, function() {
+  asyncTest("throttle repeatedly with results", 9, function() {
+    var counter = 0;
+    var incr = function(){ return ++counter; };
+    var throttledIncr = _.throttle(incr, 100);
+    var results = [];
+    var saveResult = function() { results.push(throttledIncr()); };
+    saveResult(); saveResult(); saveResult();
+    setTimeout(saveResult, 70);
+    setTimeout(saveResult, 120);
+    setTimeout(saveResult, 140);
+    setTimeout(saveResult, 190);
+    setTimeout(saveResult, 240);
+    setTimeout(saveResult, 260);
+    _.delay(function() {
+      equal(results[0], 1, "incr was called once");
+      equal(results[1], 1, "incr was throttled");
+      equal(results[2], 1, "incr was throttled");
+      equal(results[3], 1, "incr was throttled");
+      equal(results[4], 2, "incr was called twice");
+      equal(results[5], 2, "incr was throttled");
+      equal(results[6], 2, "incr was throttled");
+      equal(results[7], 3, "incr was called thrice");
+      equal(results[8], 3, "incr was throttled");
+      start();
+    }, 400);
+  });
+
+  asyncTest("debounce", 1, function() {
     var counter = 0;
     var incr = function(){ counter++; };
     var debouncedIncr = _.debounce(incr, 50);
@@ -149,11 +176,17 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 1, "incr was debounced"); start(); }, 220);
   });
 
-  asyncTest("functions: debounce asap", 2, function() {
+  asyncTest("debounce asap", 5, function() {
+    var a, b, c;
     var counter = 0;
-    var incr = function(){ counter++; };
+    var incr = function(){ return ++counter; };
     var debouncedIncr = _.debounce(incr, 50, true);
-    debouncedIncr(); debouncedIncr(); debouncedIncr();
+    a = debouncedIncr();
+    b = debouncedIncr();
+    c = debouncedIncr();
+    equal(a, 1);
+    equal(b, 1);
+    equal(c, 1);
     equal(counter, 1, 'incr was called immediately');
     setTimeout(debouncedIncr, 30);
     setTimeout(debouncedIncr, 60);
@@ -163,7 +196,7 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 1, "incr was debounced"); start(); }, 220);
   });
 
-  asyncTest("functions: debounce asap recursively", 2, function() {
+  asyncTest("debounce asap recursively", 2, function() {
     var counter = 0;
     var debouncedIncr = _.debounce(function(){
       counter++;
@@ -174,7 +207,7 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 1, "incr was debounced"); start(); }, 70);
   });
 
-  test("functions: once", function() {
+  test("once", function() {
     var num = 0;
     var increment = _.once(function(){ num++; });
     increment();
@@ -182,7 +215,7 @@ $(document).ready(function() {
     equal(num, 1);
   });
 
-  test("functions: wrap", function() {
+  test("wrap", function() {
     var greet = function(name){ return "hi: " + name; };
     var backwards = _.wrap(greet, function(func, name){ return func(name) + ' ' + name.split('').reverse().join(''); });
     equal(backwards('moe'), 'hi: moe eom', 'wrapped the saluation function');
@@ -198,7 +231,7 @@ $(document).ready(function() {
     deepEqual(ret, [noop, ['whats', 'your'], 'vector', 'victor']);
   });
 
-  test("functions: compose", function() {
+  test("compose", function() {
     var greet = function(name){ return "hi: " + name; };
     var exclaim = function(sentence){ return sentence + '!'; };
     var composed = _.compose(exclaim, greet);
@@ -208,7 +241,7 @@ $(document).ready(function() {
     equal(composed('moe'), 'hi: moe!', 'in this case, the functions are also commutative');
   });
 
-  test("functions: after", function() {
+  test("after", function() {
     var testAfter = function(afterAmount, timesCalled) {
       var afterCalled = 0;
       var after = _.after(afterAmount, function() {

vendor/underscore/test/objects.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   module("Objects");
 
-  test("objects: keys", function() {
+  test("keys", function() {
     equal(_.keys({one : 1, two : 2}).join(', '), 'one, two', 'can extract the keys from an object');
     // the test above is not safe because it relies on for-in enumeration order
     var a = []; a[1] = 0;
@@ -14,11 +14,26 @@ $(document).ready(function() {
     raises(function() { _.keys(true); }, TypeError, 'throws an error for boolean primitives');
   });
 
-  test("objects: values", function() {
-    equal(_.values({one : 1, two : 2}).join(', '), '1, 2', 'can extract the values from an object');
+  test("values", function() {
+    equal(_.values({one: 1, two: 2}).join(', '), '1, 2', 'can extract the values from an object');
+    equal(_.values({one: 1, two: 2, length: 3}).join(', '), '1, 2, 3', '... even when one of them is "length"');
   });
 
-  test("objects: functions", function() {
+  test("pairs", function() {
+    deepEqual(_.pairs({one: 1, two: 2}), [['one', 1], ['two', 2]], 'can convert an object into pairs');
+    deepEqual(_.pairs({one: 1, two: 2, length: 3}), [['one', 1], ['two', 2], ['length', 3]], '... even when one of them is "length"');
+  });
+
+  test("invert", function() {
+    var obj = {first: 'Moe', second: 'Larry', third: 'Curly'};
+    equal(_.keys(_.invert(obj)).join(' '), 'Moe Larry Curly', 'can invert an object');
+    ok(_.isEqual(_.invert(_.invert(obj)), obj), 'two inverts gets you back where you started');
+
+    var obj = {length: 3};
+    ok(_.invert(obj)['3'] == 'length', 'can invert an object with "length"')
+  });
+
+  test("functions", function() {
     var obj = {a : 'dash', b : _.map, c : (/yo/), d : _.reduce};
     ok(_.isEqual(['b', 'd'], _.functions(obj)), 'can grab the function names of any passed-in object');
 
@@ -27,7 +42,7 @@ $(document).ready(function() {
     equal(_.functions(new Animal).join(''), 'run', 'also looks up functions on the prototype');
   });
 
-  test("objects: extend", function() {
+  test("extend", function() {
     var result;
     equal(_.extend({}, {a:'b'}).a, 'b', 'can extend an object with the attributes of another');
     equal(_.extend({a:'x'}, {a:'b'}).a, 'b', 'properties in source override destination');
@@ -40,7 +55,7 @@ $(document).ready(function() {
     equal(_.keys(result).join(''), 'ab', 'extend does not copy undefined values');
   });
 
-  test("objects: pick", function() {
+  test("pick", function() {
     var result;
     result = _.pick({a:1, b:2, c:3}, 'a', 'c');
     ok(_.isEqual(result, {a:1, c:3}), 'can restrict properties to those named');
@@ -48,9 +63,27 @@ $(document).ready(function() {
     ok(_.isEqual(result, {b:2, c:3}), 'can restrict properties to those named in an array');
     result = _.pick({a:1, b:2, c:3}, ['a'], 'b');
     ok(_.isEqual(result, {a:1, b:2}), 'can restrict properties to those named in mixed args');
+
+    var Obj = function(){};
+    Obj.prototype = {a: 1, b: 2, c: 3};
+    ok(_.isEqual(_.pick(new Obj, 'a', 'c'), {a:1, c: 3}), 'include prototype props');
   });
 
-  test("objects: defaults", function() {
+  test("omit", function() {
+    var result;
+    result = _.omit({a:1, b:2, c:3}, 'b');
+    ok(_.isEqual(result, {a:1, c:3}), 'can omit a single named property');
+    result = _.omit({a:1, b:2, c:3}, 'a', 'c');
+    ok(_.isEqual(result, {b:2}), 'can omit several named properties');
+    result = _.omit({a:1, b:2, c:3}, ['b', 'c']);
+    ok(_.isEqual(result, {a:1}), 'can omit properties named in an array');
+
+    var Obj = function(){};
+    Obj.prototype = {a: 1, b: 2, c: 3};
+    ok(_.isEqual(_.omit(new Obj, 'b'), {a:1, c: 3}), 'include prototype props');
+  });
+
+  test("defaults", function() {
     var result;
     var options = {zero: 0, one: 1, empty: "", nan: NaN, string: "string"};
 
@@ -65,7 +98,7 @@ $(document).ready(function() {
     equal(options.word, "word", 'new value is added, first one wins');
   });
 
-  test("objects: clone", function() {
+  test("clone", function() {
     var moe = {name : 'moe', lucky : [13, 27, 34]};
     var clone = _.clone(moe);
     equal(clone.name, 'moe', 'the clone as the attributes of the original');
@@ -81,7 +114,7 @@ $(document).ready(function() {
     equal(_.clone(null), null, 'non objects should not be changed by clone');
   });
 
-  test("objects: isEqual", function() {
+  test("isEqual", function() {
     function First() {
       this.value = 1;
     }
@@ -200,14 +233,6 @@ $(document).ready(function() {
     ok(_.isEqual(Array(3), Array(3)), "Sparse arrays of identical lengths are equal");
     ok(!_.isEqual(Array(3), Array(6)), "Sparse arrays of different lengths are not equal when both are empty");
 
-    // According to the Microsoft deviations spec, section 2.1.26, JScript 5.x treats `undefined`
-    // elements in arrays as elisions. Thus, sparse arrays and dense arrays containing `undefined`
-    // values are equivalent.
-    if (0 in [undefined]) {
-      ok(!_.isEqual(Array(3), [undefined, undefined, undefined]), "Sparse and dense arrays are not equal");
-      ok(!_.isEqual([undefined, undefined, undefined], Array(3)), "Commutative equality is implemented for sparse and dense arrays");
-    }
-
     // Simple objects.
     ok(_.isEqual({a: "Curly", b: 1, c: true}, {a: "Curly", b: 1, c: true}), "Objects containing identical primitives are equal");
     ok(_.isEqual({a: /Curly/g, b: new Date(2009, 11, 13)}, {a: /Curly/g, b: new Date(2009, 11, 13)}), "Objects containing equivalent members are equal");
@@ -265,6 +290,12 @@ $(document).ready(function() {
     b.push("Curly");
     ok(!_.isEqual(a, b), "Arrays containing circular references and different properties are not equal");
 
+    // More circular arrays #767.
+    a = ["everything is checked but", "this", "is not"];
+    a[1] = a;
+    b = ["everything is checked but", ["this", "array"], "is not"];
+    ok(!_.isEqual(a, b), "Comparison of circular references with non-circular references are not equal");
+
     // Circular Objects.
     a = {abc: null};
     b = {abc: null};
@@ -278,6 +309,12 @@ $(document).ready(function() {
     b.def = new Number(63);
     ok(!_.isEqual(a, b), "Objects containing circular references and different properties are not equal");
 
+    // More circular objects #767.
+    a = {everything: "is checked", but: "this", is: "not"};
+    a.but = a;
+    b = {everything: "is checked", but: {that:"object"}, is: "not"};
+    ok(!_.isEqual(a, b), "Comparison of circular references with non-circular object references are not equal");
+
     // Cyclic Structures.
     a = [{abc: null}];
     b = [{abc: null}];
@@ -311,60 +348,11 @@ $(document).ready(function() {
     ok(!_.isEqual(isEqualObj, {}), 'Objects that do not implement equivalent `isEqual` methods are not equal');
     ok(!_.isEqual({}, isEqualObj), 'Commutative equality is implemented for objects with different `isEqual` methods');
 
-    // Custom `isEqual` methods - comparing different types
-    LocalizedString = (function() {
-      function LocalizedString(id) { this.id = id; this.string = (this.id===10)? 'Bonjour': ''; }
-      LocalizedString.prototype.isEqual = function(that) {
-        if (_.isString(that)) return this.string == that;
-        else if (that instanceof LocalizedString) return this.id == that.id;
-        return false;
-      };
-      return LocalizedString;
-    })();
-    var localized_string1 = new LocalizedString(10), localized_string2 = new LocalizedString(10), localized_string3 = new LocalizedString(11);
-    ok(_.isEqual(localized_string1, localized_string2), 'comparing same typed instances with same ids');
-    ok(!_.isEqual(localized_string1, localized_string3), 'comparing same typed instances with different ids');
-    ok(_.isEqual(localized_string1, 'Bonjour'), 'comparing different typed instances with same values');
-    ok(_.isEqual('Bonjour', localized_string1), 'comparing different typed instances with same values');
-    ok(!_.isEqual('Bonjour', localized_string3), 'comparing two localized strings with different ids');
-    ok(!_.isEqual(localized_string1, 'Au revoir'), 'comparing different typed instances with different values');
-    ok(!_.isEqual('Au revoir', localized_string1), 'comparing different typed instances with different values');
-
-    // Custom `isEqual` methods - comparing with serialized data
-    Date.prototype.toJSON = function() {
-      return {
-        _type:'Date',
-        year:this.getUTCFullYear(),
-        month:this.getUTCMonth(),
-        day:this.getUTCDate(),
-        hours:this.getUTCHours(),
-        minutes:this.getUTCMinutes(),
-        seconds:this.getUTCSeconds()
-      };
-    };
-    Date.prototype.isEqual = function(that) {
-      var this_date_components = this.toJSON();
-      var that_date_components = (that instanceof Date) ? that.toJSON() : that;
-      delete this_date_components['_type']; delete that_date_components['_type'];
-      return _.isEqual(this_date_components, that_date_components);
-    };
-
-    var date = new Date();
-    var date_json = {
-      _type:'Date',
-      year:date.getUTCFullYear(),
-      month:date.getUTCMonth(),
-      day:date.getUTCDate(),
-      hours:date.getUTCHours(),
-      minutes:date.getUTCMinutes(),
-      seconds:date.getUTCSeconds()
-    };
-
-    ok(_.isEqual(date_json, date), 'serialized date matches date');
-    ok(_.isEqual(date, date_json), 'date matches serialized date');
+    // Objects from another frame.
+    ok(_.isEqual({}, iObject));
   });
 
-  test("objects: isEmpty", function() {
+  test("isEmpty", function() {
     ok(!_([1]).isEmpty(), '[1] is not empty');
     ok(_.isEmpty([]), '[] is empty');
     ok(!_.isEmpty({one : 1}), '{one : 1} is not empty');
@@ -398,17 +386,18 @@ $(document).ready(function() {
       parent.iNull      = null;\
       parent.iBoolean   = new Boolean(false);\
       parent.iUndefined = undefined;\
+      parent.iObject     = {};\
     </script>"
   );
   iDoc.close();
 
-  test("objects: isElement", function() {
+  test("isElement", function() {
     ok(!_.isElement('div'), 'strings are not dom elements');
     ok(_.isElement($('html')[0]), 'the html tag is a DOM element');
     ok(_.isElement(iElement), 'even from another frame');
   });
 
-  test("objects: isArguments", function() {
+  test("isArguments", function() {
     var args = (function(){ return arguments; })(1, 2, 3);
     ok(!_.isArguments('string'), 'a string is not an arguments object');
     ok(!_.isArguments(_.isArguments), 'a function is not an arguments object');
@@ -418,7 +407,7 @@ $(document).ready(function() {
     ok(_.isArguments(iArguments), 'even from another frame');
   });
 
-  test("objects: isObject", function() {
+  test("isObject", function() {
     ok(_.isObject(arguments), 'the arguments object is object');
     ok(_.isObject([1, 2, 3]), 'and arrays');
     ok(_.isObject($('html')[0]), 'and DOM element');
@@ -433,19 +422,19 @@ $(document).ready(function() {
     ok(_.isObject(new String('string')), 'but new String()');
   });
 
-  test("objects: isArray", function() {
+  test("isArray", function() {
     ok(!_.isArray(arguments), 'the arguments object is not an array');
     ok(_.isArray([1, 2, 3]), 'but arrays are');
     ok(_.isArray(iArray), 'even from another frame');
   });
 
-  test("objects: isString", function() {
+  test("isString", function() {
     ok(!_.isString(document.body), 'the document body is not a string');
     ok(_.isString([1, 2, 3].join(', ')), 'but strings are');
     ok(_.isString(iString), 'even from another frame');
   });
 
-  test("objects: isNumber", function() {
+  test("isNumber", function() {
     ok(!_.isNumber('string'), 'a string is not a number');
     ok(!_.isNumber(arguments), 'the arguments object is not a number');
     ok(!_.isNumber(undefined), 'undefined is not a number');
@@ -456,7 +445,7 @@ $(document).ready(function() {
     ok(!_.isNumber('1'), 'numeric strings are not numbers');
   });
 
-  test("objects: isBoolean", function() {
+  test("isBoolean", function() {
     ok(!_.isBoolean(2), 'a number is not a boolean');
     ok(!_.isBoolean("string"), 'a string is not a boolean');
     ok(!_.isBoolean("false"), 'the string "false" is not a boolean');
@@ -470,27 +459,27 @@ $(document).ready(function() {
     ok(_.isBoolean(iBoolean), 'even from another frame');
   });
 
-  test("objects: isFunction", function() {
+  test("isFunction", function() {
     ok(!_.isFunction([1, 2, 3]), 'arrays are not functions');
     ok(!_.isFunction('moe'), 'strings are not functions');
     ok(_.isFunction(_.isFunction), 'but functions are');
     ok(_.isFunction(iFunction), 'even from another frame');
   });
 
-  test("objects: isDate", function() {
+  test("isDate", function() {
     ok(!_.isDate(100), 'numbers are not dates');
     ok(!_.isDate({}), 'objects are not dates');
     ok(_.isDate(new Date()), 'but dates are');
     ok(_.isDate(iDate), 'even from another frame');
   });
 
-  test("objects: isRegExp", function() {
+  test("isRegExp", function() {
     ok(!_.isRegExp(_.identity), 'functions are not RegExps');
     ok(_.isRegExp(/identity/), 'but RegExps are');
     ok(_.isRegExp(iRegExp), 'even from another frame');
   });
 
-  test("objects: isFinite", function() {
+  test("isFinite", function() {
     ok(!_.isFinite(undefined), 'undefined is not Finite');
     ok(!_.isFinite(null), 'null is not Finite');
     ok(!_.isFinite(NaN), 'NaN is not Finite');
@@ -504,22 +493,23 @@ $(document).ready(function() {
     ok(_.isFinite(-12.44), 'Floats are Finite');
   });
 
-  test("objects: isNaN", function() {
+  test("isNaN", function() {
     ok(!_.isNaN(undefined), 'undefined is not NaN');
     ok(!_.isNaN(null), 'null is not NaN');
     ok(!_.isNaN(0), '0 is not NaN');
     ok(_.isNaN(NaN), 'but NaN is');
     ok(_.isNaN(iNaN), 'even from another frame');
+    ok(_.isNaN(new Number(NaN)), 'wrapped NaN is still NaN');
   });
 
-  test("objects: isNull", function() {
+  test("isNull", function() {
     ok(!_.isNull(undefined), 'undefined is not null');
     ok(!_.isNull(NaN), 'NaN is not null');
     ok(_.isNull(null), 'but null is');
     ok(_.isNull(iNull), 'even from another frame');
   });
 
-  test("objects: isUndefined", function() {
+  test("isUndefined", function() {
     ok(!_.isUndefined(1), 'numbers are defined');
     ok(!_.isUndefined(null), 'null is defined');
     ok(!_.isUndefined(false), 'false is defined');
@@ -530,7 +520,7 @@ $(document).ready(function() {
   });
 
   if (window.ActiveXObject) {
-    test("objects: IE host objects", function() {
+    test("IE host objects", function() {
       var xml = new ActiveXObject("Msxml2.DOMDocument.3.0");
       ok(!_.isNumber(xml));
       ok(!_.isBoolean(xml));
@@ -541,7 +531,7 @@ $(document).ready(function() {
     });
   }
 
-  test("objects: tap", function() {
+  test("tap", function() {
     var intercepted = null;
     var interceptor = function(obj) { intercepted = obj; };
     var returned = _.tap(1, interceptor);

vendor/underscore/test/utility.js

@@ -14,18 +14,24 @@ $(document).ready(function() {
 
   });
 
-  test("utility: identity", function() {
+  test("#750 - Return _ instance.", 2, function() {
+    var instance = _([]);
+    ok(_(instance) === instance);
+    ok(new _(instance) === instance);
+  });
+
+  test("identity", function() {
     var moe = {name : 'moe'};
     equal(_.identity(moe), moe, 'moe is the same as his identity');
   });
 
-  test("utility: uniqueId", function() {
+  test("uniqueId", function() {
     var ids = [], i = 0;
     while(i++ < 100) ids.push(_.uniqueId());
     equal(_.uniq(ids).length, ids.length, 'can generate a globally-unique stream of ids');
   });
 
-  test("utility: times", function() {
+  test("times", function() {
     var vals = [];
     _.times(3, function (i) { vals.push(i); });
     ok(_.isEqual(vals, [0,1,2]), "is 0 indexed");
@@ -35,7 +41,7 @@ $(document).ready(function() {
     ok(_.isEqual(vals, [0,1,2]), "works as a wrapper");
   });
 
-  test("utility: mixin", function() {
+  test("mixin", function() {
     _.mixin({
       myReverse: function(string) {
         return string.split('').reverse().join('');
@@ -45,12 +51,21 @@ $(document).ready(function() {
     equal(_('champ').myReverse(), 'pmahc', 'mixed in a function to the OOP wrapper');
   });
 
-  test("utility: _.escape", function() {
+  test("_.escape", function() {
     equal(_.escape("Curly & Moe"), "Curly &amp; Moe");
     equal(_.escape("Curly &amp; Moe"), "Curly &amp;amp; Moe");
+    equal(_.escape(null), '');
   });
 
-  test("utility: template", function() {
+  test("_.unescape", function() {
+    var string = "Curly & Moe";
+    equal(_.unescape("Curly &amp; Moe"), string);
+    equal(_.unescape("Curly &amp;amp; Moe"), "Curly &amp; Moe");
+    equal(_.unescape(null), '');
+    equal(_.unescape(_.escape(string)), string);
+  });
+
+  test("template", function() {
     var basicTemplate = _.template("<%= thing %> is gettin' on my noives!");
     var result = basicTemplate({thing : 'This'});
     equal(result, "This is gettin' on my noives!", 'can do basic attribute interpolation');
@@ -156,6 +171,14 @@ $(document).ready(function() {
     equal(templateWithNull({planet : "world"}), "a null undefined world", "can handle missing escape and evaluate settings");
   });
 
+  test('_.template provides the generated function source, when a SyntaxError occurs', function() {
+    try {
+      _.template('<b><%= if %></b>');
+    } catch (e) {
+      ok(e.source.indexOf('( if )') > 0);
+    }
+  });
+
   test('_.template handles \\u2028 & \\u2029', function() {
     var tmpl = _.template('<p>\u2028<%= "\\u2028\\u2029" %>\u2029</p>');
     strictEqual(tmpl(), '<p>\u2028\u2028\u2029\u2029</p>');
@@ -212,4 +235,15 @@ $(document).ready(function() {
     templateEscaped({f: function(){ ok(!(countEscaped++)); }});
   });
 
+  test('#746 - _.template settings are not modified.', 1, function() {
+    var settings = {};
+    _.template('', null, settings);
+    deepEqual(settings, {});
+  });
+
+  test('#779 - delimeters are applied to unescaped text.', 1, function() {
+    var template = _.template('<<\nx\n>>', null, {evaluate: /<<(.*?)>>/g});
+    strictEqual(template(), '<<\nx\n>>');
+  });
+
 });

vendor/underscore/test/vendor/qunit.css

@@ -1,11 +1,11 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.10.0 - A JavaScript Unit Testing Framework
  *
- * http://docs.jquery.com/QUnit
+ * http://qunitjs.com
  *
- * Copyright (c) 2012 John Resig, Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * or GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
  */
 
 /** Font Family and Sizes */
@@ -20,7 +20,7 @@
 
 /** Resets */
 
-#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
 	margin: 0;
 	padding: 0;
 }
@@ -38,10 +38,10 @@
 	line-height: 1em;
 	font-weight: normal;
 
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-top-right-radius: 5px;
+	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
@@ -54,9 +54,9 @@
 	color: #fff;
 }
 
-#qunit-header label {
+#qunit-testrunner-toolbar label {
 	display: inline-block;
-	padding-left: 0.5em;
+	padding: 0 .5em 0 .1em;
 }
 
 #qunit-banner {
@@ -67,6 +67,7 @@
 	padding: 0.5em 0 0.5em 2em;
 	color: #5E740B;
 	background-color: #eee;
+	overflow: hidden;
 }
 
 #qunit-userAgent {
@@ -76,6 +77,9 @@
 	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
 }
 
+#qunit-modulefilter-container {
+	float: right;
+}
 
 /** Tests: Pass/Fail */
 
@@ -113,13 +117,9 @@
 
 	background-color: #fff;
 
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #qunit-tests table {
@@ -162,8 +162,7 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
+	padding: 5px;
 	background-color: #fff;
 	border-bottom: none;
 	list-style-position: inside;
@@ -172,9 +171,9 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
+	color: #3c510c;
 	background-color: #fff;
-	border-left: 26px solid #C6E746;
+	border-left: 10px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
@@ -190,15 +189,15 @@
 #qunit-tests li li.fail {
 	color: #710909;
 	background-color: #fff;
-	border-left: 26px solid #EE5757;
+	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }

vendor/underscore/test/vendor/qunit.js

@@ -1,11 +1,11 @@
 /**
- * QUnit v1.8.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.10.0 - A JavaScript Unit Testing Framework
  *
- * http://docs.jquery.com/QUnit
+ * http://qunitjs.com
  *
- * Copyright (c) 2012 John Resig, Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * or GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
  */
 
 (function( window ) {
@@ -17,6 +17,8 @@ var QUnit,
 	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
 	toString = Object.prototype.toString,
 	hasOwn = Object.prototype.hasOwnProperty,
+	// Keep a local reference to Date (GH-283)
+	Date = window.Date,
 	defined = {
 	setTimeout: typeof window.setTimeout !== "undefined",
 	sessionStorage: (function() {
@@ -304,7 +306,8 @@ QUnit = {
 	// call on start of module test to prepend name to all tests
 	module: function( name, testEnvironment ) {
 		config.currentModule = name;
-		config.currentModuleTestEnviroment = testEnvironment;
+		config.currentModuleTestEnvironment = testEnvironment;
+		config.modules[name] = true;
 	},
 
 	asyncTest: function( testName, expected, callback ) {
@@ -336,7 +339,7 @@ QUnit = {
 			async: async,
 			callback: callback,
 			module: config.currentModule,
-			moduleTestEnvironment: config.currentModuleTestEnviroment,
+			moduleTestEnvironment: config.currentModuleTestEnvironment,
 			stack: sourceFromStacktrace( 2 )
 		});
 
@@ -349,7 +352,11 @@ QUnit = {
 
 	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
 	expect: function( asserts ) {
-		config.current.expected = asserts;
+		if (arguments.length === 1) {
+			config.current.expected = asserts;
+		} else {
+			return config.current.expected;
+		}
 	},
 
 	start: function( count ) {
@@ -403,6 +410,8 @@ QUnit = {
 QUnit.assert = {
 	/**
 	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
 	ok: function( result, msg ) {
@@ -413,6 +422,8 @@ QUnit.assert = {
 
 		var source,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: result,
 				message: msg
 			};
@@ -437,36 +448,59 @@ QUnit.assert = {
 	/**
 	 * Assert that the first two arguments are equal, with an optional message.
 	 * Prints out both actual and expected values.
+	 * @name equal
+	 * @function
 	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
 	 */
 	equal: function( actual, expected, message ) {
 		QUnit.push( expected == actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notEqual
+	 * @function
+	 */
 	notEqual: function( actual, expected, message ) {
 		QUnit.push( expected != actual, actual, expected, message );
 	},
 
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
 	deepEqual: function( actual, expected, message ) {
 		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
 	notDeepEqual: function( actual, expected, message ) {
 		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
 	},
 
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
 	strictEqual: function( actual, expected, message ) {
 		QUnit.push( expected === actual, actual, expected, message );
 	},
 
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
 	notStrictEqual: function( actual, expected, message ) {
 		QUnit.push( expected !== actual, actual, expected, message );
 	},
 
-	raises: function( block, expected, message ) {
+	throws: function( block, expected, message ) {
 		var actual,
 			ok = false;
 
+		// 'expected' is optional
 		if ( typeof expected === "string" ) {
 			message = expected;
 			expected = null;
@@ -494,18 +528,29 @@ QUnit.assert = {
 			} else if ( expected.call( {}, actual ) === true ) {
 				ok = true;
 			}
-		}
 
-		QUnit.push( ok, actual, null, message );
+			QUnit.push( ok, actual, null, message );
+		} else {
+			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+		}
 	}
 };
 
-// @deprecated: Kept assertion helpers in root for backwards compatibility
+/**
+ * @deprecate since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility
+ */
 extend( QUnit, QUnit.assert );
 
 /**
- * @deprecated: Kept for backwards compatibility
- * next step: remove entirely
+ * @deprecated since 1.9.0
+ * Kept global "raises()" for backwards compatibility
+ */
+QUnit.raises = QUnit.assert.throws;
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
  */
 QUnit.equals = function() {
 	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
@@ -549,7 +594,23 @@ config = {
 	// when enabled, all tests must call expect()
 	requireExpects: false,
 
-	urlConfig: [ "noglobals", "notrycatch" ],
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
+
+	// Set of all modules.
+	modules: {},
 
 	// logging callback queues
 	begin: [],
@@ -661,17 +722,10 @@ extend( QUnit, {
 	},
 
 	// Resets the test setup. Useful for tests that modify the DOM.
-	// If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
 	reset: function() {
-		var fixture;
-
-		if ( window.jQuery ) {
-			jQuery( "#qunit-fixture" ).html( config.fixture );
-		} else {
-			fixture = id( "qunit-fixture" );
-			if ( fixture ) {
-				fixture.innerHTML = config.fixture;
-			}
+		var fixture = id( "qunit-fixture" );
+		if ( fixture ) {
+			fixture.innerHTML = config.fixture;
 		}
 	},
 
@@ -732,6 +786,8 @@ extend( QUnit, {
 
 		var output, source,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: result,
 				message: message,
 				actual: actual,
@@ -770,26 +826,36 @@ extend( QUnit, {
 		});
 	},
 
-	pushFailure: function( message, source ) {
+	pushFailure: function( message, source, actual ) {
 		if ( !config.current ) {
 			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
 
 		var output,
 			details = {
+				module: config.current.module,
+				name: config.current.testName,
 				result: false,
 				message: message
 			};
 
-		message = escapeInnerText(message ) || "error";
+		message = escapeInnerText( message ) || "error";
 		message = "<span class='test-message'>" + message + "</span>";
 		output = message;
 
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeInnerText( actual ) + "</pre></td></tr>";
+		}
+
 		if ( source ) {
 			details.source = source;
-			output += "<table><tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr></table>";
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeInnerText( source ) + "</pre></td></tr>";
 		}
 
+		output += "</table>";
+
 		runLoggingCallbacks( "log", QUnit, details );
 
 		config.current.assertions.push({
@@ -859,7 +925,9 @@ QUnit.load = function() {
 	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes, moduleFilter,
+	    numModules = 0,
+	    moduleFilterHtml = "",
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
 
@@ -872,10 +940,26 @@ QUnit.load = function() {
 
 	for ( i = 0; i < len; i++ ) {
 		val = config.urlConfig[i];
-		config[val] = QUnit.urlParams[val];
-		urlConfigHtml += "<label><input name='" + val + "' type='checkbox'" + ( config[val] ? " checked='checked'" : "" ) + ">" + val + "</label>";
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val,
+				tooltip: "[no tooltip available]"
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		urlConfigHtml += "<input id='qunit-urlconfig-" + val.id + "' name='" + val.id + "' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) + " title='" + val.tooltip + "'><label for='qunit-urlconfig-" + val.id + "' title='" + val.tooltip + "'>" + val.label + "</label>";
 	}
 
+	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " + ( config.module === undefined  ? "selected" : "" ) + ">< All Modules ></option>";
+	for ( i in config.modules ) {
+		if ( config.modules.hasOwnProperty( i ) ) {
+			numModules += 1;
+			moduleFilterHtml += "<option value='" + encodeURIComponent(i) + "' " + ( config.module === i ? "selected" : "" ) + ">" + i + "</option>";
+		}
+	}
+	moduleFilterHtml += "</select>";
+
 	// `userAgent` initialized at top of scope
 	userAgent = id( "qunit-userAgent" );
 	if ( userAgent ) {
@@ -885,12 +969,7 @@ QUnit.load = function() {
 	// `banner` initialized at top of scope
 	banner = id( "qunit-header" );
 	if ( banner ) {
-		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined }) + "'>" + banner.innerHTML + "</a> " + urlConfigHtml;
-		addEvent( banner, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
-			window.location = QUnit.url( params );
-		});
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
 	}
 
 	// `toolbar` initialized at top of scope
@@ -931,8 +1010,31 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
+
+		urlConfigCheckboxes = document.createElement( 'span' );
+		urlConfigCheckboxes.innerHTML = urlConfigHtml;
+		addEvent( urlConfigCheckboxes, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigCheckboxes );
+
+		if (numModules > 1) {
+			moduleFilter = document.createElement( 'span' );
+			moduleFilter.setAttribute( 'id', 'qunit-modulefilter-container' );
+			moduleFilter.innerHTML = moduleFilterHtml;
+			addEvent( moduleFilter, "change", function() {
+				var selectBox = moduleFilter.getElementsByTagName("select")[0],
+				    selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
+
+				window.location = QUnit.url( { module: ( selectedModule === "" ) ? undefined : selectedModule } );
+			});
+			toolbar.appendChild(moduleFilter);
+		}
 	}
 
 	// `main` initialized at top of scope
@@ -970,9 +1072,9 @@ window.onerror = function ( error, filePath, linerNr ) {
 			}
 			QUnit.pushFailure( error, filePath + ":" + linerNr );
 		} else {
-			QUnit.test( "global failure", function() {
+			QUnit.test( "global failure", extend( function() {
 				QUnit.pushFailure( error, filePath + ":" + linerNr );
-			});
+			}, { validTest: validTest } ) );
 		}
 		return false;
 	}
@@ -1039,6 +1141,11 @@ function done() {
 		}
 	}
 
+	// scroll back to top to show results
+	if ( window.scrollTo ) {
+		window.scrollTo(0, 0);
+	}
+
 	runLoggingCallbacks( "done", QUnit, {
 		failed: config.stats.bad,
 		passed: passed,
@@ -1051,14 +1158,20 @@ function done() {
 function validTest( test ) {
 	var include,
 		filter = config.filter && config.filter.toLowerCase(),
-		module = config.module,
+		module = config.module && config.module.toLowerCase(),
 		fullName = (test.module + ": " + test.testName).toLowerCase();
 
+	// Internally-generated tests are always valid
+	if ( test.callback && test.callback.validTest === validTest ) {
+		delete test.callback.validTest;
+		return true;
+	}
+
 	if ( config.testNumber ) {
 		return test.testNumber === config.testNumber;
 	}
 
-	if ( module && test.module !== module ) {
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
 		return false;
 	}
 
@@ -1335,7 +1448,8 @@ QUnit.equiv = (function() {
 						a.global === b.global &&
 						// (gmi) ...
 						a.ignoreCase === b.ignoreCase &&
-						a.multiline === b.multiline;
+						a.multiline === b.multiline &&
+						a.sticky === b.sticky;
 				},
 
 				// - skip when the property is a method of an instance (OOP)

vendor/underscore/underscore.js

@@ -1,10 +1,7 @@
-//     Underscore.js 1.3.3
+//     Underscore.js 1.4.2
+//     http://underscorejs.org
 //     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
+//     Underscore may be freely distributed under the MIT license.
 
 (function() {
 
@@ -26,6 +23,7 @@
   // Create quick reference variables for speed access to core prototypes.
   var push             = ArrayProto.push,
       slice            = ArrayProto.slice,
+      concat           = ArrayProto.concat,
       unshift          = ArrayProto.unshift,
       toString         = ObjProto.toString,
       hasOwnProperty   = ObjProto.hasOwnProperty;
@@ -47,7 +45,11 @@
     nativeBind         = FuncProto.bind;
 
   // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) { return new wrapper(obj); };
+  var _ = function(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  };
 
   // Export the Underscore object for **Node.js**, with
   // backwards-compatibility for the old `require()` API. If we're in
@@ -63,7 +65,7 @@
   }
 
   // Current version.
-  _.VERSION = '1.3.3';
+  _.VERSION = '1.4.2';
 
   // Collection Functions
   // --------------------
@@ -128,11 +130,24 @@
     if (obj == null) obj = [];
     if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
       if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+      return arguments.length > 2 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
     }
-    var reversed = _.toArray(obj).reverse();
-    if (context && !initial) iterator = _.bind(iterator, context);
-    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
+    var length = obj.length;
+    if (length !== +length) {
+      var keys = _.keys(obj);
+      length = keys.length;
+    }
+    each(obj, function(value, index, list) {
+      index = keys ? keys[--length] : --length;
+      if (!initial) {
+        memo = obj[index];
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, obj[index], index, list);
+      }
+    });
+    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    return memo;
   };
 
   // Return the first value which passes a truth test. Aliased as `detect`.
@@ -174,6 +189,7 @@
   // Delegates to **ECMAScript 5**'s native `every` if available.
   // Aliased as `all`.
   _.every = _.all = function(obj, iterator, context) {
+    iterator || (iterator = _.identity);
     var result = true;
     if (obj == null) return result;
     if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
@@ -197,9 +213,9 @@
     return !!result;
   };
 
-  // Determine if a given value is included in the array or object using `===`.
-  // Aliased as `contains`.
-  _.include = _.contains = function(obj, target) {
+  // Determine if the array or object contains a given value (using `===`).
+  // Aliased as `include`.
+  _.contains = _.include = function(obj, target) {
     var found = false;
     if (obj == null) return found;
     if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
@@ -222,6 +238,18 @@
     return _.map(obj, function(value){ return value[key]; });
   };
 
+  // Convenience version of a common use case of `filter`: selecting only objects
+  // with specific `key:value` pairs.
+  _.where = function(obj, attrs) {
+    if (_.isEmpty(attrs)) return [];
+    return _.filter(obj, function(value) {
+      for (var key in attrs) {
+        if (attrs[key] !== value[key]) return false;
+      }
+      return true;
+    });
+  };
+
   // Return the maximum element or (element-based computation).
   // Can't optimize arrays of integers longer than 65,535 elements.
   // See: https://bugs.webkit.org/show_bug.cgi?id=80797
@@ -258,66 +286,91 @@
     var index = 0;
     var shuffled = [];
     each(obj, function(value) {
-      rand = Math.floor(Math.random() * ++index);
+      rand = _.random(index++);
       shuffled[index - 1] = shuffled[rand];
       shuffled[rand] = value;
     });
     return shuffled;
   };
 
+  // An internal function to generate lookup iterators.
+  var lookupIterator = function(value) {
+    return _.isFunction(value) ? value : function(obj){ return obj[value]; };
+  };
+
   // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, val, context) {
-    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+  _.sortBy = function(obj, value, context) {
+    var iterator = lookupIterator(value);
     return _.pluck(_.map(obj, function(value, index, list) {
       return {
         value : value,
+        index : index,
         criteria : iterator.call(context, value, index, list)
       };
     }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      if (a === void 0) return 1;
-      if (b === void 0) return -1;
-      return a < b ? -1 : a > b ? 1 : 0;
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
+      }
+      return left.index < right.index ? -1 : 1;
     }), 'value');
   };
 
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, val) {
+  // An internal function used for aggregate "group by" operations.
+  var group = function(obj, value, context, behavior) {
     var result = {};
-    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+    var iterator = lookupIterator(value);
     each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
+      var key = iterator.call(context, value, index, obj);
+      behavior(result, key, value);
     });
     return result;
   };
 
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = function(obj, value, context) {
+    return group(obj, value, context, function(result, key, value) {
+      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
+    });
+  };
+
+  // Counts instances of an object that group by a certain criterion. Pass
+  // either a string attribute to count by, or a function that returns the
+  // criterion.
+  _.countBy = function(obj, value, context) {
+    return group(obj, value, context, function(result, key, value) {
+      if (!_.has(result, key)) result[key] = 0;
+      result[key]++;
+    });
+  };
+
   // Use a comparator function to figure out the smallest index at which
   // an object should be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator) {
-    iterator || (iterator = _.identity);
-    var value = iterator(obj);
+  _.sortedIndex = function(array, obj, iterator, context) {
+    iterator = iterator == null ? _.identity : lookupIterator(iterator);
+    var value = iterator.call(context, obj);
     var low = 0, high = array.length;
     while (low < high) {
-      var mid = (low + high) >> 1;
-      iterator(array[mid]) < value ? low = mid + 1 : high = mid;
+      var mid = (low + high) >>> 1;
+      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
     }
     return low;
   };
 
   // Safely convert anything iterable into a real, live array.
   _.toArray = function(obj) {
-    if (!obj)                                     return [];
-    if (_.isArray(obj))                           return slice.call(obj);
-    if (_.isArguments(obj))                       return slice.call(obj);
-    if (obj.toArray && _.isFunction(obj.toArray)) return obj.toArray();
+    if (!obj) return [];
+    if (obj.length === +obj.length) return slice.call(obj);
     return _.values(obj);
   };
 
   // Return the number of elements in an object.
   _.size = function(obj) {
-    return _.isArray(obj) ? obj.length : _.keys(obj).length;
+    if (obj == null) return 0;
+    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
   };
 
   // Array Functions
@@ -327,6 +380,7 @@
   // values in the array. Aliased as `head` and `take`. The **guard** check
   // allows it to work with `_.map`.
   _.first = _.head = _.take = function(array, n, guard) {
+    if (array == null) return void 0;
     return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
   };
 
@@ -341,6 +395,7 @@
   // Get the last element of an array. Passing **n** will return the last N
   // values in the array. The **guard** check allows it to work with `_.map`.
   _.last = function(array, n, guard) {
+    if (array == null) return void 0;
     if ((n != null) && !guard) {
       return slice.call(array, Math.max(array.length - n, 0));
     } else {
@@ -348,12 +403,12 @@
     }
   };
 
-  // Returns everything but the first entry of the array. Aliased as `tail`.
-  // Especially useful on the arguments object. Passing an **index** will return
-  // the rest of the values in the array from that index onward. The **guard**
+  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+  // Especially useful on the arguments object. Passing an **n** will return
+  // the rest N values in the array. The **guard**
   // check allows it to work with `_.map`.
-  _.rest = _.tail = function(array, index, guard) {
-    return slice.call(array, (index == null) || guard ? 1 : index);
+  _.rest = _.tail = _.drop = function(array, n, guard) {
+    return slice.call(array, (n == null) || guard ? 1 : n);
   };
 
   // Trim out all falsy values from an array.
@@ -386,23 +441,23 @@
   // Produce a duplicate-free version of the array. If the array has already
   // been sorted, you have the option of using a faster algorithm.
   // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator) {
-    var initial = iterator ? _.map(array, iterator) : array;
+  _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    var initial = iterator ? _.map(array, iterator, context) : array;
     var results = [];
-    _.reduce(initial, function(memo, value, index) {
-      if (isSorted ? (_.last(memo) !== value || !memo.length) : !_.include(memo, value)) {
-        memo.push(value);
+    var seen = [];
+    each(initial, function(value, index) {
+      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
+        seen.push(value);
         results.push(array[index]);
       }
-      return memo;
-    }, []);
+    });
     return results;
   };
 
   // Produce an array that contains the union: each distinct element from all of
   // the passed-in arrays.
   _.union = function() {
-    return _.uniq(flatten(arguments, true, []));
+    return _.uniq(concat.apply(ArrayProto, arguments));
   };
 
   // Produce an array that contains every item shared between all the
@@ -419,8 +474,8 @@
   // Take the difference between one array and a number of other arrays.
   // Only the elements present in just the first array will remain.
   _.difference = function(array) {
-    var rest = flatten(slice.call(arguments, 1), true, []);
-    return _.filter(array, function(value){ return !_.include(rest, value); });
+    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.contains(rest, value); });
   };
 
   // Zip together multiple lists into a single array -- elements that share
@@ -435,12 +490,18 @@
     return results;
   };
 
-  // Zip together two arrays -- an array of keys and an array of values -- into
-  // a single object.
-  _.zipObject = function(keys, values) {
+  // Converts lists into objects. Pass either a single array of `[key, value]`
+  // pairs, or two parallel arrays of the same length -- one of keys, and one of
+  // the corresponding values.
+  _.object = function(list, values) {
+    if (list == null) return {};
     var result = {};
-    for (var i = 0, l = keys.length; i < l; i++) {
-      result[keys[i]] = values[i];
+    for (var i = 0, l = list.length; i < l; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
     }
     return result;
   };
@@ -453,21 +514,28 @@
   // for **isSorted** to use binary search.
   _.indexOf = function(array, item, isSorted) {
     if (array == null) return -1;
-    var i, l;
+    var i = 0, l = array.length;
     if (isSorted) {
-      i = _.sortedIndex(array, item);
-      return array[i] === item ? i : -1;
+      if (typeof isSorted == 'number') {
+        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
+      } else {
+        i = _.sortedIndex(array, item);
+        return array[i] === item ? i : -1;
+      }
     }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i;
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
+    for (; i < l; i++) if (array[i] === item) return i;
     return -1;
   };
 
   // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item) {
+  _.lastIndexOf = function(array, item, from) {
     if (array == null) return -1;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
-    var i = array.length;
+    var hasIndex = from != null;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
+      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
+    }
+    var i = (hasIndex ? from : array.length);
     while (i--) if (array[i] === item) return i;
     return -1;
   };
@@ -554,23 +622,25 @@
   // Returns a function, that, when invoked, will only be triggered at most once
   // during a given window of time.
   _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more, result;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+    var context, args, timeout, result;
+    var previous = 0;
+    var later = function() {
+      previous = new Date;
+      timeout = null;
+      result = func.apply(context, args);
+    };
     return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) func.apply(context, args);
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        throttling = true;
+      var now = new Date;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
+        previous = now;
         result = func.apply(context, args);
+      } else if (!timeout) {
+        timeout = setTimeout(later, remaining);
       }
-      whenDone();
       return result;
     };
   };
@@ -580,17 +650,18 @@
   // N milliseconds. If `immediate` is passed, trigger the function on the
   // leading edge, instead of the trailing.
   _.debounce = function(func, wait, immediate) {
-    var timeout;
+    var timeout, result;
     return function() {
       var context = this, args = arguments;
       var later = function() {
         timeout = null;
-        if (!immediate) func.apply(context, args);
+        if (!immediate) result = func.apply(context, args);
       };
       var callNow = immediate && !timeout;
       clearTimeout(timeout);
       timeout = setTimeout(later, wait);
-      if (callNow) func.apply(context, args);
+      if (callNow) result = func.apply(context, args);
+      return result;
     };
   };
 
@@ -601,7 +672,9 @@
     return function() {
       if (ran) return memo;
       ran = true;
-      return memo = func.apply(this, arguments);
+      memo = func.apply(this, arguments);
+      func = null;
+      return memo;
     };
   };
 
@@ -610,7 +683,8 @@
   // conditionally execute the original function.
   _.wrap = function(func, wrapper) {
     return function() {
-      var args = [func].concat(slice.call(arguments, 0));
+      var args = [func];
+      push.apply(args, arguments);
       return wrapper.apply(this, args);
     };
   };
@@ -652,7 +726,23 @@
 
   // Retrieve the values of an object's properties.
   _.values = function(obj) {
-    return _.map(obj, _.identity);
+    var values = [];
+    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
+    return values;
+  };
+
+  // Convert an object into a list of `[key, value]` pairs.
+  _.pairs = function(obj) {
+    var pairs = [];
+    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
+    return pairs;
+  };
+
+  // Invert the keys and values of an object. The values must be serializable.
+  _.invert = function(obj) {
+    var result = {};
+    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
+    return result;
   };
 
   // Return a sorted list of the function names available on the object.
@@ -677,11 +767,22 @@
 
   // Return a copy of the object only containing the whitelisted properties.
   _.pick = function(obj) {
-    var result = {};
-    each(flatten(slice.call(arguments, 1), true, []), function(key) {
-      if (key in obj) result[key] = obj[key];
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    each(keys, function(key) {
+      if (key in obj) copy[key] = obj[key];
     });
-    return result;
+    return copy;
+  };
+
+   // Return a copy of the object without the blacklisted properties.
+  _.omit = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    for (var key in obj) {
+      if (!_.contains(keys, key)) copy[key] = obj[key];
+    }
+    return copy;
   };
 
   // Fill in a given object with default properties.
@@ -709,18 +810,15 @@
   };
 
   // Internal recursive comparison function for `isEqual`.
-  function eq(a, b, stack) {
+  var eq = function(a, b, aStack, bStack) {
     // Identical objects are equal. `0 === -0`, but they aren't identical.
     // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
     if (a === b) return a !== 0 || 1 / a == 1 / b;
     // A strict comparison is necessary because `null == undefined`.
     if (a == null || b == null) return a === b;
     // Unwrap any wrapped objects.
-    if (a._chain) a = a._wrapped;
-    if (b._chain) b = b._wrapped;
-    // Invoke a custom `isEqual` method if one is provided.
-    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
-    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
     // Compare `[[Class]]` names.
     var className = toString.call(a);
     if (className != toString.call(b)) return false;
@@ -750,14 +848,15 @@
     if (typeof a != 'object' || typeof b != 'object') return false;
     // Assume equality for cyclic structures. The algorithm for detecting cyclic
     // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = stack.length;
+    var length = aStack.length;
     while (length--) {
       // Linear search. Performance is inversely proportional to the number of
       // unique nested structures.
-      if (stack[length] == a) return true;
+      if (aStack[length] == a) return bStack[length] == b;
     }
     // Add the first object to the stack of traversed objects.
-    stack.push(a);
+    aStack.push(a);
+    bStack.push(b);
     var size = 0, result = true;
     // Recursively compare objects and arrays.
     if (className == '[object Array]') {
@@ -767,20 +866,24 @@
       if (result) {
         // Deep compare the contents, ignoring non-numeric properties.
         while (size--) {
-          // Ensure commutative equality for sparse arrays.
-          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
+          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
         }
       }
     } else {
-      // Objects with different constructors are not equivalent.
-      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
+      // Objects with different constructors are not equivalent, but `Object`s
+      // from different frames are.
+      var aCtor = a.constructor, bCtor = b.constructor;
+      if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
+                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
+        return false;
+      }
       // Deep compare objects.
       for (var key in a) {
         if (_.has(a, key)) {
           // Count the expected number of properties.
           size++;
           // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
+          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
         }
       }
       // Ensure that both objects contain the same number of properties.
@@ -792,13 +895,14 @@
       }
     }
     // Remove the first object from the stack of traversed objects.
-    stack.pop();
+    aStack.pop();
+    bStack.pop();
     return result;
-  }
+  };
 
   // Perform a deep comparison to check if two objects are equal.
   _.isEqual = function(a, b) {
-    return eq(a, b, []);
+    return eq(a, b, [], []);
   };
 
   // Is a given array, string, or object empty?
@@ -812,7 +916,7 @@
 
   // Is a given value a DOM element?
   _.isElement = function(obj) {
-    return !!(obj && obj.nodeType == 1);
+    return !!(obj && obj.nodeType === 1);
   };
 
   // Is a given value an array?
@@ -832,7 +936,7 @@
       return toString.call(obj) == '[object ' + name + ']';
     };
   });
-  
+
   // Define a fallback version of the method in browsers (ahem, IE), where
   // there isn't any inspectable "Arguments" type.
   if (!_.isArguments(arguments)) {
@@ -841,15 +945,21 @@
     };
   }
 
+  // Optimize `isFunction` if appropriate.
+  if (typeof (/./) !== 'function') {
+    _.isFunction = function(obj) {
+      return typeof obj === 'function';
+    };
+  }
+
   // Is a given object a finite number?
   _.isFinite = function(obj) {
     return _.isNumber(obj) && isFinite(obj);
   };
 
-  // Is the given value `NaN`?
+  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
   _.isNaN = function(obj) {
-    // `NaN` is the only value for which `===` is not reflexive.
-    return obj !== obj;
+    return _.isNumber(obj) && obj != +obj;
   };
 
   // Is a given value a boolean?
@@ -893,25 +1003,43 @@
     for (var i = 0; i < n; i++) iterator.call(context, i);
   };
 
+  // Return a random integer between min and max (inclusive).
+  _.random = function(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + (0 | Math.random() * (max - min + 1));
+  };
+
   // List of HTML entities for escaping.
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;',
-    '/': '&#x2F;'
+  var entityMap = {
+    escape: {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#x27;',
+      '/': '&#x2F;'
+    }
+  };
+  entityMap.unescape = _.invert(entityMap.escape);
+
+  // Regexes containing the keys and values listed immediately above.
+  var entityRegexes = {
+    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
   };
 
-  // Regex containing the keys listed immediately above.
-  var htmlEscaper = /[&<>"'\/]/g;
-
-  // Escape a string for HTML interpolation.
-  _.escape = function(string) {
-    return ('' + string).replace(htmlEscaper, function(match) {
-      return htmlEscapes[match];
-    });
-  };
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  _.each(['escape', 'unescape'], function(method) {
+    _[method] = function(string) {
+      if (string == null) return '';
+      return ('' + string).replace(entityRegexes[method], function(match) {
+        return entityMap[method][match];
+      });
+    };
+  });
 
   // If the value of the named property is a function then invoke it;
   // otherwise, return it.
@@ -921,11 +1049,15 @@
     return _.isFunction(value) ? value.call(object) : value;
   };
 
-  // Add your own custom functions to the Underscore object, ensuring that
-  // they're correctly added to the OOP wrapper as well.
+  // Add your own custom functions to the Underscore object.
   _.mixin = function(obj) {
     each(_.functions(obj), function(name){
-      addToWrapper(name, _[name] = obj[name]);
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result.call(this, func.apply(_, args));
+      };
     });
   };
 
@@ -948,63 +1080,63 @@
   // When customizing `templateSettings`, if you don't want to define an
   // interpolation, evaluation or escaping regex, we need one that is
   // guaranteed not to match.
-  var noMatch = /.^/;
+  var noMatch = /(.)^/;
 
   // Certain characters need to be escaped so that they can be put into a
   // string literal.
   var escapes = {
-    '\\':   '\\',
-    "'":    "'",
-    r:      '\r',
-    n:      '\n',
-    t:      '\t',
-    u2028:  '\u2028',
-    u2029:  '\u2029'
+    "'":      "'",
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\t':     't',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
   };
 
-  for (var key in escapes) escapes[escapes[key]] = key;
   var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
-  var unescaper = /\\(\\|'|r|n|t|u2028|u2029)/g;
-
-  // Within an interpolation, evaluation, or escaping, remove HTML escaping
-  // that had been previously added.
-  var unescape = function(code) {
-    return code.replace(unescaper, function(match, escape) {
-      return escapes[escape];
-    });
-  };
 
   // JavaScript micro-templating, similar to John Resig's implementation.
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
   _.template = function(text, data, settings) {
-    settings = _.defaults(settings || {}, _.templateSettings);
+    settings = _.defaults({}, settings, _.templateSettings);
 
-    // Compile the template source, taking care to escape characters that
-    // cannot be included in a string literal and then unescape them in code
-    // blocks.
-    var source = "__p+='" + text
-      .replace(escaper, function(match) {
-        return '\\' + escapes[match];
-      })
-      .replace(settings.escape || noMatch, function(match, code) {
-        return "'+\n((__t=(" + unescape(code) + "))==null?'':_.escape(__t))+\n'";
-      })
-      .replace(settings.interpolate || noMatch, function(match, code) {
-        return "'+\n((__t=(" + unescape(code) + "))==null?'':__t)+\n'";
-      })
-      .replace(settings.evaluate || noMatch, function(match, code) {
-        return "';\n" + unescape(code) + "\n__p+='";
-      }) + "';\n";
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = new RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset)
+        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+      source +=
+        escape ? "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'" :
+        interpolate ? "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'" :
+        evaluate ? "';\n" + evaluate + "\n__p+='" : '';
+      index = offset + match.length;
+    });
+    source += "';\n";
 
     // If a variable is not specified, place data values in local scope.
     if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
 
     source = "var __t,__p='',__j=Array.prototype.join," +
-      "print=function(){__p+=__j.call(arguments,'')};\n" +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
       source + "return __p;\n";
 
-    var render = new Function(settings.variable || 'obj', '_', source);
+    try {
+      var render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
     if (data) return render(data, _);
     var template = function(data) {
       return render.call(this, data, _);
@@ -1021,29 +1153,15 @@
     return _(obj).chain();
   };
 
-  // The OOP Wrapper
+  // OOP
   // ---------------
-
   // If Underscore is called as a function, it returns a wrapped object that
   // can be used OO-style. This wrapper holds altered versions of all the
   // underscore functions. Wrapped objects may be chained.
-  var wrapper = function(obj) { this._wrapped = obj; };
-
-  // Expose `wrapper.prototype` as `_.prototype`
-  _.prototype = wrapper.prototype;
 
   // Helper function to continue chaining intermediate results.
-  var result = function(obj, chain) {
-    return chain ? _(obj).chain() : obj;
-  };
-
-  // A method to easily add functions to the OOP wrapper.
-  var addToWrapper = function(name, func) {
-    wrapper.prototype[name] = function() {
-      var args = slice.call(arguments);
-      unshift.call(args, this._wrapped);
-      return result(func.apply(_, args), this._chain);
-    };
+  var result = function(obj) {
+    return this._chain ? _(obj).chain() : obj;
   };
 
   // Add all of the Underscore functions to the wrapper object.
@@ -1052,31 +1170,35 @@
   // Add all mutator Array functions to the wrapper.
   each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
     var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
+    _.prototype[name] = function() {
       var obj = this._wrapped;
       method.apply(obj, arguments);
       if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
-      return result(obj, this._chain);
+      return result.call(this, obj);
     };
   });
 
   // Add all accessor Array functions to the wrapper.
   each(['concat', 'join', 'slice'], function(name) {
     var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      return result(method.apply(this._wrapped, arguments), this._chain);
+    _.prototype[name] = function() {
+      return result.call(this, method.apply(this._wrapped, arguments));
     };
   });
 
-  // Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain = function() {
-    this._chain = true;
-    return this;
-  };
+  _.extend(_.prototype, {
 
-  // Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value = function() {
-    return this._wrapped;
-  };
+    // Start chaining a wrapped Underscore object.
+    chain: function() {
+      this._chain = true;
+      return this;
+    },
+
+    // Extracts the result from a wrapped and chained object.
+    value: function() {
+      return this._wrapped;
+    }
+
+  });
 
 }).call(this);