diff --git a/api/feed.js b/api/feed.js index 3e56bc9d..ea8edc29 100644 --- a/api/feed.js +++ b/api/feed.js @@ -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); }; \ No newline at end of file diff --git a/bin/www.js b/bin/www.js index b39eefe3..031ef5de 100644 --- a/bin/www.js +++ b/bin/www.js @@ -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); }); \ No newline at end of file diff --git a/core/db.js b/core/db.js index 55044e2e..11a2b327 100644 --- a/core/db.js +++ b/core/db.js @@ -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; } }; \ No newline at end of file diff --git a/package.json b/package.json index ff00e05a..7d949dee 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/schema/post.js b/schema/post.js deleted file mode 100644 index c485045a..00000000 --- a/schema/post.js +++ /dev/null @@ -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; \ No newline at end of file diff --git a/server.js b/server.js index 3b4a63b4..ef0692de 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,5 @@ var express = require("express"); var path = require("path"); -var Post = require("./schema/post"); var Promise = require("promise"); var methodOverride = require("method-override");