Address mmocny comments.

Node now supports arrow functions \o/ No need for iojs now.

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "iojs"
+  - "node"
 before_install:
   - cd libraries/javascript/eddystone-advertising

libraries/javascript/eddystone-advertising/README.md

@@ -6,6 +6,7 @@ worry about these low level details. The library exposes simple functions that
 developers can use to advertise a Valid Eddystone packet from their device.
 
 ** NOTE ** Currently only ChromeOS is supported.
+** NOTE ** Currently only Eddystone-URL is supported.
 
 ## Usage
 The Eddystone Advertising Library creates `window.eddystone` of type
@@ -14,22 +15,25 @@ The Eddystone Advertising Library creates `window.eddystone` of type
 To advertise a url:
 **Example**
 ```js
+let registered_adv;
 eddystone.registerAdvertisement({
   type: 'url',
   url: 'https://example.com',
-  txPower: -20
-}).then(advertisement => console.log('Advertising: ' + advertisement.url))
-  .catch(error => console.log(error.message));
+  advertisedTxPower: -20
+}).then(advertisement => {
+  registered_adv = advertisement;
+  console.log('Advertising: ' + advertisement.url)
+}).catch(error => console.log(error.message));
 ```
 
 To stop advertising:
 **Example**
 ```js
-advertisement.unregisterAdvertisement().then(() => {
-  console.log('Advertisment unregistered successfully.');
+registered_adv.unregisterAdvertisement().then(() => {
+  console.log('Advertisement unregistered successfully.');
 }).catch(error => console.log(error.message));
 ```
