vulcan 0.2.5 → 0.3.0

data/server/node_modules/node-uuid/package.json

@@ -1,14 +1,12 @@
 {
   "name"          : "node-uuid",
-  "description"   : "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
+  "description"   : "Simple, fast generation of RFC4122(v4) UUIDs.",
   "url"           : "http://github.com/broofa/node-uuid",
   "keywords"      : ["uuid", "guid", "rfc4122"],
   "author"        : "Robert Kieffer <robert@broofa.com>",
-  "contributors"  : [
-    {"name": "Christoph Tavan <dev@tavan.de>", "github": "https://github.com/ctavan"}
-  ],
+  "contributors"  : [],
   "dependencies"  : [],
   "lib"           : ".",
   "main"          : "./uuid.js",
-  "version"       : "1.3.3"
+  "version"       : "1.2.0"
 }

data/server/node_modules/node-uuid/test/benchmark.js

@@ -0,0 +1,27 @@
+var nodeuuid = require('../uuid'),
+    uuidjs = require('uuid').generate,
+    N = 5e5;
+
+function rate(msg, t) {
+  console.log(msg + ': ' +
+    (N / (Date.now() - t) * 1e3 | 0) +
+    ' uuids/second');
+}
+
+// node-uuid - string form
+for (var i = 0, t = Date.now(); i < N; i++) nodeuuid();
+rate('nodeuuid()', t);
+
+for (var i = 0, t = Date.now(); i < N; i++) nodeuuid('binary');
+rate('nodeuuid(\'binary\')', t);
+
+var buffer = new nodeuuid.BufferClass(16);
+for (var i = 0, t = Date.now(); i < N; i++) nodeuuid('binary', buffer);
+rate('nodeuuid(\'binary\', buffer)', t);
+
+// node-uuid - string form
+for (var i = 0, t = Date.now(); i < N; i++) uuidjs();
+rate('uuidjs()', t);
+
+for (var i = 0, t = Date.now(); i < N; i++) uuidjs('binary');
+rate('uuidjs(\'binary\')', t);

data/server/node_modules/node-uuid/test/test.html

@@ -5,9 +5,6 @@
         font-family: monospace;
         font-size: 8pt;
       }
