Merge branch 'release/v1.0.2'

Author: cardil

test/index.html dist/browser/index.htmltest/index.html renamed to dist/browser/index.html

@@ -6,12 +6,12 @@
     <link rel="stylesheet" type="text/css" href="https://raw.githubusercontent.com/twbs/bootstrap/master/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/styles/default.min.css">
     <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/highlight.min.js"></script>
-    <script type="application/javascript" src="browser/toplevel/eid.min.js"></script>
+    <script type="application/javascript" src="toplevel/eid.min.js"></script>
     <style type="text/css">
       @import url(https://fonts.googleapis.com/css?family=PT+Sans|Source+Code+Pro);
       body {
         font-family: 'PT Sans', sans-serif;
-        font-size: 1.3em;
+        font-size: 1em;
         padding: 1em;
       }
       pre, code {
@@ -38,6 +38,7 @@ <h1>ExceptionID.js - showcase</h1>
 
     <h3>Code:</h3>
     <pre><code class="javascript" id="code">
+    var EidRuntimeException = Eid.exceptions.EidRuntimeException;
     try {
       // Example entity objects
       var users = [];
@@ -61,9 +62,11 @@ <h3>Code:</h3>
       EidPreconditions.checkState(false, '20160111:224215', 'A extra message');
     } catch(e) {
       // Top level of your application
-      log.error(e.toString() + ' - ' + e.stack);
-      // or better save your exceptions!
-      logGateway.put(e, {eid: e.eid});
+      log.error(e.stack);
+      if (e instanceof EidRuntimeException) {
+        // or better save your exceptions!
+        logGateway.put(e, inspectable({eid: e.eid}));
+      }
     }
     </code></pre>
     <h3>Console:</h3>
@@ -93,9 +96,21 @@ <h3>Console:</h3>
         logentry('ERROR', message);
       }
     };
+    var inspectable = function(obj) {
+      obj.toString = function() {
+        var parts = [];
+        for (var k in obj) {
+          if (obj.hasOwnProperty(k) && k !== 'toString') {
+            parts.push(k.toString() + ': ' + obj[k].toString());
+          }
+        }
+        return '{ ' + parts.join(', ') + ' }';
+      };
+      return obj;
+    };
     var logGateway = {
       put: function(ex, extra) {
-        logentry('INFO', 'LogzGetewayFake.io sucessfully PUT an exception: `' + ex.toString() + '` with extra data of: `' + JSON.stringify(extra) + '`');
+        logentry('INFO', 'FakeLogz.io PUT exception: `' + ex.toString() + '`, payload: `' + extra.toString() + '`');
       }
     };
     var code = document.getElementById('code').textContent;

dist/browser/toplevel/eid.js

@@ -4,4 +4,4 @@
 var serve = require('gulp-serve');
 var config = require('./config');
 
-module.exports = serve([ config.test, config.dist ]);
+module.exports = serve(config.dist + '/browser');

dist/browser/toplevel/eid.min.js

@@ -44,8 +44,7 @@ module.exports = {
     var src = prependToAll('..', config.sources);
     var stream = gulp.src(testSrc, { read: false })
       .pipe(cover.instrument({
-        pattern: src,
-        debugDirectory: 'debug'
+        pattern: src
       }))
       .pipe(mocha())
       .pipe(cover.gather());

dist/browser/toplevel/eid.min.js.map

@@ -109,25 +109,28 @@ function MathRandom() {
   var LONG_MAX = Math.pow(2, 53) - 1;
   var LONG_MIN = -1 * Math.pow(2, 53);
   this.nextLong = function() {
-    return random(LONG_MIN, LONG_MAX);
+    return this.nextNumber(LONG_MIN, LONG_MAX);
   };
   this.nextInt = function(max) {
-    return random(0, max);
+    return this.nextNumber(0, max);
   };
-  var random = function(min, max) {
+  this.nextNumber = function(min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
   };
 }
 
 function StdUniqIdGenerator() {
   var BASE36 = 36;
   var INTEGER_MAX_VALUE = Math.pow(2, 31);
+  var MIN_6_CHAR_HASH = 60466177; // for '100001' in base64
   var generator = new MathRandom();
+  var padding = generator.nextNumber(MIN_6_CHAR_HASH, INTEGER_MAX_VALUE).toString(BASE36);
   this.generateUniqId = function() {
     var first = Math.abs(generator.nextLong() + 1);
     var second = Math.abs(generator.nextInt(INTEGER_MAX_VALUE));
     var calc = first + second;
-    return (Math.abs(calc) % INTEGER_MAX_VALUE).toString(BASE36);
+    var hash = (Math.abs(calc) % INTEGER_MAX_VALUE).toString(BASE36);
+    return String(padding + hash).slice(-6); // pad output string to six chars using random padding
   };
 }