From 6fb27bea51512bb57accc3ee2a602bbd0d1758d3 Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zkam83@gmail.com>
Date: Sun, 20 Jan 2013 11:29:51 +0300
Subject: [PATCH] Removed monngodb export from db module

---
 acs.coffee     |  7 ++++---
 api.coffee     |  3 ++-
 db.coffee      | 11 +++++------
 presets.coffee |  5 +++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/acs.coffee b/acs.coffee
index 589667f..3c77e79 100644
--- a/acs.coffee
+++ b/acs.coffee
@@ -7,6 +7,7 @@ tasks = require './tasks'
 sanitize = require('./sanitize').sanitize
 db = require './db'
 presets = require './presets'
+mongodb = require 'mongodb'
 
 
 applyConfigurations = (currentRequest, taskList) ->
@@ -77,7 +78,7 @@ updateDevice = (currentRequest, actions, callback) ->
             callback(err) if callback?
             return
           
-          task = {device : currentRequest.deviceId, name : 'init', timestamp : db.mongo.Timestamp()}
+          task = {device : currentRequest.deviceId, name : 'init', timestamp : mongodb.Timestamp()}
           db.tasksCollection.save(task, (err) ->
             util.log("#{currentRequest.deviceId}: Added init task #{task._id}")
             callback(err) if callback?
@@ -104,7 +105,7 @@ runTask = (currentRequest, task, reqParams) ->
 
   # Task finished
   db.memcached.del(String(task._id))
-  db.tasksCollection.remove({'_id' : db.mongo.ObjectID(String(task._id))}, {safe: true}, (err, removed) ->
+  db.tasksCollection.remove({'_id' : mongodb.ObjectID(String(task._id))}, {safe: true}, (err, removed) ->
     util.log("#{currentRequest.deviceId}: Completed task #{task.name}(#{task._id})")
     cookies = {task : null}
     nextTask(currentRequest, cookies)
@@ -244,7 +245,7 @@ else
             nextTask(currentRequest, cookies)
           else if reqParams.fault?
             util.log("#{currentRequest.deviceId}: Fault response for task #{task._id}")
-            db.tasksCollection.update({_id : db.mongo.ObjectID(String(task._id))}, {$set : {fault : reqParams.fault}}, (err) ->
+            db.tasksCollection.update({_id : mongodb.ObjectID(String(task._id))}, {$set : {fault : reqParams.fault}}, (err) ->
               # Faulty task. No more work to do until task is deleted.
               res = tr069.response(currentRequest.sessionId, resParams, cookies)
               writeResponse(currentRequest, res)
diff --git a/api.coffee b/api.coffee
index 4615bf4..2bda77d 100644
--- a/api.coffee
+++ b/api.coffee
@@ -3,6 +3,7 @@ util = require 'util'
 http = require 'http'
 url = require 'url'
 db = require './db'
+mongodb = require 'mongodb'
 
 # regular expression objects
 TASKS_REGEX = /^\/devices\/([a-zA-Z0-9\-\_]+)\/tasks\/?$/
@@ -157,7 +158,7 @@ else
             # queue given task
             task = JSON.parse(body)
             task.device = deviceId
-            task.timestamp = db.mongo.Timestamp()
+            task.timestamp = mongodb.Timestamp()
 
             db.tasksCollection.save(task, (err) ->
               if err
diff --git a/db.coffee b/db.coffee
index bf18b17..f4b4199 100644
--- a/db.coffee
+++ b/db.coffee
@@ -1,5 +1,5 @@
 config = require './config'
-mongo = require 'mongodb'
+mongodb = require 'mongodb'
 Memcached = require 'memcached'
 Memcached.config.maxExpiration = 86400
 Memcached.config.timeout = 1000
@@ -11,8 +11,8 @@ tasksCollection = null
 devicesCollection = null
 presetsCollection = null
 
-dbserver = new mongo.Server(config.MONGODB_SOCKET, 0, {auto_reconnect: true})
-db = new mongo.Db(config.DATABASE_NAME, dbserver, {native_parser:true, safe:true})
+dbserver = new mongodb.Server(config.MONGODB_SOCKET, 0, {auto_reconnect: true})
+db = new mongodb.Db(config.DATABASE_NAME, dbserver, {native_parser:true, safe:true})
 
 db.open( (err, db) ->
   db.collection('tasks', (err, collection) ->
@@ -34,7 +34,7 @@ db.open( (err, db) ->
 getTask = (taskId, callback) ->
   memcached.get(taskId, (err, task) ->
     if not task?
-      tasksCollection.findOne({_id : mongo.ObjectID(String(taskId))}, (err, task) ->
+      tasksCollection.findOne({_id : mongodb.ObjectID(String(taskId))}, (err, task) ->
         callback(task)
       )
     else
@@ -49,14 +49,13 @@ updateTask = (task, callback) ->
     if res
       callback()
     else
-      task._id = mongo.ObjectID(id)
+      task._id = mongodb.ObjectID(id)
       tasksCollection.save(task, (err) ->
         callback(err)
       )
   )
 
 
-exports.mongo = mongo
 exports.memcached = memcached
 exports.getTask = getTask
 exports.updateTask = updateTask
diff --git a/presets.coffee b/presets.coffee
index 9db7811..3d4006f 100644
--- a/presets.coffee
+++ b/presets.coffee
@@ -2,6 +2,7 @@ config = require './config'
 common = require './common'
 db = require './db'
 mongoQuery = require './mongo-query'
+mongodb = require 'mongodb'
 
 
 getPresets = (callback) ->
@@ -86,9 +87,9 @@ exports.assertPresets = (deviceId, presetsHash, callback) ->
             throw new Error('Unknown configuration type')
 
       if getParameterValues.length
-        taskList.push {device : deviceId, name : 'getParameterValues', parameterNames: getParameterValues, timestamp : db.mongo.Timestamp()}
+        taskList.push {device : deviceId, name : 'getParameterValues', parameterNames: getParameterValues, timestamp : mongodb.Timestamp()}
       if setParameterValues.length
-        taskList.push {device : deviceId, name : 'setParameterValues', parameterValues: setParameterValues, timestamp : db.mongo.Timestamp()}
+        taskList.push {device : deviceId, name : 'setParameterValues', parameterValues: setParameterValues, timestamp : mongodb.Timestamp()}
 
       if not presetsHash
         presetsHash = calculatePresetsHash(presets)