-      div.log {color: #444;}
-      div.warn {color: #550;}
-      div.error {color: #800; font-weight: bold;}
     </style>
     <script src="../uuid.js"></script>
   </head>

data/server/node_modules/node-uuid/test/test.js

@@ -1,240 +1,83 @@
-if (!this.uuid) {
-  // node.js
+if (typeof(uuid) == 'undefined') {
   uuid = require('../uuid');
 }
 
-//
-// x-platform log/assert shims
-//
-
-function _log(msg, type) {
-  type = type || 'log';
+var UUID_FORMAT = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89a-fAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}/;
+var N = 1e5;
 
+function log(msg) {
   if (typeof(document) != 'undefined') {
-    document.write('<div class="' + type + '">' + msg.replace(/\n/g, '<br />') + '</div>');
+    document.write('<div>' + msg + '</div>');
   }
   if (typeof(console) != 'undefined') {
-    var color = {
-      log: '\033[30m',
-      warn: '\033[33m',
-      error: '\033[31m'
-    }
-    console[type](color[type] + msg + color.log);
-  }
-}
-
-function log(msg) {_log(msg, 'log');}
-function warn(msg) {_log(msg, 'warn');}
-function error(msg) {_log(msg, 'error');}
-
-function assert(res, msg) {
-  if (!res) {
-    error('FAIL: ' + msg);
-  } else {
-    log('Pass: ' + msg);
+    console.log(msg);
   }
 }
 
-//
-// Unit tests
-//
-
-// Verify ordering of v1 ids created with explicit times
-var TIME = 1321644961388; // 2011-11-18 11:36:01.388-08:00
-
-function compare(name, ids) {
-  ids = ids.map(function(id) {
-    return id.split('-').reverse().join('-');
-  }).sort();
-  var sorted = ([].concat(ids)).sort();
-
-  assert(sorted.toString() == ids.toString(), name + ' have expected order');
-}
-
-// Verify ordering of v1 ids created using default behavior
-compare('uuids with current time', [
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1()
-]);
-
-// Verify ordering of v1 ids created with explicit times
-compare('uuids with time option', [
-  uuid.v1({msecs: TIME - 10*3600*1000}),
-  uuid.v1({msecs: TIME - 1}),
-  uuid.v1({msecs: TIME}),
-  uuid.v1({msecs: TIME + 1}),
-  uuid.v1({msecs: TIME + 28*24*3600*1000}),
-]);
-
-assert(
-  uuid.v1({msecs: TIME}) != uuid.v1({msecs: TIME}),
-  'IDs created at same msec are different'
-);
-
-// Verify throw if too many ids created
-var thrown = false;
-try {
-  uuid.v1({msecs: TIME, nsecs: 10000});
-} catch (e) {
-  thrown = true;
+function rate(msg, t) {
+  log(msg + ': ' + (N / (Date.now() - t) * 1e3 | 0) + ' uuids/second');
 }
-assert(thrown, 'Exception thrown when > 10K ids created in 1 ms');
-
-// Verify clock regression bumps clockseq
-var uidt = uuid.v1({msecs: TIME});
-var uidtb = uuid.v1({msecs: TIME - 1});
-assert(
-  parseInt(uidtb.split('-')[3], 16) - parseInt(uidt.split('-')[3], 16) === 1,
-  'Clock regression by msec increments the clockseq'
-);
-
-// Verify clock regression bumps clockseq
-var uidtn = uuid.v1({msecs: TIME, nsecs: 10});
-var uidtnb = uuid.v1({msecs: TIME, nsecs: 9});
-assert(
-  parseInt(uidtnb.split('-')[3], 16) - parseInt(uidtn.split('-')[3], 16) === 1,
-  'Clock regression by nsec increments the clockseq'
-);
-
-// Verify explicit options produce expected id
-var id = uuid.v1({
-  msecs: 1321651533573,
-  nsecs: 5432,
-  clockseq: 0x385c,
-  node: [ 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10 ]
-});
-assert(id == 'd9428888-122b-11e1-b85c-61cd3cbb3210', 'Explicit options produce expected id');
 
-// Verify adjacent ids across a msec boundary are 1 time unit apart
-var u0 = uuid.v1({msecs: TIME, nsecs: 9999});
-var u1 = uuid.v1({msecs: TIME + 1, nsecs: 0});
-
-var before = u0.split('-')[0], after = u1.split('-')[0];
-var dt = parseInt(after, 16) - parseInt(before, 16);
-assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart');
-
-//
-// Test parse/unparse
-//
-
-id = '00112233445566778899aabbccddeeff';
-assert(uuid.unparse(uuid.parse(id.substr(0,10))) ==
-  '00112233-4400-0000-0000-000000000000', 'Short parse');
-assert(uuid.unparse(uuid.parse('(this is the uuid -> ' + id + id)) ==
-  '00112233-4455-6677-8899-aabbccddeeff', 'Dirty parse');
-
-//
 // Perf tests
-//
-
-var generators = {
-  v1: uuid.v1,
-  v4: uuid.v4
-};
+log('- - - Performance Data - - -');
+for (var i = 0, t = Date.now(); i < N; i++) uuid();
+rate('uuid()', t);
+for (var i = 0, t = Date.now(); i < N; i++) uuid('binary');
+rate('uuid(\'binary\')', t);
+var buf = new uuid.BufferClass(16);
+for (var i = 0, t = Date.now(); i < N; i++) uuid('binary', buf);
+rate('uuid(\'binary\', buffer)', t);
+
+var counts = {}, max = 0;
+
+var b  = new uuid.BufferClass(16);
+for (var i = 0; i < N; i++) {
+  id = uuid();
+  if (!UUID_FORMAT.test(id)) {
+    throw Error(id + ' is not a valid UUID string');
+  }
 
-var UUID_FORMAT = {
-  v1: /[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i,
-  v4: /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i
-};
+  if (id != uuid.unparse(uuid.parse(id))) {
+    throw Error(id + ' does not parse/unparse');
+  }
 
-var N = 1e4;
+  // Count digits for our randomness check
+  var digits = id.replace(/-/g, '').split('');
+  for (var j = digits.length-1; j >= 0; j--) {
+    var c = digits[j];
+    max = Math.max(max, counts[c] = (counts[c] || 0) + 1);
+  }
+}
 
 // Get %'age an actual value differs from the ideal value
 function divergence(actual, ideal) {
   return Math.round(100*100*(actual - ideal)/ideal)/100;
 }
 
-function rate(msg, t) {
-  log(msg + ': ' + (N / (Date.now() - t) * 1e3 | 0) + ' uuids\/second');
-}
-
-for (var version in generators) {
-  var counts = {}, max = 0;
-  var generator = generators[version];
-  var format = UUID_FORMAT[version];
-
-  log('\nSanity check ' + N + ' ' + version + ' uuids');
-  for (var i = 0, ok = 0; i < N; i++) {
-    id = generator();
-    if (!format.test(id)) {
-      throw Error(id + ' is not a valid UUID string');
-    }
-
-    if (id != uuid.unparse(uuid.parse(id))) {
-      assert(fail, id + ' is not a valid id');
-    }
-
-    // Count digits for our randomness check
-    if (version == 'v4') {
-      var digits = id.replace(/-/g, '').split('');
-      for (var j = digits.length-1; j >= 0; j--) {
-        var c = digits[j];
-        max = Math.max(max, counts[c] = (counts[c] || 0) + 1);
-      }
-    }
-  }
-
-  // Check randomness for v4 UUIDs
-  if (version == 'v4') {
-    // Limit that we get worried about randomness. (Purely empirical choice, this!)
-    var limit = 2*100*Math.sqrt(1/N);
-
-    log('\nChecking v4 randomness.  Distribution of Hex Digits (% deviation from ideal)');
-
-    for (var i = 0; i < 16; i++) {
-      var c = i.toString(16);
-      var bar = '', n = counts[c], p = Math.round(n/max*100|0);
-
-      // 1-3,5-8, and D-F: 1:16 odds over 30 digits
-      var ideal = N*30/16;
-      if (i == 4) {
-        // 4: 1:1 odds on 1 digit, plus 1:16 odds on 30 digits
-        ideal = N*(1 + 30/16);
-      } else if (i >= 8 && i <= 11) {
-        // 8-B: 1:4 odds on 1 digit, plus 1:16 odds on 30 digits
-        ideal = N*(1/4 + 30/16);
-      } else {
-        // Otherwise: 1:16 odds on 30 digits
-        ideal = N*30/16;
-      }
-      var d = divergence(n, ideal);
-
-      // Draw bar using UTF squares (just for grins)
-      var s = n/max*50 | 0;
-      while (s--) bar += '=';
-
-      assert(Math.abs(d) < limit, c + ' |' + bar + '| ' + counts[c] + ' (' + d + '% < ' + limit + '%)');
-    }
-  }
-}
-
-// Perf tests
-for (var version in generators) {
-  log('\nPerformance testing ' + version + ' UUIDs');
-  var generator = generators[version];
-  var buf = new uuid.BufferClass(16);
-
-  if (version == 'v4') {
-    ['mathRNG', 'whatwgRNG', 'nodeRNG'].forEach(function(rng) {
-      if (uuid[rng]) {
-        var options = {rng: uuid[rng]};
-        for (var i = 0, t = Date.now(); i < N; i++) generator(options);
-        rate('uuid.' + version + '() with ' + rng, t);
-      } else {
-        log('uuid.' + version + '() with ' + rng + ': not defined');
-      }
-    });
+log('<br />- - - Distribution of Hex Digits (% deviation from ideal) - - -');
+
+// Check randomness
+for (var i = 0; i < 16; i++) {
+  var c = i.toString(16);
+  var bar = '', n = counts[c], p = Math.round(n/max*100|0);
+
+  // 1-3,5-8, and D-F: 1:16 odds over 30 digits
+  var ideal = N*30/16;
+  if (i == 4) {
+    // 4: 1:1 odds on 1 digit, plus 1:16 odds on 30 digits
+    ideal = N*(1 + 30/16);
+  } else if (i >= 8 && i <= 11) {
+    // 8-B: 1:4 odds on 1 digit, plus 1:16 odds on 30 digits
+    ideal = N*(1/4 + 30/16);
   } else {
-    for (var i = 0, t = Date.now(); i < N; i++) generator();
-    rate('uuid.' + version + '()', t);
+    // Otherwise: 1:16 odds on 30 digits
+    ideal = N*30/16;
   }
+  var d = divergence(n, ideal);
 
-  for (var i = 0, t = Date.now(); i < N; i++) generator('binary');
-  rate('uuid.' + version + '(\'binary\')', t);
+  // Draw bar using UTF squares (just for grins)
+  var s = n/max*50 | 0;
+  while (s--) bar += '=';
 
-  for (var i = 0, t = Date.now(); i < N; i++) generator('binary', buf);
-  rate('uuid.' + version + '(\'binary\', buffer)', t);
+  log(c + ' |' + bar + '| ' + counts[c] + ' (' + d + '%)');
 }

data/server/node_modules/node-uuid/uuid.js

@@ -1,249 +1,80 @@
-//     node-uuid/uuid.js
-//
-//     Copyright (c) 2010 Robert Kieffer
-//     Dual licensed under the MIT and GPL licenses.
-//     Documentation and details at https://github.com/broofa/node-uuid
 (function() {
-  var _global = this;
+  /*
+  * Generate a RFC4122(v4) UUID
+  *
+  * Documentation at https://github.com/broofa/node-uuid
+  */
 
-  // Unique ID creation requires a high quality random # generator, but
-  // Math.random() does not guarantee "cryptographic quality".  So we feature
-  // detect for more robust APIs, normalizing each method to return 128-bits
-  // (16 bytes) of random data.
-  var mathRNG, nodeRNG, whatwgRNG;
-
-  // Math.random()-based RNG.  All platforms, very fast, unknown quality
-  var _rndBytes = new Array(16);
-  mathRNG = function() {
-    var r, b = _rndBytes, i = 0;
-
-    for (var i = 0, r; i < 16; i++) {
-      if ((i & 0x03) == 0) r = Math.random() * 0x100000000;
-      b[i] = r >>> ((i & 0x03) << 3) & 0xff;
-    }
-
-    return b;
-  }
-
-  // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
-  // WebKit only (currently), moderately fast, high quality
-  if (_global.crypto && crypto.getRandomValues) {
-    var _rnds = new Uint32Array(4);
-    whatwgRNG = function() {
-      crypto.getRandomValues(_rnds);
-
-      for (var c = 0 ; c < 16; c++) {
-        _rndBytes[c] = _rnds[c >> 2] >>> ((c & 0x03) * 8) & 0xff;
-      }
-      return _rndBytes;
-    }
-  }
-
-  // Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
-  // Node.js only, moderately fast, high quality
-  try {
-    var _rb = require('crypto').randomBytes;
-    nodeRNG = _rb && function() {
-      return _rb(16);
-    };
-  } catch (e) {}
-
-  // Select RNG with best quality
-  var _rng = nodeRNG || whatwgRNG || mathRNG;
-
-  // Buffer class to use
+  // Use node.js Buffer class if available, otherwise use the Array class
   var BufferClass = typeof(Buffer) == 'function' ? Buffer : Array;
 
-  // Maps for number <-> hex string conversion
-  var _byteToHex = [];
-  var _hexToByte = {};
+  // Buffer used for generating string uuids
+  var _buf = new BufferClass(16);
+
+  // Cache number <-> hex string for octet values
+  var toString = [];
+  var toNumber = {};
   for (var i = 0; i < 256; i++) {
-    _byteToHex[i] = (i + 0x100).toString(16).substr(1);
-    _hexToByte[_byteToHex[i]] = i;
+    toString[i] = (i + 0x100).toString(16).substr(1);
+    toNumber[toString[i]] = i;
   }
 
-  // **`parse()` - Parse a UUID into it's component bytes**
-  function parse(s, buf, offset) {
-    var i = (buf && offset) || 0, ii = 0;
-
-    buf = buf || [];
-    s.toLowerCase().replace(/[0-9a-f]{2}/g, function(byte) {
-      if (ii < 16) { // Don't overflow!
-        buf[i + ii++] = _hexToByte[byte];
-      }
+  function parse(s) {
+    var buf = new BufferClass(16);
+    var i = 0, ton = toNumber;
+    s.toLowerCase().replace(/[0-9a-f][0-9a-f]/g, function(octet) {
+      buf[i++] = toNumber[octet];
     });
-
-    // Zero out remaining bytes if string was short
-    while (ii < 16) {
-      buf[i + ii++] = 0;
-    }
-
     return buf;
   }
 
-  // **`unparse()` - Convert UUID byte array (ala parse()) into a string**
-  function unparse(buf, offset) {
-    var i = offset || 0, bth = _byteToHex;
-    return  bth[buf[i++]] + bth[buf[i++]] +
-            bth[buf[i++]] + bth[buf[i++]] + '-' +
-            bth[buf[i++]] + bth[buf[i++]] + '-' +
-            bth[buf[i++]] + bth[buf[i++]] + '-' +
-            bth[buf[i++]] + bth[buf[i++]] + '-' +
-            bth[buf[i++]] + bth[buf[i++]] +
-            bth[buf[i++]] + bth[buf[i++]] +
-            bth[buf[i++]] + bth[buf[i++]];
+  function unparse(buf) {
+    var tos = toString, b = buf;
+    return tos[b[0]] + tos[b[1]] + tos[b[2]] + tos[b[3]] + '-' +
+           tos[b[4]] + tos[b[5]] + '-' +
+           tos[b[6]] + tos[b[7]] + '-' +
+           tos[b[8]] + tos[b[9]] + '-' +
+           tos[b[10]] + tos[b[11]] + tos[b[12]] +
+           tos[b[13]] + tos[b[14]] + tos[b[15]];
   }
 
-  // **`v1()` - Generate time-based UUID**
-  //
-  // Inspired by https://github.com/LiosK/UUID.js
-  // and http://docs.python.org/library/uuid.html
-
-  // random #'s we need to init node and clockseq
-  var _seedBytes = _rng();
-
-  // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
-  var _nodeId = [
-    _seedBytes[0] | 0x01,
-    _seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
-  ];
-
-  // Per 4.2.2, randomize (14 bit) clockseq
-  var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
-
-  // Previous uuid creation time
-  var _lastMSecs = 0, _lastNSecs = 0;
-
-  // See https://github.com/broofa/node-uuid for API details
-  function v1(options, buf, offset) {
+  var b32 = 0x100000000, ff = 0xff;
+  function uuid(fmt, buf, offset) {
+    var b = fmt != 'binary' ? _buf : (buf ? buf : new BufferClass(16));
     var i = buf && offset || 0;
-    var b = buf || [];
-
-    options = options || {};
-
-    var clockseq = options.clockseq != null ? options.clockseq : _clockseq;
-
-    // UUID timestamps are 100 nano-second units since the Gregorian epoch,
-    // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
-    // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
-    // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
-    var msecs = options.msecs != null ? options.msecs : new Date().getTime();
-
-    // Per 4.2.1.2, use count of uuid's generated during the current clock
-    // cycle to simulate higher resolution clock
-    var nsecs = options.nsecs != null ? options.nsecs : _lastNSecs + 1;
-
-    // Time since last uuid creation (in msecs)
-    var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
 
-    // Per 4.2.1.2, Bump clockseq on clock regression
-    if (dt < 0 && options.clockseq == null) {
-      clockseq = clockseq + 1 & 0x3fff;
-    }
+    var r = Math.random()*b32;
+    b[i++] = r & ff;
+    b[i++] = r>>>8 & ff;
+    b[i++] = r>>>16 & ff;
+    b[i++] = r>>>24 & ff;
+    r = Math.random()*b32;
+    b[i++] = r & ff;
+    b[i++] = r>>>8 & ff;
+    b[i++] = r>>>16 & 0x0f | 0x40; // See RFC4122 sect. 4.1.3
+    b[i++] = r>>>24 & ff;
+    r = Math.random()*b32;
+    b[i++] = r & 0x3f | 0x80; // See RFC4122 sect. 4.4
+    b[i++] = r>>>8 & ff;
+    b[i++] = r>>>16 & ff;
+    b[i++] = r>>>24 & ff;
+    r = Math.random()*b32;
+    b[i++] = r & ff;
+    b[i++] = r>>>8 & ff;
+    b[i++] = r>>>16 & ff;
+    b[i++] = r>>>24 & ff;
+
+    return fmt === undefined ? unparse(b) : b;
+  };
 
-    // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
-    // time interval
-    if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
-      nsecs = 0;
-    }
-
-    // Per 4.2.1.2 Throw error if too many uuids are requested
-    if (nsecs >= 10000) {
-      throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
-    }
-
-    _lastMSecs = msecs;
-    _lastNSecs = nsecs;
-    _clockseq = clockseq;
-
-    // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
-    msecs += 12219292800000;
-
-    // `time_low`
-    var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
-    b[i++] = tl >>> 24 & 0xff;
-    b[i++] = tl >>> 16 & 0xff;
-    b[i++] = tl >>> 8 & 0xff;
-    b[i++] = tl & 0xff;
-
-    // `time_mid`
-    var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
-    b[i++] = tmh >>> 8 & 0xff;
-    b[i++] = tmh & 0xff;
-
-    // `time_high_and_version`
-    b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
-    b[i++] = tmh >>> 16 & 0xff;
-
-    // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
-    b[i++] = clockseq >>> 8 | 0x80;
-
-    // `clock_seq_low`
-    b[i++] = clockseq & 0xff;
-
-    // `node`
-    var node = options.node || _nodeId;
-    for (var n = 0; n < 6; n++) {
-      b[i + n] = node[n];
-    }
-
-    return buf ? buf : unparse(b);
-  }
-
-  // **`v4()` - Generate random UUID**
-
-  // See https://github.com/broofa/node-uuid for API details
-  function v4(options, buf, offset) {
-    // Deprecated - 'format' argument, as supported in v1.2
-    var i = buf && offset || 0;
-
-    if (typeof(options) == 'string') {
-      buf = options == 'binary' ? new BufferClass(16) : null;
-      options = null;
-    }
-    options = options || {};
-
-    var rnds = options.random || (options.rng || _rng)();
-
-    // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-    rnds[6] = (rnds[6] & 0x0f) | 0x40;
-    rnds[8] = (rnds[8] & 0x3f) | 0x80;
-
-    // Copy bytes to buffer, if provided
-    if (buf) {
-      for (var ii = 0; ii < 16; ii++) {
-        buf[i + ii] = rnds[ii];
-      }
-    }
-
-    return buf || unparse(rnds);
-  }
-
-  // Export public API
-  var uuid = v4;
-  uuid.v1 = v1;
-  uuid.v4 = v4;
   uuid.parse = parse;
   uuid.unparse = unparse;
   uuid.BufferClass = BufferClass;
 
-  // Export RNG options
-  uuid.mathRNG = mathRNG;
-  uuid.nodeRNG = nodeRNG;
-  uuid.whatwgRNG = whatwgRNG;
-
   if (typeof(module) != 'undefined') {
-    // Play nice with node.js
     module.exports = uuid;
   } else {
-    // Play nice with browsers
-    var _previousRoot = _global.uuid;
-
-    // **`noConflict()` - (browser only) to reset global 'uuid' var**
-    uuid.noConflict = function() {
-      _global.uuid = _previousRoot;
-      return uuid;
-    }
-    _global.uuid = uuid;
+    // In browser? Set as top-level function
+    this.uuid = uuid;
   }
-}());
+})();