Merge branch 'development'

* development:
  test(test): Added unit test for the binary timestamp bugfix
  fix(source): Fixed the parse binary timestamp bug: added parse integer step for the seconds portion
  docs(debug): removed names from documentation
  build(debug): Debugger setup and docs

Author: Therapon Skoteiniotis

.gitignore

@@ -56,6 +56,7 @@ flycheck_*.el
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
+.idea/
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 

DEBUGGER.md

@@ -0,0 +1,30 @@
+
+# Debugging Intern Tests 
+
+This is a rough guide on how to use Chrome to debug intern tests. If you know of a better way, please update. 
+
+## Configure Chrome 
+
+1. [Enable maps in Chrome](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps#enable_source_maps_in_settings)
+
+## Debugging an Intern Test 
+
+1. add `debugger;` to set a breakpoint in your source code 
+1. build your source code using `grunt build:amd:debug`
+    * `build:amd:debug` generates map files for `.ts` source code that other build targets do not. 
+1. run the test suite using `node --inspect-brk  node_modules/intern/client.js config=tests/intern-debug`
+    * note that we are using a *different* intern config file that disables code coverage
+1. Open Chrome and paste `chrome://inspect/#devices` in the address bar. 
+1. Under the section titled `Remote Target`  you should see 
+   ```
+   node_modules/intern/client.js file:///Users/joe/ion-js/node_modules/intern/client.js
+   inspect
+   ```
+   with the last word `inspect` being a link. Click on it and the debugger pops-up in a new window
+
+
+## Caveats 
+
+1. The `inspect` link gets refreshed every time you run `node` with `--inspect-brk` 
+1. Source files are not always refreshed by chrome. You might have to [clear your Chrome browsers cache](https://support.google.com/accounts/answer/32050?hl=en)
+

Gruntfile.js

@@ -28,7 +28,7 @@ module.exports = function(grunt) {
       },
     },
     clean: ['dist/',
-            // 'docs/',  removing for now till we move to ghpages
+            'docs/',
             'coverage-final.json',
             'browser/scripts/ion/'
            ],
@@ -65,13 +65,24 @@ module.exports = function(grunt) {
       }
     },
     ts: {
+      'amd-es6-debug': {
+        src: ['src/**/*.ts'],
+        outDir: 'dist/amd/es6',
+        options: {
+          target: "es6",
+          module: "amd",
+          declaration: true,
+          sourceMap: true  // generate .map files for debugging
+        }
+      },
+ 
       'amd-es6': {
         src: ['src/**/*.ts'],
         outDir: 'dist/amd/es6',
         options: {
           target: "es6",
           module: "amd",
-          declaration: true
+          declaration: true,
         }
       },
       'commonjs-es6': {
@@ -192,6 +203,7 @@ module.exports = function(grunt) {
   grunt.registerTask('trans:browser', ['browserify:prod', 'uglify']); // browserify (assumes 'build' was run)
   grunt.registerTask('build:cjs', ['ts:commonjs-es6']);
   grunt.registerTask('build:amd', ['ts:amd-es6']);
+  grunt.registerTask('build:amd:debug', ['ts:amd-es6-debug']); 
   grunt.registerTask('build', ['clean', 'build:amd', 'build:cjs','trans:browser', 'copy:all']);
 
 

src/IonParserBinaryRaw.ts

@@ -489,8 +489,11 @@ function read_timestamp_value(span: Span, len: number) : Timestamp {
       minutes = read_var_unsigned_int(span);
       if (span.position() >= end) break;
 
-      seconds = read_decimal_value(span, end - span.position());
+      seconds = read_var_unsigned_int(span);
       precision = Precision.SECONDS;
+      if (span.position() >= end) break;
+
+      seconds += read_decimal_value(span, end - span.position());
       break;
     }
   }   

tests/intern-debug.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+define({
+  defaultTimeout: 2000, // ms
+  excludeInstrumentation: true, // disable codecoverate instrucmentation to allow debugging 
+  filterErrorStack: true,
+  suites: [
+    'tests/unit/textNulls',
+    'tests/unit/spans',
+    'tests/unit/iontests',
+    'tests/unit/IonCatalogTest',
+    'tests/unit/IonImportTest',
+    'tests/unit/IonLocalSymbolTableTest',
+    'tests/unit/IonDecimalTest',
+    'tests/unit/IonWriteableTest',
+    'tests/unit/IonTimestampTest',
+    'tests/unit/IonTextTest',
+    'tests/unit/IonTextWriterTest',
+    'tests/unit/IonUnicodeTest',
+    'tests/unit/IonLowLevelBinaryWriterTest',
+    'tests/unit/IonBinaryWriterTest',
+    'tests/unit/IonBinaryTimestampTest',
+  ],
+});

tests/intern.js

@@ -30,5 +30,6 @@ define({
     'tests/unit/IonUnicodeTest',
     'tests/unit/IonLowLevelBinaryWriterTest',
     'tests/unit/IonBinaryWriterTest',
+    'tests/unit/IonBinaryTimestampTest',
   ],
 });

tests/unit/IonBinaryTimestampTest.js

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+define([
+    'intern',
+    'intern!object',
+    'intern/chai!assert',
+    'dist/amd/es6/IonTests',
+  ],
+  function(intern, registerSuite, assert, ion) {
+
+    var suite = {
+      name: 'BinaryTimestamp'
+    };
+
+    suite['Binary Timestamp Round Trip'] = function() {
+      // First part - writing timestamp into binary datagram
+      var Ion = ion;
+      var writer = Ion.makeBinaryWriter();
+      var timestamp = new Ion.Timestamp(5, 0, 2017, 06, 07, 18, 29, '17.901');
+      writer.writeStruct();
+      writer.writeFieldName('test_timestamp');
+      writer.writeTimestamp(timestamp);
+      writer.endContainer();
+      writer.close();
+      var binaryData = writer.getBytes();
+
+      /* Datagram content
+       * {
+       *     test_timestamp:2017-06-07T18:29:17.901Z
+       * }
+       */
+
+      // Second part - reading timestamp from binary datagram created above
+      var reader = Ion.makeReader(binaryData);
+      reader.next();
+      reader.stepIn();
+      reader.next();
+      var timestampValue = reader.timestampValue();
+
+      assert.equal(timestamp.toString(), timestampValue.toString());
+    }
+
+    registerSuite(suite);
+  }
+);

tests/unit/IonBinaryWriterTest.js

@@ -516,7 +516,6 @@ define([
         writer.writeFieldName('t');
         writer.writeTimestamp(new ion.Timestamp(ion.Precision.DAY, 0, 2000, 1, 1));
         writer.endContainer();
-        debugger;
       },
       [
         // Symbol table

tests/unit/iontests.js

@@ -110,7 +110,6 @@ define([
               var reader = ion.makeReader(buffer);
               console.log("Exhausting " + path);
               if (path.endsWith('clobsWithWhitespace.ion')) {
-                //debugger;
               }
               exhaust(reader);
               resolve();