Browse Source

Update mongo packages used

Edward Bramanti 10 years ago
parent
commit
afb2d16ad3
2 changed files with 19 additions and 22 deletions
  1. 15 19
      frameworks/JavaScript/koa/app.js
  2. 4 3
      frameworks/JavaScript/koa/package.json

+ 15 - 19
frameworks/JavaScript/koa/app.js

@@ -5,7 +5,11 @@ var cluster = require('cluster')
   , handlebars = require('koa-handlebars')
   , handlebars = require('koa-handlebars')
   , bodyParser = require('koa-bodyparser')
   , bodyParser = require('koa-bodyparser')
   , override = require('koa-override')
   , override = require('koa-override')
-  , mongo = require('koa-mongo');
+  , monk = require('monk')
+  , wrap = require('co-monk')
+  , db = monk('localhost/hello_world')
+  , worlds = wrap(db.get('world'))
+  , fortunes = wrap(db.get('fortune'));
 
 
 if (cluster.isMaster) {
 if (cluster.isMaster) {
   // Fork workers.
   // Fork workers.
@@ -20,9 +24,6 @@ if (cluster.isMaster) {
   var app = module.exports = koa();
   var app = module.exports = koa();
   app.use(bodyParser());
   app.use(bodyParser());
   app.use(override());
   app.use(override());
-  app.use(mongo({
-    uri: "mongodb://localhost/hello_world"
-  }));
   app.use(handlebars({
   app.use(handlebars({
     // needed, otherwise missing dir err
     // needed, otherwise missing dir err
     partialsDir: "views"
     partialsDir: "views"
@@ -43,13 +44,10 @@ if (cluster.isMaster) {
   function *worldUpdateQuery() {
   function *worldUpdateQuery() {
     var randomId = getRandomNumber();
     var randomId = getRandomNumber();
     var randomNumber = getRandomNumber();
     var randomNumber = getRandomNumber();
-    var result = yield function(callback) {
-        this.mongo.collection('world').update(
-          {id: randomId},
-          {randomNumber: randomNumber}, 
-          callback
-        );
-    }
+    var result = yield worlds.update(
+      {id: randomId}, 
+      {randomNumber: randomNumber}
+    );
     return {
     return {
       id: randomId,
       id: randomId,
       randomNumber: randomNumber
       randomNumber: randomNumber
@@ -57,16 +55,14 @@ if (cluster.isMaster) {
   }
   }
 
 
   function *worldQuery() {
   function *worldQuery() {
-    return yield function(callback) {
-        var randomId = {id: Math.floor(Math.random()*10000) + 1};
-        this.mongo.collection('world').findOne(randomId, {_id: 0}, callback);
-    }
+    var randomId = {id: getRandomNumber()};
+    var res = yield worlds.findOne(randomId, '-_id');
+    console.log(res);
+    return res;
   }
   }
 
 
   function *fortunesQuery() {
   function *fortunesQuery() {
-    return yield function(callback) {
-        this.mongo.collection('fortune').find({}, {_id: 0}).toArray(callback);
-    }
+    return yield fortunes.find({}, '-_id');
   }
   }
 
 
   // Route handlers
   // Route handlers
@@ -128,5 +124,5 @@ if (cluster.isMaster) {
     this.body = 'Hello, world!'
     this.body = 'Hello, world!'
   }
   }
 
 
-  app.listen(3000); //used for local testing
+  app.listen(8080); //used for local testing
 }
 }

+ 4 - 3
frameworks/JavaScript/koa/package.json

@@ -5,12 +5,13 @@
   "main": "app.js",
   "main": "app.js",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {
+    "co-monk": "1.0.0",
     "koa": "0.18.1",
     "koa": "0.18.1",
     "koa-bodyparser": "1.4.1",
     "koa-bodyparser": "1.4.1",
-    "koa-handlebars": "^0.5.2",
-    "koa-mongo": "^0.3.0",
+    "koa-handlebars": "0.5.2",
+    "koa-mongo": "0.3.0",
     "koa-override": "1.0.0",
     "koa-override": "1.0.0",
     "koa-route": "2.4.0",
     "koa-route": "2.4.0",
-    "mongoose": "3.8.25"
+    "monk": "1.0.1"
   }
   }
 }
 }