Publish build version of rsvp.

dist/commonjs/rsvp/hash.js

 "use strict";
-var defer = require("./defer").defer;
+var Promise = require("./promise").Promise;
 
 function size(object) {
   var s = 0;
@@ -12,38 +12,61 @@ function size(object) {
 }
 
 function hash(promises) {
-  var results = {}, deferred = defer(), remaining = size(promises);
+
+  function canceller() {
+    var promise,
+      key;
+    for (key in promises) {
+      if (promises.hasOwnProperty(key)) {
+        promise = promises[key];
+
+        if (promise && typeof promise.then === 'function' &&
+            typeof promise.cancel === 'function') {
+          promise.cancel();
+        }
+      }
+    }
+  }
+
+  return new Promise(function(resolve, reject) {
+    var results = {}, remaining = size(promises),
+      promise;
 
     if (remaining === 0) {
-    deferred.resolve({});
+      resolve(results);
     }
 
-  var resolver = function(prop) {
+    function resolver(key) {
       return function(value) {
-      resolveAll(prop, value);
-    };
+        resolveAll(key, value);
       };
+    }
 
-  var resolveAll = function(prop, value) {
-    results[prop] = value;
+    function resolveAll(key, value) {
+      results[key] = value;
       if (--remaining === 0) {
-      deferred.resolve(results);
+        resolve(results);
+      }
     }
-  };
 
-  var rejectAll = function(error) {
-    deferred.reject(error);
-  };
+    function cancelAll(rejectionValue) {
+      reject(rejectionValue);
+      canceller();
+    }
 
     for (var prop in promises) {
-    if (promises[prop] && typeof promises[prop].then === 'function') {
-      promises[prop].then(resolver(prop), rejectAll);
+      promise = promises[prop];
+
+      if (promise && typeof promise.then === 'function') {
+        promise.then(resolver(prop), cancelAll);
       } else {
-      resolveAll(prop, promises[prop]);
+        resolveAll(prop, promise);
       }
     }
 
-  return deferred.promise;
+  }, canceller
+  );
+
 }
 
 

dist/rsvp-2.0.4.amd.js

@@ -342,10 +342,10 @@ define("rsvp/events",
     __exports__.EventTarget = EventTarget;
   });
 define("rsvp/hash",
-  ["rsvp/defer","exports"],
+  ["rsvp/promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var defer = __dependency1__.defer;
+    var Promise = __dependency1__.Promise;
 
     function size(object) {
       var s = 0;
@@ -358,38 +358,61 @@ define("rsvp/hash",
     }
 
     function hash(promises) {
-      var results = {}, deferred = defer(), remaining = size(promises);
+
+      function canceller() {
+        var promise,
+          key;
+        for (key in promises) {
+          if (promises.hasOwnProperty(key)) {
+            promise = promises[key];
+
+            if (promise && typeof promise.then === 'function' &&
+                typeof promise.cancel === 'function') {
+              promise.cancel();
+            }
+          }
+        }
+      }
+
+      return new Promise(function(resolve, reject) {
+        var results = {}, remaining = size(promises),
+          promise;
 
         if (remaining === 0) {
-        deferred.resolve({});
+          resolve(results);
         }
 
-      var resolver = function(prop) {
+        function resolver(key) {
           return function(value) {
-          resolveAll(prop, value);
-        };
+            resolveAll(key, value);
           };
+        }
 
-      var resolveAll = function(prop, value) {
-        results[prop] = value;
+        function resolveAll(key, value) {
+          results[key] = value;
           if (--remaining === 0) {
-          deferred.resolve(results);
+            resolve(results);
+          }
         }
-      };
 
-      var rejectAll = function(error) {
-        deferred.reject(error);
-      };
+        function cancelAll(rejectionValue) {
+          reject(rejectionValue);
+          canceller();
+        }
 
         for (var prop in promises) {
-        if (promises[prop] && typeof promises[prop].then === 'function') {
-          promises[prop].then(resolver(prop), rejectAll);
+          promise = promises[prop];
+
+          if (promise && typeof promise.then === 'function') {
+            promise.then(resolver(prop), cancelAll);
           } else {
-          resolveAll(prop, promises[prop]);
+            resolveAll(prop, promise);
           }
         }
 
-      return deferred.promise;
+      }, canceller
+      );
+
     }
 
 

dist/rsvp-2.0.4.js

@@ -379,10 +379,10 @@ define("rsvp/events",
     __exports__.EventTarget = EventTarget;
   });
 define("rsvp/hash",
-  ["rsvp/defer","exports"],
+  ["rsvp/promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var defer = __dependency1__.defer;
+    var Promise = __dependency1__.Promise;
 
     function size(object) {
       var s = 0;
@@ -395,38 +395,61 @@ define("rsvp/hash",
     }
 
     function hash(promises) {
-      var results = {}, deferred = defer(), remaining = size(promises);
+
+      function canceller() {
+        var promise,
+          key;
+        for (key in promises) {
+          if (promises.hasOwnProperty(key)) {
+            promise = promises[key];
+
+            if (promise && typeof promise.then === 'function' &&
+                typeof promise.cancel === 'function') {
+              promise.cancel();
+            }
+          }
+        }
+      }
+
+      return new Promise(function(resolve, reject) {
+        var results = {}, remaining = size(promises),
+          promise;
 
         if (remaining === 0) {
-        deferred.resolve({});
+          resolve(results);
         }
 
-      var resolver = function(prop) {
+        function resolver(key) {
           return function(value) {
-          resolveAll(prop, value);
-        };
+            resolveAll(key, value);
           };
+        }
 
-      var resolveAll = function(prop, value) {
-        results[prop] = value;
+        function resolveAll(key, value) {
+          results[key] = value;
           if (--remaining === 0) {
-          deferred.resolve(results);
+            resolve(results);
+          }
         }
-      };
 
-      var rejectAll = function(error) {
-        deferred.reject(error);
-      };
+        function cancelAll(rejectionValue) {
+          reject(rejectionValue);
+          canceller();
+        }
 
         for (var prop in promises) {
-        if (promises[prop] && typeof promises[prop].then === 'function') {
-          promises[prop].then(resolver(prop), rejectAll);
+          promise = promises[prop];
+
+          if (promise && typeof promise.then === 'function') {
+            promise.then(resolver(prop), cancelAll);
           } else {
-          resolveAll(prop, promises[prop]);
+            resolveAll(prop, promise);
           }
         }
 
-      return deferred.promise;
+      }, canceller
+      );
+
     }