use datastore directly from cli.

Author: stephenplusplus

apps/cli/cli.js

@@ -18,14 +18,15 @@
 
 'use strict';
 
-var todos = require('./');
+var todos = require('../../server/todos.js');
+
 var inquirer = require('inquirer');
 var actions = {
   add: add,
   deleteCompleted: deleteCompleted,
-  exit: process.kill,
   displayTodos: displayTodos,
-  displayTodosAndDelete: displayTodosAndDelete
+  displayTodosAndDelete: displayTodosAndDelete,
+  exit: process.kill
 };
 
 // Start the prompts.
@@ -71,19 +72,21 @@ function add() {
     message: 'What do you need to do?',
     name: 'text'
   }, function(answers) {
-    todos.add(answers.text, function(err) {
+    todos.insert({
+      text: answers.text
+    }, function(err) {
       if (err) {
-        throw new Error(err);
+        throw err;
       }
       init();
     });
   });
 }
 
 function displayTodos() {
-  todos.getTodos(function(err, entities) {
+  todos.getAll(function(err, entities) {
     if (err) {
-      throw new Error(err);
+      throw err;
     }
     if (entities.length === 0) {
       console.log('There are no todos!\n');
@@ -96,8 +99,8 @@ function displayTodos() {
       type: 'checkbox',
       choices: entities.map(function(entity) {
         return {
-          name: entity.text,
-          checked: entity.done,
+          name: entity.data.text,
+          checked: entity.data.done,
           value: entity
         };
       })
@@ -107,45 +110,55 @@ function displayTodos() {
         if (answers.completed.some(function(completed) {
           return completed.id === entity.id;
         })) {
-          entity.done = true;
+          entity.data.done = true;
         } else {
-          entity.done = false;
+          entity.data.done = false;
         }
         return entity;
       });
 
-      todos.update(entities, function(err) {
-        if (err) {
-          throw new Error(err);
-        }
-        init();
+      var updated = 0;
+      entities.forEach(function(entity) {
+        todos.update(entity.id, entity.data, function(err) {
+          if (err) {
+            throw err;
+          }
+          if (++updated === entities.length) {
+            init();
+          }
+        });
       });
     });
   });
 }
 
 function displayTodosAndDelete() {
-  todos.getTodos(function(err, entities) {
+  todos.getAll(function(err, entities) {
     if (err) {
-      throw new Error(err);
+      throw err;
     }
     inquirer.prompt({
       message: 'What would you like to delete?',
       name: 'completed',
       type: 'checkbox',
       choices: entities.map(function(entity) {
         return {
-          name: entity.text,
+          name: entity.data.text,
           checked: false,
           value: entity
         };
       })
     }, function(answers) {
-      todos.delete(answers.completed, function(err) {
-        if (err) {
-          throw new Error(err);
-        }
-        init();
+      var deleted = 0;
+      answers.completed.forEach(function(todo) {
+        todos.delete(todo.id, function(err) {
+          if (err) {
+            throw err;
+          }
+          if (++deleted === answers.completed.length) {
+            init();
+          }
+        })
       });
     });
   });
@@ -154,7 +167,7 @@ function displayTodosAndDelete() {
 function deleteCompleted() {
   todos.deleteCompleted(function(err) {
     if (err) {
-      throw new Error(err);
+      throw err;
     }
     init();
   });