backbone-promises - npm Package Compare versions

Comparing version 0.1.8 to 0.2.0

index.js

@@ -74,8 +74,9 @@ var _ = require('underscore');
     opt.error = function(model, err, resp) {
-      deferred.reject(err);
       if(error) {
         error.call(this, model, err, resp);
       }
+      deferred.reject(err);
       debug("rejecting");
     };
+ 
     opt.promise = deferred.promise;
@@ -82,0 +83,0 @@ opt.deferred = deferred;

package.json

 {
   "name": "backbone-promises",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "Adds Promises/A+ support to backbone model and collection",
@@ -27,4 +27,4 @@ "main": "index.js",
     "debug": "~0.7.2",
-    "when": "~2.4.0"
+    "when": "~2.8.0"
   }
 }

test/test.callback.js

@@ -46,6 +46,6 @@ var assert = require('assert');
 
-          },error:assert})
-        }, error: assert
+          },error: t})
+        }, error: t
       })
-    },error: assert});
+    },error: t});
   });
@@ -56,11 +56,7 @@ it('Should allow classic style with Promises/A+', function(t) {
       var ma = new MyModel({id:1});
-      ma.fetch().then(function() {
-        t();
-      }, function() {
-        assert(false);
-      });
-    }, function() {
-      assert(false);
-    });
+      return ma.fetch();
+    }).done(function() {
+      t();
+    }, t);
   });
 });

test/test.collection.js

@@ -40,3 +40,3 @@
     var m3 = a.create({id:3,data:""});
-    Backbone.Promises.when.join(m1,m2,m3).then(function(values) {
+    Backbone.Promises.when.join(m1,m2,m3).done(function(values) {
       assert(values[0].get('data') == "xyz");
@@ -46,3 +46,3 @@ assert(values[1].get('data') == "zyx");
       t();
-    },assert).otherwise(assert);
+    },t);
   });
@@ -52,5 +52,5 @@
     var a = new MyCollection();
-    a.fetch().then(function() {
+    a.fetch().done(function() {
       t();
-    }, assert);
+    }, t);
   });
@@ -70,3 +70,3 @@
       .create({foo: 1})
-      .then(function() {
+      .done(function() {
         assert(false, 'should not allow creating model when validation fails');
@@ -73,0 +73,0 @@ }, function(err) {

test/test.model.js

@@ -7,3 +7,4 @@ var assert = require('assert');
 var debug = require('debug')('deferred');
-
+var when = require('when');
+var monitor = require('when/monitor/console');
 var db = new Db("test.model");
@@ -49,7 +50,7 @@
   it('Should maintain classic behaviour', function(t) {
-    var m = new MyModel({id:3,"test":"a"});
+    m = new MyModel({id:3,"test":"a"});
     m.save({variable:"123"},{success: function() {
-      var m2 = new MyModel({id:3});
+      m2 = new MyModel({id:3});
       m2.fetch({success: function() {
-        assert.equal(m2.get("variable"),"123");
+        assert.equal(m2. get("variable"),"123");
         assert.equal(m2.get("test"),"a")
@@ -72,8 +73,6 @@ var maa = new MyModel({id:123123});
     var m = new MyModel();
-    m.save({id:123}).then(function() {
+    m.save({id:123}).done(function() {
       assert.equal(m.get("id"), 123);
       t();
-    }, function() {
-      assert.ok(false)
-    });
+    }, t);
   });
@@ -85,4 +84,4 @@
       assert.equal(m.get("id"), 123);
-      m.destroy().then(function() {
-        m.fetch().then(function() {
+      return m.destroy().then(function() {
+        return m.fetch().then(function() {
             assert.ok(false);
@@ -92,10 +91,8 @@ },
             assert(err instanceof(Error), 'It should return an error when not found');
-            t();
-          }).otherwise(t);
-      }).otherwise(function() {
-        assert.ok(false);
-      }).otherwise(t);
-    }, function() {
-      assert.ok(false);
-    }).otherwise(t);
+            return when.resolve()
+          });
+      })
+    }).done(function() {
+      t();
+    }, t);
   });
@@ -108,3 +105,3 @@
     };
-    m.save({id:123, variable:"test"}).then(function() {
+    m.save({id:123, variable:"test"}).done(function() {
       assert.fail();
@@ -114,4 +111,19 @@ }, function(err) {
       done();
-    }).otherwise(done);
+    }));
   });
+
+  it('Should yield to promise in options if it exists', function(done) {
+    var m = new MyModel();
+    var m2 = new MyModel();
+    var m3 = new MyModel();
+    when.all(m.save(),m2.save(),m3.save()).then(function() {
+      return m.fetch().then(function() {
+        return m2.fetch().then(function() {
+          return m3.fetch();
+        });
+      })
+    }).done(function() {
+      done();
+    },done);
+  });
 });

No alert changes

Improved metrics

Total package byte prevSize

12250

increased by11.94%

Number of package files

12

increased by9.09%

Lines of code

361

increased by2.27%

Dependency changes

• + Addedwhen@2.8.0(transitive)

• - Removedwhen@2.4.0(transitive)

• Updatedwhen@~2.8.0