Merge pull request #31 from electricimp/develop

3.0.1

Author: Pavel Petroshenko

.imptest

@@ -6,7 +6,7 @@
     "agentFile": "promise.class.nut",
     "deviceFile": false,
     "stopOnFailure": false,
-    "timeout": 30,
+    "timeout": 60,
     "tests": [
         "*.test.nut",
         "tests/**/*.test.nut"

LICENSE

@@ -0,0 +1,24 @@
+MIT License
+
+Copyright 2016-2017 Electric Imp
+Copyright 2015 SMS Diagnostics Pty Ltd
+
+SPDX-License-Identifier: MIT
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

LICENSE.txt

@@ -10,7 +10,7 @@ For more information on the concept of promises, see the following references fo
 - [JavaScript Promises: There and back again](http://www.html5rocks.com/en/tutorials/es6/promises/)
 - [Promise - Javascript](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
 
-**To add this library to your project, add** `#require "promise.class.nut:3.0.0"` **to the top of your agent and/or device code.**
+**To add this library to your project, add** `#require "promise.class.nut:3.0.1"` **to the top of your agent and/or device code.**
 
 [![Build Status](https://travis-ci.org/electricimp/Promise.svg?branch=master)](https://travis-ci.org/electricimp/Promise)
 
@@ -24,7 +24,7 @@ The constructor should receive a single function, which will be executed to dete
 - `function reject([reason])` — calling *reject()* sets Promise state as rejected and calls *.fail()* handlers
 
 ```squirrel
-#require "promise.class.nut:3.0.0"
+#require "promise.class.nut:3.0.1"
 
 myPromise <- Promise(myActionFunction);
 ```

README.md

@@ -1,4 +1,28 @@
-#require "Promise.class.nut:3.0.0"
+// MIT License
+//
+// Copyright 2017 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#require "Promise.class.nut:3.0.1"
 
 // -----------------------------------------------------------------------------
 // This class exposed a single method fire() which waits a second and then randomly fails or succeeds.

examples/example-a.nut

@@ -1,4 +1,28 @@
-#require "Promise.class.nut:3.0.0"
+// MIT License
+//
+// Copyright 2017 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#require "Promise.class.nut:3.0.1"
 
 /**
  * Example of resolving Promise after 1 second timeout

examples/example-b.nut

@@ -1,4 +1,28 @@
-#require "Promise.class.nut:3.0.0"
+// MIT License
+//
+// Copyright 2017 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#require "Promise.class.nut:3.0.1"
 
 /**
  * Uses a chain of promises to call an API and make some transformations on the
@@ -21,7 +45,7 @@
  * traditional, callback style function in a promise.
  */
 class MorseCode {
-    static URL_TEMPLATE = "http://www.morsecode-api.de/%s/%s";
+    static URL_TEMPLATE = "http://www.morsecode-api.de/%s?string=%s";
 
     _message = null;
 
@@ -91,14 +115,14 @@ class MorseCode {
      */
     static function PromisedSendAsync(request) {
         return Promise(function(resolve, reject) {
-            
+
             request.sendasync(function(response) {
                 if (response.statuscode < 200 || response.statuscode > 299) {
                     return reject(response);
                 }
                 return resolve(response); // Resolve promise on response
             }.bindenv(this));
-            
+
         }.bindenv(this));
     }
 

examples/example-c.nut

@@ -1,20 +1,49 @@
+// MIT License
+//
+// Copyright 2016-2017 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
 /**
  * Promises for Electric Imp/Squirrel
  *
  * @author Mikhail Yurasov <mikhail@electricimp.com>
  * @author Aron Steg <aron@electricimp.com>
  * @author Jaye Heffernan <jaye@mysticpants.com>
- * @version 3.0.0
+ * @version 3.0.1
  */
+
+ // Error messages
+const PROMISE_ERR_UNHANDLED_REJ  = "Unhandled promise rejection: ";
+
 class Promise {
-    static version = [3, 0, 0];
+    static VERSION = "3.0.1";
 
     static STATE_PENDING = 0;
     static STATE_FULFILLED = 1;
     static STATE_REJECTED = 2;
 
     _state = null;
     _value = null;
+    _last = null;
 
     /* @var {{resolve, reject}[]} _handlers */
     _handlers = null;
@@ -24,6 +53,7 @@ class Promise {
     */
     constructor(action) {
         this._state = this.STATE_PENDING;
+        this._last = true;
         this._handlers = [];
 
         try {
@@ -42,6 +72,10 @@ class Promise {
     function _callHandlers() {
         if (this.STATE_PENDING != this._state) {
             imp.wakeup(0, function() {
+                if (this._last && this._handlers.len() == 0
+                               && this.STATE_REJECTED == this._state) {
+                    server.log(PROMISE_ERR_UNHANDLED_REJ + this._value);
+                }
                 foreach (handler in this._handlers) {
                     (/* create closure and bind handler to it */ function (handler) {
                         if (this._state == this.STATE_FULFILLED) {
@@ -127,6 +161,7 @@ class Promise {
         onRejected  = (typeof onRejected  == "function") ? onRejected  : Promise._onRejected;
 
         local self = this;
+        this._last = false;
         local result = Promise(function(resolve, reject) {
             self._handlers.push({
                 "resolve": resolve.bindenv(this),
@@ -209,19 +244,27 @@ class Promise {
     /**
      * Returns Promise that resolves when
      * all promises in chain resolve:
-     * one after each other
+     * one after each other.
+     * Make every promise in array of promises not last
+     * for suppressing Unhadled Exeptions Warnings
      *
      * @param {{Promise|function}[]} promises - array of Promises/functions that return Promises
      * @return {Promise} Promise that is resolved/rejected with the last value that come from looped promise
      */
     static function serial(promises) {
         local i = 0;
+        local onlyPromises = [];
+        for (local t = 0; t < promises.len(); t++) {
+            local pr = "function" == type(promises[t])
+                    ? promises[t]()
+                    : promises[t];
+            pr._last = false;
+            onlyPromises.push(pr);
+        }
         return this.loop(
-            @() i < promises.len(),
+            @() i < onlyPromises.len(),
             function () {
-                return "function" == type(promises[i])
-                    ? promises[i++]()
-                    : promises[i++];
+                return onlyPromises[i++];
             }
         )
     }
@@ -254,7 +297,7 @@ class Promise {
                 result[index] = value;
                 resolved += 1;
                 if (resolved == len) {
-                    resolve(result)
+                    resolve(result);
                 }
             };
 

promise.class.nut

@@ -1,6 +1,26 @@
-// Copyright (c) 2016 Electric Imp
-// This file is licensed under the MIT License
-// http://opensource.org/licenses/MIT
+// MIT License
+//
+// Copyright 2016 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 
 // "Promise" symbol is injected dependency from ImpUnit_Promise module,
 // while class being tested can be accessed from global scope as "::Promise".

tests/All.agent.test.nut

@@ -1,7 +1,26 @@
-// Copyright (c) 2016 Electric Imp
-// This file is licensed under the MIT License
-// http://opensource.org/licenses/MIT
-
+// MIT License
+//
+// Copyright 2016 Electric Imp
+//
+// SPDX-License-Identifier: MIT
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
 // "Promise" symbol is injected dependency from ImpUnit_Promise module,
 // while class being tested can be accessed from global scope as "::Promise".