-Or if you have multiple advertisments:
+Or if you have multiple advertisements:
 ```js
 eddystone.advertisements.forEach(advertisement => {
   advertisement.unregisterAdvertisement()
@@ -74,15 +78,15 @@ Represents the Advertisement being broadcasted.
   * [.id](#EddystoneAdvertisement+id) : <code>number</code>
   * [.type](#EddystoneAdvertisement+type) : <code>string</code>
   * [.url](#EddystoneAdvertisement+url) : <code>string</code> &#124; <code>undefined</code>
-  * [.txPower](#EddystoneAdvertisement+txPower) : <code>number</code> &#124; <code>undefined</code>
+  * [.advertisedTxPower](#EddystoneAdvertisement+advertisedTxPower) : <code>number</code> &#124; <code>undefined</code>
   * [.unregisterAdvertisement()](#EddystoneAdvertisement+unregisterAdvertisement) ⇒ <code>Promise.&lt;void&gt;</code>
 
 <a name="new_EddystoneAdvertisement_new"></a>
 ### new EddystoneAdvertisement(id, options, platform)
 
 | Param | Type | Description |
 | --- | --- | --- |
-| id | <code>number</code> | Unique between browser restarts |
+| id | <code>number</code> | Unique between browser restarts meaning the id will        no longer be valid upon browser restart. |
 | options | <code>[EddystoneAdvertisementOptions](#EddystoneAdvertisementOptions)</code> | The options used when        creating the advertisement. |
 | platform | <code>Object</code> | The underlying platform; used to unregister the        advertisement. |
 
@@ -102,8 +106,8 @@ URL being advertised.
          Only present if `type === 'url'`.
 
 **Kind**: instance property of <code>[EddystoneAdvertisement](#EddystoneAdvertisement)</code>  
-<a name="EddystoneAdvertisement+txPower"></a>
-### eddystoneAdvertisement.txPower : <code>number</code> &#124; <code>undefined</code>
+<a name="EddystoneAdvertisement+advertisedTxPower"></a>
+### eddystoneAdvertisement.advertisedTxPower : <code>number</code> &#124; <code>undefined</code>
 Tx Power included in
          the advertisement. Only present if `type === 'url'`.
 
@@ -154,11 +158,11 @@ This class provides helper functions that relate to Eddystone-URL.
 **See**: [Eddystone-URL](https://github.com/google/eddystone/tree/master/eddystone-url)  
 
 * [EddystoneURL](#EddystoneURL)
-  * [.constructServiceData(url, txPower)](#EddystoneURL.constructServiceData) ⇒ <code>Array.&lt;number&gt;</code>
+  * [.constructServiceData(url, advertisedTxPower)](#EddystoneURL.constructServiceData) ⇒ <code>Array.&lt;number&gt;</code>
   * [.encodeURL(url)](#EddystoneURL.encodeURL) ⇒ <code>Array.&lt;number&gt;</code>
 
 <a name="EddystoneURL.constructServiceData"></a>
-### EddystoneURL.constructServiceData(url, txPower) ⇒ <code>Array.&lt;number&gt;</code>
+### EddystoneURL.constructServiceData(url, advertisedTxPower) ⇒ <code>Array.&lt;number&gt;</code>
 Constructs a valid Eddystone-URL service data from a URL and a Tx Power
        value.
 
@@ -180,7 +184,7 @@ Constructs a valid Eddystone-URL service data from a URL and a Tx Power
 | Param | Type | Description |
 | --- | --- | --- |
 | url | <code>string</code> | The URL to use in the service data. |
-| txPower | <code>number</code> | The Tx Power to use in the service data. |
+| advertisedTxPower | <code>number</code> | The Tx Power to use in the service data. |
 
 <a name="EddystoneURL.encodeURL"></a>
 ### EddystoneURL.encodeURL(url) ⇒ <code>Array.&lt;number&gt;</code>
@@ -236,5 +240,5 @@ Object that contains the characteristics of the package to advertise.
 | --- | --- | --- |
 | type | <code>[EddystoneFrameType](#EddystoneFrameType)</code> | Type of Eddystone. For now only `'url'` is      supported. |
 | url | <code>string</code> &#124; <code>undefined</code> | The URL to advertise |
-| txPower | <code>number</code> &#124; <code>undefined</code> | The Tx Power to advertise |
+| advertisedTxPower | <code>number</code> &#124; <code>undefined</code> | The Tx Power to advertise |
 

libraries/javascript/eddystone-advertising/eddystone-advertising.js

@@ -32,7 +32,8 @@
   class EddystoneAdvertisement {
     /**
        @constructs EddystoneAdvertisement
-       @param {number} id Unique between browser restarts
+       @param {number} id Unique between browser restarts meaning the id will
+       no longer be valid upon browser restart.
        @param {EddystoneAdvertisementOptions} options The options used when
        creating the advertisement.
        @param {Object} platform The underlying platform; used to unregister the
@@ -59,15 +60,15 @@
        */
       this.url = undefined;
       /**
-         @member EddystoneAdvertisement#txPower {number|undefined} Tx Power included in
+         @member EddystoneAdvertisement#advertisedTxPower {number|undefined} Tx Power included in
          the advertisement. Only present if `type === 'url'`.
        */
-      this.txPower = undefined;
+      this.advertisedTxPower = undefined;
       if (options.type == EddystoneFrameType.URL) {
         this.id = id;
         this.type = options.type;
         this.url = options.url;
-        this.txPower = options.txPower;
+        this.advertisedTxPower = options.advertisedTxPower;
       } else {
         throw new Error('Unsupported Frame Type');
       }
@@ -102,7 +103,7 @@
      @property {EddystoneFrameType} type Type of Eddystone. For now only `'url'` is
      supported.
      @property {string|undefined} url The URL to advertise
-     @property {number|undefined} txPower The Tx Power to advertise
+     @property {number|undefined} advertisedTxPower The Tx Power to advertise
    */
 
   /**
@@ -177,8 +178,8 @@
       if (!('url' in options)) {
         throw new TypeError('Required member url is undefined.');
       }
-      if (!('txPower' in options)) {
-        throw new TypeError('Required member txPower is undefined.');
+      if (!('advertisedTxPower' in options)) {
+        throw new TypeError('Required member advertisedTxPower is undefined.');
       }
     }
   }
@@ -273,7 +274,7 @@
           serviceUuids: [EDDYSTONE_UUID],
           serviceData: [{
             uuid: EDDYSTONE_UUID,
-            data: EddystoneURL.constructServiceData(options.url, options.txPower)
+            data: EddystoneURL.constructServiceData(options.url, options.advertisedTxPower)
           }]
         };
       } else {
@@ -361,7 +362,7 @@
        value.
        @see {@link https://github.com/google/eddystone/tree/master/eddystone-url#frame-specification|URL Frame Specification}
        @param {string} url The URL to use in the service data.
-       @param {number} txPower The Tx Power to use in the service data.
+       @param {number} advertisedTxPower The Tx Power to use in the service data.
        @returns {number[]} The service data.
        @throws {Error} If the Tx Power value is not in the allowed range. See
        {@link https://github.com/google/eddystone/tree/master/eddystone-url#tx-power-level|Tx Power Level}.
@@ -372,12 +373,12 @@
        invalid characters see the Note in
        {@link https://github.com/google/eddystone/tree/master/eddystone-url#eddystone-url-http-url-encoding|HTTP URL Encoding}
      */
-    static constructServiceData(url, txPower) {
+    static constructServiceData(url, advertisedTxPower) {
       // Check that it's a valid Tx Power
-      if (txPower < -100 || txPower > 20) {
-        throw new Error('Invalid Tx Power value: ' + txPower);
+      if (advertisedTxPower < -100 || advertisedTxPower > 20) {
+        throw new Error('Invalid Tx Power value: ' + advertisedTxPower);
       }
-      let base_frame = [EDDYSTONE_URL_FRAME_TYPE, txPower];
+      let base_frame = [EDDYSTONE_URL_FRAME_TYPE, advertisedTxPower];
       Array.prototype.push.apply(base_frame, EddystoneURL.encodeURL(url));
       return base_frame;
     }

libraries/javascript/eddystone-advertising/jsdoc2md/README.hbs

@@ -6,6 +6,7 @@ worry about these low level details. The library exposes simple functions that
 developers can use to advertise a Valid Eddystone packet from their device.
 
 ** NOTE ** Currently only ChromeOS is supported.
+** NOTE ** Currently only Eddystone-URL is supported.
 
 ## Usage
 The Eddystone Advertising Library creates `window.eddystone` of type
@@ -14,22 +15,25 @@ The Eddystone Advertising Library creates `window.eddystone` of type
 To advertise a url:
 **Example**
 ```js
