Merge pull request #1 from sedge/browserify

Nodejs Filer compat

.gitignore

@@ -3,4 +3,3 @@ bower_components
 .env
 *~
 dist/filer-test.js
-/dist/filer_node-test.js

build/almond.js

@@ -1,405 +0,0 @@
-/**
- * almond 0.2.5 Copyright (c) 2011-2012, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/almond for details
- */
-//Going sloppy to avoid 'use strict' string cost, but strict practices should
-//be followed.
-/*jslint sloppy: true */
-/*global setTimeout: false */
-
-var requirejs, require, define;
-(function (undef) {
-    var main, req, makeMap, handlers,
-        defined = {},
-        waiting = {},
-        config = {},
-        defining = {},
-        hasOwn = Object.prototype.hasOwnProperty,
-        aps = [].slice;
-
-    function hasProp(obj, prop) {
-        return hasOwn.call(obj, prop);
-    }
-
-    /**
-     * Given a relative module name, like ./something, normalize it to
-     * a real name that can be mapped to a path.
-     * @param {String} name the relative name
-     * @param {String} baseName a real name that the name arg is relative
-     * to.
-     * @returns {String} normalized name
-     */
-    function normalize(name, baseName) {
-        var nameParts, nameSegment, mapValue, foundMap,
-            foundI, foundStarMap, starI, i, j, part,
-            baseParts = baseName && baseName.split("/"),
-            map = config.map,
-            starMap = (map && map['*']) || {};
-
-        //Adjust any relative paths.
-        if (name && name.charAt(0) === ".") {
-            //If have a base name, try to normalize against it,
-            //otherwise, assume it is a top-level require that will
-            //be relative to baseUrl in the end.
-            if (baseName) {
-                //Convert baseName to array, and lop off the last part,
-                //so that . matches that "directory" and not name of the baseName's
-                //module. For instance, baseName of "one/two/three", maps to
-                //"one/two/three.js", but we want the directory, "one/two" for
-                //this normalization.
-                baseParts = baseParts.slice(0, baseParts.length - 1);
-
-                name = baseParts.concat(name.split("/"));
-
-                //start trimDots
-                for (i = 0; i < name.length; i += 1) {
-                    part = name[i];
-                    if (part === ".") {
-                        name.splice(i, 1);
-                        i -= 1;
-                    } else if (part === "..") {
-                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
-                            //End of the line. Keep at least one non-dot
-                            //path segment at the front so it can be mapped
-                            //correctly to disk. Otherwise, there is likely
-                            //no path mapping for a path starting with '..'.
-                            //This can still fail, but catches the most reasonable
-                            //uses of ..
-                            break;
-                        } else if (i > 0) {
-                            name.splice(i - 1, 2);
-                            i -= 2;
-                        }
-                    }
-                }
-                //end trimDots
-
-                name = name.join("/");
-            } else if (name.indexOf('./') === 0) {
-                // No baseName, so this is ID is resolved relative
-                // to baseUrl, pull off the leading dot.
-                name = name.substring(2);
-            }
-        }
-
-        //Apply map config if available.
-        if ((baseParts || starMap) && map) {
-            nameParts = name.split('/');
-
-            for (i = nameParts.length; i > 0; i -= 1) {
-                nameSegment = nameParts.slice(0, i).join("/");
-
-                if (baseParts) {
-                    //Find the longest baseName segment match in the config.
-                    //So, do joins on the biggest to smallest lengths of baseParts.
-                    for (j = baseParts.length; j > 0; j -= 1) {
-                        mapValue = map[baseParts.slice(0, j).join('/')];
-
-                        //baseName segment has  config, find if it has one for
-                        //this name.
-                        if (mapValue) {
-                            mapValue = mapValue[nameSegment];
-                            if (mapValue) {
-                                //Match, update name to the new value.
-                                foundMap = mapValue;
-                                foundI = i;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                if (foundMap) {
-                    break;
-                }
-
-                //Check for a star map match, but just hold on to it,
-                //if there is a shorter segment match later in a matching
-                //config, then favor over this star map.
-                if (!foundStarMap && starMap && starMap[nameSegment]) {
-                    foundStarMap = starMap[nameSegment];
-                    starI = i;
-                }
-            }
-
-            if (!foundMap && foundStarMap) {
-                foundMap = foundStarMap;
-                foundI = starI;
-            }
-
-            if (foundMap) {
-                nameParts.splice(0, foundI, foundMap);
-                name = nameParts.join('/');
-            }
-        }
-
-        return name;
-    }
-
-    function makeRequire(relName, forceSync) {
-        return function () {
-            //A version of a require function that passes a moduleName
-            //value for items that may need to
-            //look up paths relative to the moduleName
-            return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
-        };
-    }
-
-    function makeNormalize(relName) {
-        return function (name) {
-            return normalize(name, relName);
-        };
-    }
-
-    function makeLoad(depName) {
-        return function (value) {
-            defined[depName] = value;
-        };
-    }
-
-    function callDep(name) {
-        if (hasProp(waiting, name)) {
-            var args = waiting[name];
-            delete waiting[name];
-            defining[name] = true;
-            main.apply(undef, args);
-        }
-
-        if (!hasProp(defined, name) && !hasProp(defining, name)) {
-            throw new Error('No ' + name);
-        }
-        return defined[name];
-    }
-
-    //Turns a plugin!resource to [plugin, resource]
-    //with the plugin being undefined if the name
-    //did not have a plugin prefix.
-    function splitPrefix(name) {
-        var prefix,
-            index = name ? name.indexOf('!') : -1;
-        if (index > -1) {
-            prefix = name.substring(0, index);
-            name = name.substring(index + 1, name.length);
-        }
-        return [prefix, name];
-    }
-
-    /**
-     * Makes a name map, normalizing the name, and using a plugin
-     * for normalization if necessary. Grabs a ref to plugin
-     * too, as an optimization.
-     */
-    makeMap = function (name, relName) {
-        var plugin,
-            parts = splitPrefix(name),
-            prefix = parts[0];
-
-        name = parts[1];
-
-        if (prefix) {
-            prefix = normalize(prefix, relName);
-            plugin = callDep(prefix);
-        }
-
-        //Normalize according
-        if (prefix) {
-            if (plugin && plugin.normalize) {
-                name = plugin.normalize(name, makeNormalize(relName));
-            } else {
-                name = normalize(name, relName);
-            }
-        } else {
-            name = normalize(name, relName);
-            parts = splitPrefix(name);
-            prefix = parts[0];
-            name = parts[1];
-            if (prefix) {
-                plugin = callDep(prefix);
-            }
-        }
-
-        //Using ridiculous property names for space reasons
-        return {
-            f: prefix ? prefix + '!' + name : name, //fullName
-            n: name,
-            pr: prefix,
-            p: plugin
-        };
-    };
-
-    function makeConfig(name) {
-        return function () {
-            return (config && config.config && config.config[name]) || {};
-        };
-    }
-
-    handlers = {
-        require: function (name) {
-            return makeRequire(name);
-        },
-        exports: function (name) {
-            var e = defined[name];
-            if (typeof e !== 'undefined') {
-                return e;
-            } else {
-                return (defined[name] = {});
-            }
-        },
-        module: function (name) {
-            return {
-                id: name,
-                uri: '',
-                exports: defined[name],
-                config: makeConfig(name)
-            };
-        }
-    };
-
-    main = function (name, deps, callback, relName) {
-        var cjsModule, depName, ret, map, i,
-            args = [],
-            usingExports;
-
-        //Use name if no relName
-        relName = relName || name;
-
-        //Call the callback to define the module, if necessary.
-        if (typeof callback === 'function') {
-
-            //Pull out the defined dependencies and pass the ordered
-            //values to the callback.
-            //Default to [require, exports, module] if no deps
-            deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
-            for (i = 0; i < deps.length; i += 1) {
-                map = makeMap(deps[i], relName);
-                depName = map.f;
-
-                //Fast path CommonJS standard dependencies.
-                if (depName === "require") {
-                    args[i] = handlers.require(name);
-                } else if (depName === "exports") {
-                    //CommonJS module spec 1.1
-                    args[i] = handlers.exports(name);
-                    usingExports = true;
-                } else if (depName === "module") {
-                    //CommonJS module spec 1.1
-                    cjsModule = args[i] = handlers.module(name);
-                } else if (hasProp(defined, depName) ||
-                           hasProp(waiting, depName) ||
-                           hasProp(defining, depName)) {
-                    args[i] = callDep(depName);
-                } else if (map.p) {
-                    map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
-                    args[i] = defined[depName];
-                } else {
-                    throw new Error(name + ' missing ' + depName);
-                }
-            }
-
-            ret = callback.apply(defined[name], args);
-
-            if (name) {
-                //If setting exports via "module" is in play,
-                //favor that over return value and exports. After that,
-                //favor a non-undefined return value over exports use.
-                if (cjsModule && cjsModule.exports !== undef &&
-                        cjsModule.exports !== defined[name]) {
-                    defined[name] = cjsModule.exports;
-                } else if (ret !== undef || !usingExports) {
-                    //Use the return value from the function.
-                    defined[name] = ret;
-                }
-            }
-        } else if (name) {
-            //May just be an object definition for the module. Only
-            //worry about defining if have a module name.
-            defined[name] = callback;
-        }
-    };
-
-    requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
-        if (typeof deps === "string") {
-            if (handlers[deps]) {
-                //callback in this case is really relName
-                return handlers[deps](callback);
-            }
-            //Just return the module wanted. In this scenario, the
-            //deps arg is the module name, and second arg (if passed)
-            //is just the relName.
-            //Normalize module name, if it contains . or ..
-            return callDep(makeMap(deps, callback).f);
-        } else if (!deps.splice) {
-            //deps is a config object, not an array.
-            config = deps;
-            if (callback.splice) {
-                //callback is an array, which means it is a dependency list.
-                //Adjust args if there are dependencies
-                deps = callback;
-                callback = relName;
-                relName = null;
-            } else {
-                deps = undef;
-            }
-        }
-
-        //Support require(['a'])
-        callback = callback || function () {};
-
-        //If relName is a function, it is an errback handler,
-        //so remove it.
-        if (typeof relName === 'function') {
-            relName = forceSync;
-            forceSync = alt;
-        }
-
-        //Simulate async callback;
-        if (forceSync) {
-            main(undef, deps, callback, relName);
-        } else {
-            //Using a non-zero value because of concern for what old browsers
-            //do, and latest browsers "upgrade" to 4 if lower value is used:
-            //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
-            //If want a value immediately, use require('id') instead -- something
-            //that works in almond on the global level, but not guaranteed and
-            //unlikely to work in other AMD implementations.
-            setTimeout(function () {
-                main(undef, deps, callback, relName);
-            }, 4);
-        }
-
-        return req;
-    };
-
-    /**
-     * Just drops the config on the floor, but returns req in case
-     * the config return value is used.
-     */
-    req.config = function (cfg) {
-        config = cfg;
-        if (config.deps) {
-            req(config.deps, config.callback);
-        }
-        return req;
-    };
-
-    define = function (name, deps, callback) {
-
-        //This module may not have dependencies
-        if (!deps.splice) {
-            //deps is not an array, so probably means
-            //an object literal or factory function for
-            //the value. Adjust args.
-            callback = deps;
-            deps = [];
-        }
-
-        if (!hasProp(defined, name) && !hasProp(waiting, name)) {
-            waiting[name] = [name, deps, callback];
-        }
-    };
-
-    define.amd = {
-        jQuery: true
-    };
-}());

build/browser_wrap.end

@@ -1,7 +0,0 @@
-
-  var Filer = require( "src/index" );
-
-  return Filer;
-
-}));
-

