Skip to content

Fix support for MongoDB #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix support for MongoDB #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/*exports.database = {
type: 'mongodb',
hostname: 'localhost',
port: 27017,
database: 'scrumblr'
};
*/

var argv = require('yargs')
.usage('Usage: $0 [--port INTEGER [8080]] [--baseurl STRING ["/"]] [--redis STRING:INT [127.0.0.1:6379]] [--gaEnabled] [--gaAccount STRING [UA-2069672-4]]')
.argv;
Expand All @@ -21,10 +13,21 @@ exports.googleanalytics = {
};

var redis_conf = argv.redis || '127.0.0.1:6379';
exports.database = {
type: 'redis',
prefix: '#scrumblr#',
host: redis_conf.split(':')[0] || '127.0.0.1',
port: redis_conf.split(':')[1] || 6379
};

if (argv.use_mongo) {
console.log('Using MongoDB backend');
exports.database = {
type: 'mongodb',
hostname: 'localhost',
port: 27017,
database: 'scrumblr'
};
} else {
console.log('Using Redis backend');
exports.database = {
type: 'redis',
prefix: '#scrumblr#',
host: redis_conf.split(':')[0] || '127.0.0.1',
port: redis_conf.split(':')[1] || 6379
};
}
39 changes: 26 additions & 13 deletions lib/data/mongodb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ var db = function(callback)
});
}

var DEFAULT_BOARD_WIDTH = 800;
var DEFAULT_BOARD_HEIGHT = 600;
var DEFAULT_THEME = 'bigcards';

db.prototype = {
clearRoom: function(room, callback)
{
Expand All @@ -28,9 +32,11 @@ db.prototype = {
// theme commands
setTheme: function(room, theme)
{
theme |= DEFAULT_THEME;
this.rooms.update(
{name:room},
{$set:{theme:theme}}
{$set:{theme:theme}},
{upsert:true}
);
},

Expand All @@ -39,9 +45,9 @@ db.prototype = {
this.rooms.findOne(
{name:room},
{theme:true},
function(err, room) {
if(room) {
callback(room.theme);
function(err, room_obj) {
if (room_obj) {
callback(room_obj.theme || DEFAULT_THEME);
} else {
callback();
}
Expand Down Expand Up @@ -102,11 +108,15 @@ db.prototype = {

getAllCards: function(room, callback)
{
this.rooms.findOne({name:room},{cards:true},function(err, room) {
if(room) {
callback(room.cards);
this.rooms.findOne({name:room},{cards:true},function(err, room_obj) {
if(room_obj) {
var cards = [];
for (var card_id in room_obj.cards) {
cards.push(room_obj.cards[card_id]);
}
callback(cards);
} else {
callback();
callback([]);
}
});
},
Expand Down Expand Up @@ -154,14 +164,17 @@ db.prototype = {
getBoardSize: function(room, callback) {
this.rooms.findOne(
{name:room},
function(err, room) {
if(room) {
callback(room.size);
function(err, room_obj) {
if(room_obj && room_obj.size) {
callback(room_obj.size);
} else {
callback();
callback({
width: DEFAULT_BOARD_WIDTH,
height: DEFAULT_BOARD_HEIGHT,
});
}
}
);
);
},
setBoardSize: function(room, size) {
this.rooms.update(
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"compression": "^1.1.0",
"express": "4.x",
"jade": "~1.5.0",
"mongodb": "~2.0.x",
"redis": "~0.12.1",
"sanitizer": "~0.1.1",
"simplesets": "~1.2.0",
Expand Down