from mongoose to promised-mongo
This commit is contained in:
1 parent
627a18c5fa
commit
737bebec15
6 files changed
+41
-38
No files matched your search
+8
-8
@@ -3,20 +3,20 @@
|
||||
*/
|
||||
|
||||
var Router = require("express").Router;
|
||||
var Post = require("../schema/post");
|
||||
var db = require("../core/db");
|
||||
|
||||
module.exports = function (app) {
|
||||
var router;
|
||||
router = new Router();
|
||||
router.route("/api/feed")
|
||||
.get(function (req, res) {
|
||||
Post.find({}).exec(function (error, list) {
|
||||
if (error) return res.error(error);
|
||||
|
||||
res.json(list.map(function (post) {
|
||||
return post.toObject();
|
||||
}));
|
||||
});
|
||||
db.c("posts").find().toArray()
|
||||
.catch(function(e){
|
||||
res.error(e);
|
||||
})
|
||||
.then(function (docs) {
|
||||
res.json(docs);
|
||||
});
|
||||
});
|
||||
app.use(router);
|
||||
};
|
||||
+1
-1
@@ -6,7 +6,7 @@ var config = require("../config");
|
||||
var db = require("../core/db");
|
||||
var server = require("../server");
|
||||
|
||||
db.init(config.db)
|
||||
db.init(config.db.uri)
|
||||
.then(function () {
|
||||
server(config.port);
|
||||
});
|
||||
+30
-6
@@ -2,17 +2,41 @@
|
||||
* Created by tmshv on 22/11/14.
|
||||
*/
|
||||
|
||||
var mongoose = require("mongoose");
|
||||
var Promise = require("promise");
|
||||
var mongo = require("promised-mongo");
|
||||
var ObjectId = mongo.ObjectId;
|
||||
|
||||
var client = null;
|
||||
|
||||
module.exports = {
|
||||
init: function (options) {
|
||||
init: function (uri) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
mongoose.connect(options.uri, function (error) {
|
||||
if (error) return reject(error);
|
||||
resolve();
|
||||
});
|
||||
client = mongo(uri);
|
||||
resolve();
|
||||
});
|
||||
},
|
||||
|
||||
get db() {
|
||||
return client;
|
||||
},
|
||||
|
||||
c: function(name){
|
||||
return client.collection(name);
|
||||
},
|
||||
|
||||
id: function(i) {
|
||||
if(typeof i === "string"){
|
||||
return ObjectId(i);
|
||||
}
|
||||
|
||||
else if(i instanceof ObjectId) {
|
||||
return i;
|
||||
}
|
||||
|
||||
else if(i instanceof Object) {
|
||||
return "_id" in i ? ObjectId(i._id) : null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
};
|
||||
+2
-2
@@ -20,9 +20,9 @@
|
||||
"express": "^4.10.1",
|
||||
"instagram-node": "^0.5.1",
|
||||
"method-override": "^2.3.0",
|
||||
"mongoose": "^3.8.19",
|
||||
"morgan": "^1.5.0",
|
||||
"promise": "^6.0.1"
|
||||
"promise": "^6.0.1",
|
||||
"promised-mongo": "^0.11.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp": "^3.8.10",
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
/**
|
||||
* Created by tmshv on 22/11/14.
|
||||
*/
|
||||
|
||||
var mongoose = require("mongoose");
|
||||
var Schema = mongoose.Schema;
|
||||
var ObjectId = Schema.Types.ObjectId;
|
||||
|
||||
var schema = new Schema({
|
||||
id: {type: String, required: true, index: {unique: true}},
|
||||
author: {type: String, default: []},
|
||||
type: {type: String, enum: ["post", "instagram"]},
|
||||
publishDate: Date,
|
||||
body: String,
|
||||
data: Object
|
||||
}
|
||||
);
|
||||
|
||||
var Post = mongoose.model("Post", schema, "posts");
|
||||
module.exports = Post;
|
||||
Reference in new issue
Block a user