build/browser_wrap.start

@@ -1,24 +0,0 @@
-/*
-Copyright (c) 2013, Alan Kligman
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    Neither the name of the Mozilla Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function( root, factory ) {
-
-  if (typeof define === "function" && define.amd) {
-    // AMD. Register as an anonymous module.
-    define( factory );
-  } else if( !root.Filer ) {
-    // Browser globals
-    root.Filer = factory();
-  }
-
-}( this, function() {

build/node_wrap.end

@@ -1,7 +0,0 @@
-
-  var Filer = require( "src/index" );
-
-  return Filer;
-
-}));
-

build/node_wrap.start

@@ -1,21 +0,0 @@
-/*
-Copyright (c) 2013, Alan Kligman
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    Neither the name of the Mozilla Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-(function( root, factory ) {
-  if (typeof exports === "object") {
-    module.exports = factory();
-  } else if (typeof define === "function" && define.amd) {
-    // AMD. Register as an anonymous module.
-    define( factory );
-  }
-}( this, function() {

gruntfile.js

@@ -51,110 +51,30 @@ module.exports = function(grunt) {
       ]
     },
 
-    shell: {
+    browserify: {
-      mocha: {
+      filerDist: {
-        command: './node_modules/.bin/mocha --reporter list --no-exit tests/node-runner.js'
+        src: "./src/index.js",
+        dest: "./dist/filer.js",
+        options: {
+          standalone: 'Filer',
+          browserifyOptions: {
+            builtins: false,
+            commondir: false
+          }
+        }
+      },
+      filerTest: {
+        src: "./tests/index.js",
+        dest: "./dist/filer-test.js",
+        options: {
+          standalone: 'FilerTest'
+        }
       }
     },
 
-    requirejs: {
+    shell: {
-      browser_develop: {
+      mocha: {
-        options: {
+        command: './node_modules/.bin/mocha --reporter list tests/index.js'
-          paths: {
-            "src": "../src",
-            "build": "../build"
-          },
-          baseUrl: "lib",
-          name: "build/almond",
-          include: ["src/index"],
-          out: "dist/filer.js",
-          optimize: "none",
-          wrap: {
-            startFile: 'build/browser_wrap.start',
-            endFile: 'build/browser_wrap.end'
-          },
-          shim: {
-            // TextEncoder and TextDecoder shims. encoding-indexes must get loaded first,
-            // and we use a fake one for reduced size, since we only care about utf8.
-            "encoding": {
-              deps: ["encoding-indexes-shim"]
-            }
-          }
-        }
-      },
-      node_develop: {
-        options: {
-          paths: {
-            "src": "../src",
-            "build": "../build"
-          },
-          baseUrl: "lib",
-          name: "require",
-          include: ["src/index"],
-          out: "dist/filer_node.js",
-          optimize: "none",
-          wrap: {
-            startFile: 'build/node_wrap.start',
-            endFile: 'build/node_wrap.end'
-          },
-          shim: {
-            // TextEncoder and TextDecoder shims. encoding-indexes must get loaded first,
-            // and we use a fake one for reduced size, since we only care about utf8.
-            "encoding": {
-              deps: ["encoding-indexes-shim"]
-            }
-          },
-          nodeRequire: require
-        }
-      },
-      browser_test: {
-        options: {
-          paths: {
-            "src": "../src",
-            "build": "../build"
-          },
-          baseUrl: "lib",
-          name: "build/almond",
-          include: ["src/index"],
-          out: "dist/filer-test.js",
-          optimize: "none",
-          wrap: {
-            startFile: 'build/browser_wrap.start',
-            endFile: 'build/browser_wrap.end'
-          },
-          shim: {
-            // TextEncoder and TextDecoder shims. encoding-indexes must get loaded first,
-            // and we use a fake one for reduced size, since we only care about utf8.
-            "encoding": {
-              deps: ["encoding-indexes-shim"]
-            }
-          }
-        }
-    },
-      node_test: {
-        options: {
-          paths: {
-            "src": "../src",
-            "build": "../build"
-          },
-          baseUrl: "lib",
-          name: "require",
-          include: ["src/index"],
-          out: "dist/filer_node-test.js",
-          optimize: "none",
-          wrap: {
-            startFile: 'build/node_wrap.start',
-            endFile: 'build/node_wrap.end'
-          },
-          shim: {
-            // TextEncoder and TextDecoder shims. encoding-indexes must get loaded first,
-            // and we use a fake one for reduced size, since we only care about utf8.
-            "encoding": {
-              deps: ["encoding-indexes-shim"]
-            }
-          },
-          nodeRequire: require
-        }
       }
     },
 
@@ -229,13 +149,13 @@ module.exports = function(grunt) {
       }
     },
     connect: {
-      server_for_node: {
+      serverForNode: {
         options: {
           port: 1234,
           base: '.'
         }
       },
-      server_for_browser: {
+      serverForBrowser: {
         options: {
           port: 1234,
           base: '.',
@@ -247,7 +167,6 @@ module.exports = function(grunt) {
 
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-requirejs');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-mocha');
   grunt.loadNpmTasks('grunt-contrib-connect');
@@ -257,11 +176,11 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-prompt');
   grunt.loadNpmTasks('grunt-shell');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-browserify');
 
-  grunt.registerTask('develop', ['clean', 'requirejs:browser_develop', 'requirejs:node_develop']);
+  grunt.registerTask('develop', ['clean', 'browserify:filerDist']);
-  grunt.registerTask('filer-test', ['clean', 'requirejs:node_test', 'requirejs:browser_test']);
+  grunt.registerTask('build-tests', ['clean', 'browserify:filerTest']);
   grunt.registerTask('release', ['develop', 'uglify']);
-  grunt.registerTask('check', ['jshint']);
 
   grunt.registerTask('publish', 'Publish filer as a new version to NPM, bower and github.', function(patchLevel) {
     var allLevels = ['patch', 'minor', 'major'];
@@ -283,6 +202,7 @@ module.exports = function(grunt) {
     grunt.task.run([
       'prompt:confirm',
       'checkBranch',
+      'test-node',
       'release',
       'bump:' + patchLevel,
       'gitcheckout:publish',
@@ -291,8 +211,8 @@ module.exports = function(grunt) {
       'npm-publish'
     ]);
   });
-  grunt.registerTask('test-node', ['check', 'filer-test', 'connect:server_for_node', 'shell:mocha']);
+  grunt.registerTask('test-node', ['jshint', 'clean', 'connect:serverForNode', 'shell:mocha']);
-  grunt.registerTask('test-browser', ['check', 'filer-test', 'connect:server_for_browser']);
+  grunt.registerTask('test-browser', ['jshint', 'build-tests', 'connect:serverForBrowser']);
   grunt.registerTask('test', ['test-node']);
 
   grunt.registerTask('default', ['test']);

package.json

@@ -31,25 +31,23 @@
   "devDependencies": {
     "chai": "~1.9.1",
     "grunt": "~0.4.0",
+    "grunt-browserify": "^2.1.0",
     "grunt-bump": "0.0.13",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-contrib-compress": "~0.4.1",
     "grunt-contrib-concat": "~0.1.3",
     "grunt-contrib-connect": "^0.7.1",
     "grunt-contrib-jshint": "~0.7.1",
-    "grunt-contrib-requirejs": "~0.4.0",
     "grunt-contrib-uglify": "~0.1.2",
     "grunt-contrib-watch": "~0.3.1",
     "grunt-git": "0.2.10",
-    "grunt-shell": "~0.7.0",
     "grunt-mocha": "0.4.10",
     "grunt-npm": "git://github.com/sedge/grunt-npm.git#branchcheck",
     "grunt-prompt": "^1.1.0",
+    "grunt-shell": "~0.7.0",
     "habitat": "^1.1.0",
-    "semver": "^2.3.0",
-    "requirejs": "~2.1.11",
     "mocha": "~1.18.2",
-    "requirejs": "~2.1.11"
+    "semver": "^2.3.0"
   },
   "main": "./src/index.js"
 }

src/network.js

@@ -32,6 +32,10 @@ function nodeDownload(uri, callback) {
 
     error = statusCode != 200 ? { message: err || 'Not found!', code: statusCode } : null;
 
+    if (error) {
+      return callback(error, null);
+    }
+
     arrayBuffer = arrayLength && new ArrayBuffer(arrayLength);
 
     // Convert buffer to Uint8Array
@@ -42,7 +46,7 @@ function nodeDownload(uri, callback) {
       }
     }
 
-    callback(error, data);
+    callback(null, data);
   });
 }
 

tests/index.html

@@ -6,26 +6,14 @@
   <script src="../bower_components/chai/chai.js"></script>
   <script src="../bower_components/mocha/mocha.js"></script>
   <script>
-    // Polyfill for function.bind, which PhantomJS seems to need, see
+    mocha.setup('bdd').timeout(5000).slow(250);;
-    // https://gist.github.com/Daniel-Hug/5682738/raw/147ec7d72123fbef4d7471dcc88c2bc3d52de8d9/function-bind.js
-    Function.prototype.bind = (function () {}).bind || function (b) {
-      if (typeof this !== "function") {
-      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
-      }
 
-      function c() {}
+    window.onload = function() {
-      var a = [].slice,
+      mocha.checkLeaks();
-          f = a.call(arguments, 1),
+      mocha.run();
-          e = this,
-          d = function () {
-              return e.apply(this instanceof c ? this : b || window, f.concat(a.call(arguments)));
-          };
-      c.prototype = this.prototype;
-      d.prototype = new c();
-      return d;
     };
   </script>
-  <script src="../lib/require.js" data-main="require-config"></script>
+  <script src="../dist/filer-test.js"></script>
  </head>
 <body>
   <div id="mocha"></div>

tests/index.js

@@ -36,12 +36,12 @@ require("./spec/times.spec");
 require("./spec/time-flags.spec");
 require("./spec/fs.watch.spec");
 require("./spec/errors.spec");
-require("./spec/lib.spec");
 
 // Filer.FileSystem.providers.*
 require("./spec/providers/providers.spec");
 require("./spec/providers/providers.indexeddb.spec");
 require("./spec/providers/providers.websql.spec");
+require("./spec/providers/providers.memory.spec");
 
 // Filer.FileSystemShell.*
 require("./spec/shell/cd.spec");
@@ -55,6 +55,9 @@ require("./spec/shell/mkdirp.spec");
 require("./spec/shell/wget.spec");
 require("./spec/shell/zip-unzip.spec");
 
+// Custom Filer library modules
+require("./spec/libs/network.spec");
+
 // Ported node.js tests (filenames match names in https://github.com/joyent/node/tree/master/test)
 require("./spec/node-js/simple/test-fs-mkdir");
 require("./spec/node-js/simple/test-fs-null-bytes");
@@ -64,4 +67,3 @@ require("./spec/node-js/simple/test-fs-watch-recursive");
 // Regressions; Bugs
 require("./bugs/issue105");
 require("./bugs/issue106");
-require("./spec/providers/providers.memory.spec");

tests/node-runner.js

@@ -1,5 +0,0 @@
-// We use Chai's expect assertions in all the tests via a global
-GLOBAL.expect = require('chai').expect;
-
-// Tests to be run are defined in test-manifest.js
-require('./test-manifest.js');

tests/spec/libs/network.spec.js

@@ -1,7 +1,7 @@
-var network = require('../../src/network.js');
+var network = require('../../../src/network.js');
 var expect = require('chai').expect;
 
-describe('Network download tool', function() {
+describe('Network module', function() {
   var uri;
 
   if (typeof XMLHttpRequest === 'undefined') {
@@ -20,13 +20,6 @@ describe('Network download tool', function() {
     };
   }
 
-  it('should throw an exception when a URI is not passed', function(done) {
-    expect(function() {
-      network.download(undefined, function(error, data) {});
-    }).to.throwError;
-    done();
-  });
-
   it('should get an error when a non-existent path is specified', function(done) {
     network.download(uri.notFound, function(error, data) {
       expect(error).to.exist;

tests/spec/providers/providers.memory.spec.js

@@ -13,6 +13,38 @@ describe("Filer.FileSystem.providers.Memory", function() {
     expect(memoryProvider.getReadWriteContext).to.be.a('function');
   });
 
+  describe("Memory provider DBs are sharable", function() {
+    it("should share a single memory db when name is the same", function(done) {
+      var provider1;
+      var provider2;
+      var provider3;
+      var name1 = 'memory-db';
+      var name2 = 'memory-db2';
+
+      provider1 = new Filer.FileSystem.providers.Memory(name1);
+      provider1.open(function(error, firstAccess) {
+        expect(error).not.to.exist;
+        expect(firstAccess).to.be.true;
+
+        provider2 = new Filer.FileSystem.providers.Memory(name1);
+        provider2.open(function(error, firstAccess) {
+          expect(error).not.to.exist;
+          expect(firstAccess).to.be.false;
+          expect(provider1.db).to.equal(provider2.db);
+
+          provider3 = new Filer.FileSystem.providers.Memory(name2);
+          provider3.open(function(error, firstAccess) {
+            expect(error).not.to.exist;
+            expect(firstAccess).to.be.true;
+            expect(provider3.db).not.to.equal(provider2.db);
+
+            done();
+          });
+        });
+      });
+    });
+  });
+
   describe("open an Memory provider", function() {
     it("should open a new Memory database", function(done) {
       var provider = new Filer.FileSystem.providers.Memory();

tests/spec/shell/cd.spec.js

@@ -1,5 +1,6 @@
 var Filer = require('../../..');
 var util = require('../../lib/test-utils.js');
+var expect = require('chai').expect;
 
 describe('FileSystemShell.cd', function() {
   beforeEach(util.setup);