fixed method passing example

examples/MethodPassing/app.js → examples/method-passing/app.js

-var Sequelize = require(__dirname + "/../../lib/sequelize/Sequelize").Sequelize,
-    sequelize = new Sequelize("sequelize_test", "test", "test", {disableLogging: true})
+/*
+  Title: Defining class and instance methods
+  
+  This example shows the usage of the classMethods and instanceMethods option for Models.
+*/
+
+var Sequelize = require(__dirname + "/../../index")
+  , config    = require(__dirname + "/../../test/config")
+  , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false})
 
 
 // model definition    
 // model definition    
 var Task = sequelize.define("Task", {
 var Task = sequelize.define("Task", {
@@ -9,56 +16,48 @@ var Task = sequelize.define("Task", {
 }, {
 }, {
   classMethods: {
   classMethods: {
     setImportance: function(newImportance, callback) {
     setImportance: function(newImportance, callback) {
-      Task.findAll(function(allTasks) {
-        var queries = []
+      Task.findAll().on('success', function(allTasks) {
+        var chainer = new Sequelize.Utils.QueryChainer
         allTasks.forEach(function(task) {
         allTasks.forEach(function(task) {
-          queries.push({updateAttributes: task, params: [{ importance: newImportance }]})
+          chainer.add(task.updateAttributes({ importance: newImportance }))
+        })
+        chainer.run().on('success', function() {
+          callback && callback()
         })
         })
-        Sequelize.chainQueries(queries, callback)
       })
       })
     }
     }
   },
   },
   instanceMethods: {
   instanceMethods: {
-    hasDeadlinePassed: function() {
+    passedDeadline: function() {
       return (this.deadline < new Date())
       return (this.deadline < new Date())
     }
     }
   }
   }
 })
 })
 
 
 // instance creation
 // instance creation
-var task1 = new Task({
+var task1 = Task.build({
       name: 'Choose a nice MySQL connector',
       name: 'Choose a nice MySQL connector',
       deadline: new Date(Date.parse("Jul 8, 2100")),
       deadline: new Date(Date.parse("Jul 8, 2100")),
       importance: 10
       importance: 10
     }),
     }),
-    task2 = new Task({
+    task2 = Task.build({
       name: 'Build the rest',
       name: 'Build the rest',
       deadline: new Date(Date.parse("Jul 8, 2005")),
       deadline: new Date(Date.parse("Jul 8, 2005")),
       importance: 90
       importance: 90
     })
     })
 
 
-Task.drop(function(table, error) {
-  if(error) return Sequelize.Helper.log(error)
-
-  Task.sync(function(table, error) {
-    if(error) return Sequelize.Helper.log(error)
-    
-    task1.save(function() {
-      task2.save(function() {
-        
-        Sequelize.Helper.log("should be false: " + task1.hasDeadlinePassed())
-        Sequelize.Helper.log("should be true: " + task2.hasDeadlinePassed())
-        Sequelize.Helper.log("should be 10: " + task1.importance)
+Task.sync({force: true}).on('success', function() {
+  new Sequelize.Utils.QueryChainer([task1.save(), task2.save()]).run().on('success', function() {
+    console.log("should be false: " + task1.passedDeadline())
+    console.log("should be true: " + task2.passedDeadline())
+    console.log("should be 10: " + task1.importance)
     
     
     Task.setImportance(30, function() {
     Task.setImportance(30, function() {
-          Task.findAll(function(tasks) {
+      Task.findAll().on('success', function(tasks) {
         tasks.forEach(function(task) {
         tasks.forEach(function(task) {
-              Sequelize.Helper.log("should be 30: " + task.importance)
-            })
+          console.log("should be 30: " + task.importance)
         })
         })
       })
       })
-        
-      })
     })
     })
   })
   })
 })
 })
\ No newline at end of file