+let registered_adv;
 eddystone.registerAdvertisement({
   type: 'url',
   url: 'https://example.com',
-  txPower: -20
-}).then(advertisement => console.log('Advertising: ' + advertisement.url))
-  .catch(error => console.log(error.message));
+  advertisedTxPower: -20
+}).then(advertisement => {
+  registered_adv = advertisement;
+  console.log('Advertising: ' + advertisement.url)
+}).catch(error => console.log(error.message));
 ```
 
 To stop advertising:
 **Example**
 ```js
-advertisement.unregisterAdvertisement().then(() => {
-  console.log('Advertisment unregistered successfully.');
+registered_adv.unregisterAdvertisement().then(() => {
+  console.log('Advertisement unregistered successfully.');
 }).catch(error => console.log(error.message));
 ```
-Or if you have multiple advertisments:
+Or if you have multiple advertisements:
 ```js
 eddystone.advertisements.forEach(advertisement => {
   advertisement.unregisterAdvertisement()

libraries/javascript/eddystone-advertising/lib/eddystone-advertisement.js

@@ -31,7 +31,8 @@
   class EddystoneAdvertisement {
     /**
        @constructs EddystoneAdvertisement
-       @param {number} id Unique between browser restarts
+       @param {number} id Unique between browser restarts meaning the id will
+       no longer be valid upon browser restart.
        @param {EddystoneAdvertisementOptions} options The options used when
        creating the advertisement.
        @param {Object} platform The underlying platform; used to unregister the
@@ -58,15 +59,15 @@
        */
       this.url = undefined;
       /**
-         @member EddystoneAdvertisement#txPower {number|undefined} Tx Power included in
+         @member EddystoneAdvertisement#advertisedTxPower {number|undefined} Tx Power included in
          the advertisement. Only present if `type === 'url'`.
        */
-      this.txPower = undefined;
+      this.advertisedTxPower = undefined;
       if (options.type == EddystoneFrameType.URL) {
         this.id = id;
         this.type = options.type;
         this.url = options.url;
-        this.txPower = options.txPower;
+        this.advertisedTxPower = options.advertisedTxPower;
       } else {
         throw new Error('Unsupported Frame Type');
       }

libraries/javascript/eddystone-advertising/lib/eddystone-advertising.js

@@ -9,7 +9,7 @@
      @property {EddystoneFrameType} type Type of Eddystone. For now only `'url'` is
      supported.
      @property {string|undefined} url The URL to advertise
-     @property {number|undefined} txPower The Tx Power to advertise
+     @property {number|undefined} advertisedTxPower The Tx Power to advertise
    */
 
   /**
@@ -84,8 +84,8 @@
       if (!('url' in options)) {
         throw new TypeError('Required member url is undefined.');
       }
-      if (!('txPower' in options)) {
-        throw new TypeError('Required member txPower is undefined.');
+      if (!('advertisedTxPower' in options)) {
+        throw new TypeError('Required member advertisedTxPower is undefined.');
       }
     }
   }

libraries/javascript/eddystone-advertising/lib/eddystone-chrome-os.js

@@ -85,7 +85,7 @@
           serviceUuids: [EDDYSTONE_UUID],
           serviceData: [{
             uuid: EDDYSTONE_UUID,
-            data: EddystoneURL.constructServiceData(options.url, options.txPower)
+            data: EddystoneURL.constructServiceData(options.url, options.advertisedTxPower)
           }]
         };
       } else {

libraries/javascript/eddystone-advertising/lib/eddystone-url.js

@@ -73,7 +73,7 @@
        value.
        @see {@link https://github.com/google/eddystone/tree/master/eddystone-url#frame-specification|URL Frame Specification}
        @param {string} url The URL to use in the service data.
-       @param {number} txPower The Tx Power to use in the service data.
+       @param {number} advertisedTxPower The Tx Power to use in the service data.
        @returns {number[]} The service data.
        @throws {Error} If the Tx Power value is not in the allowed range. See
        {@link https://github.com/google/eddystone/tree/master/eddystone-url#tx-power-level|Tx Power Level}.
@@ -84,12 +84,12 @@
        invalid characters see the Note in
        {@link https://github.com/google/eddystone/tree/master/eddystone-url#eddystone-url-http-url-encoding|HTTP URL Encoding}
      */
-    static constructServiceData(url, txPower) {
+    static constructServiceData(url, advertisedTxPower) {
       // Check that it's a valid Tx Power
-      if (txPower < -100 || txPower > 20) {
-        throw new Error('Invalid Tx Power value: ' + txPower);
+      if (advertisedTxPower < -100 || advertisedTxPower > 20) {
+        throw new Error('Invalid Tx Power value: ' + advertisedTxPower);
       }
-      let base_frame = [EDDYSTONE_URL_FRAME_TYPE, txPower];
+      let base_frame = [EDDYSTONE_URL_FRAME_TYPE, advertisedTxPower];
       Array.prototype.push.apply(base_frame, EddystoneURL.encodeURL(url));
       return base_frame;
     }

libraries/javascript/eddystone-advertising/package.json

@@ -7,9 +7,9 @@
     "test": "test"
   },
   "scripts": {
-    "test": "iojs --harmony_arrow_functions `which gulp` test",
-    "generate-docs": "iojs --harmony_arrow_functions `which gulp` docs",
-    "browserify": "iojs --harmony_arrow_functions `which gulp` browserify"
+    "test": "gulp test",
+    "generate-docs": "gulp docs",
+    "browserify": "gulp browserify"
   },
   "repository": {
     "type": "git",

libraries/javascript/eddystone-advertising/test/unit/eddystone-advertisement-unit.js

@@ -31,13 +31,13 @@ describe('EddystoneAdvertisement', () => {
         id, {
           type: type,
           url: url,
-          txPower: tx_power
+          advertisedTxPower: tx_power
         },
         {});
       expect(adv.id).to.eql(id);
       expect(adv.type).to.eql(type);
       expect(adv.url).to.eql(url);
-      expect(adv.txPower).to.eql(tx_power);
+      expect(adv.advertisedTxPower).to.eql(tx_power);
       expect(adv._platform).to.eql({});
     });
   });
@@ -47,7 +47,7 @@ describe('EddystoneAdvertisement', () => {
       let advertisement = new EddystoneAdvertisement(100 /* id */, {
         type: 'url',
         url: 'https://www.example.com/',
-        txPower: -10
+        advertisedTxPower: -10
       }, {});
       let error = new Error('Failed');
       advertisement._platform.unregisterAdvertisement = sinon.stub().returns(Promise.reject(error));
@@ -58,7 +58,7 @@ describe('EddystoneAdvertisement', () => {
       let advertisement = new EddystoneAdvertisement(100 /* id */, {
         type: 'url',
         url: 'https://www.example.com/',
-        txPower: -10
+        advertisedTxPower: -10
       }, {});
       advertisement._platform.unregisterAdvertisement = sinon.stub().returns(
         Promise.resolve());