Deprecated the FilesAdapter and DatabaseAdapter in favor of FilesProv…

Config.js

@@ -1,19 +1,23 @@
 // A Config object provides information about how a specific app is
 // configured.
 // mount is the URL for the root of the API; includes http, domain, etc.
+
+// TODO: Cache should get it's providers from the server context, rather than requiring them
+var DatabaseProvider = require('./classes/DatabaseProvider');
+
 function Config(applicationId, mount) {
   var cache = require('./cache');
-  var DatabaseAdapter = require('./DatabaseAdapter');
+  var dbProvider = new DatabaseProvider();
 
   var cacheInfo = cache.apps[applicationId];
   this.valid = !!cacheInfo;
   if (!this.valid) {
     return;
   }
-
+  
   this.applicationId = applicationId;
   this.collectionPrefix = cacheInfo.collectionPrefix || '';
-  this.database = DatabaseAdapter.getDatabaseConnection(applicationId);
+  this.database = dbProvider.getDatabaseConnection(applicationId);
   this.masterKey = cacheInfo.masterKey;
   this.clientKey = cacheInfo.clientKey;
   this.javascriptKey = cacheInfo.javascriptKey;

classes/BaseProvider.js

@@ -0,0 +1,21 @@
+var ServiceProviderInterface = require('../interfaces/ServiceProvider');
+var util = require('util');
+
+function BaseProvider(adapter) {
+    this.adapter = adapter;
+};
+
+util.inherits(BaseProvider, ServiceProviderInterface);
+
+function getAdapter() {
+    return this.adapter;
+}
+
+function setAdapter(adapter) {
+    this.adapter = adapter;
+}
+
+BaseProvider.prototype.getAdapter = getAdapter;
+BaseProvider.prototype.setAdapter = setAdapter;
+
+module.exports = BaseProvider;

classes/DatabaseProvider.js

@@ -0,0 +1,61 @@
+var BaseProvider = require('./BaseProvider');
+var util = require('util');
+var cache = require('../cache');
+
+// TODO: Make these instance variables?
+var dbConnections = {};
+var databaseURI = 'mongodb://localhost:27017/parse';
+var appDatabaseURIs = {};
+
+// Singleton for the entire server. TODO: Refactor away from singleton paradigm
+var instance = null;
+
+// Adapter is actually the adapter constructor. 
+// TODO: Refactor so that the provider doesn't have to implement these methods
+// TODO: Instantiate the adapter if it's a constructor. 
+function DatabaseProvider(adapter) {
+    if (instance) {
+        return instance;
+    }
+
+    instance = this;
+
+    this.adapter = adapter;
+};
+
+util.inherits(DatabaseProvider, BaseProvider);
+
+function setDatabaseURI(uri) {
+  databaseURI = uri;
+};
+
+function setAppDatabaseURI(appId, uri) {
+  appDatabaseURIs[appId] = uri;
+}
+
+function getDatabaseConnections() {
+    return dbConnections;
+}
+
+function getDatabaseConnection(appId) {
+  if (dbConnections[appId]) {
+    return dbConnections[appId];
+  }
+
+  var adapterClass = this.getAdapter();
+
+  var dbURI = (appDatabaseURIs[appId] ? appDatabaseURIs[appId] : databaseURI);
+  var adapter = new adapterClass(dbURI, {
+    collectionPrefix: cache.apps[appId]['collectionPrefix']
+  });
+  dbConnections[appId] = adapter;
+  dbConnections[appId].connect();
+  return dbConnections[appId];
+}
+
+DatabaseProvider.prototype.setDatabaseURI = setDatabaseURI;
+DatabaseProvider.prototype.setAppDatabaseURI = setAppDatabaseURI;
+DatabaseProvider.prototype.getDatabaseConnections = getDatabaseConnections;
+DatabaseProvider.prototype.getDatabaseConnection = getDatabaseConnection;
+
+module.exports = DatabaseProvider;

classes/FilesProvider.js

@@ -0,0 +1,20 @@
+var BaseProvider = require('./BaseProvider');
+var util = require('util');
+
+// Singleton for the entire server. TODO: Refactor away from singleton paradigm
+var instance = null;
+
+// TODO: Instantiate the adapter if it's a constructor. 
+function FilesProvider(adapter) {
+    if (instance) {
+        return instance;
+    }
+
+    instance = this;
+
+    this.adapter = adapter;
+};
+
+util.inherits(FilesProvider, BaseProvider);
+
+module.exports = FilesProvider;

files.js

@@ -3,7 +3,7 @@
 var bodyParser = require('body-parser'),
     Config = require('./Config'),
     express = require('express'),
-    FilesAdapter = require('./FilesAdapter'),
+    FilesProvider = require('./classes/FilesProvider'),
     middlewares = require('./middlewares.js'),
     mime = require('mime'),
     Parse = require('parse/node').Parse,
@@ -12,6 +12,12 @@ var bodyParser = require('body-parser'),
 var router = express.Router();
 
 var processCreate = function(req, res, next) {
+  var FilesAdapter = (new FilesProvider()).getAdapter();
+
+  if (!FilesAdapter) {
+    throw new Error('Unable to get an instance of the FilesAdapter');
+  }
+
   if (!req.body || !req.body.length) {
     next(new Parse.Error(Parse.Error.FILE_SAVE_ERROR,
          'Invalid file upload.'));
@@ -40,10 +46,10 @@ var processCreate = function(req, res, next) {
   }
 
   var filename = rack() + '_' + req.params.filename + extension;
-  FilesAdapter.getAdapter().create(req.config, filename, req.body)
+  FilesAdapter.create(req.config, filename, req.body)
   .then(() => {
     res.status(201);
-    var location = FilesAdapter.getAdapter().location(req.config, req, filename);
+    var location = FilesAdapter.location(req.config, req, filename);
     res.set('Location', location);
     res.json({ url: location, name: filename });
   }).catch((error) => {
@@ -53,8 +59,10 @@ var processCreate = function(req, res, next) {
 };
 
 var processGet = function(req, res) {
+  var FilesAdapter = (new FilesProvider()).getAdapter();
   var config = new Config(req.params.appId);
-  FilesAdapter.getAdapter().get(config, req.params.filename)
+
+  FilesAdapter.get(config, req.params.filename)
   .then((data) => {
     res.status(200);
     var contentType = mime.lookup(req.params.filename);

index.js

@@ -3,14 +3,15 @@
 var batch = require('./batch'),
     bodyParser = require('body-parser'),
     cache = require('./cache'),
-    DatabaseAdapter = require('./DatabaseAdapter'),
     express = require('express'),
-    FilesAdapter = require('./FilesAdapter'),
     S3Adapter = require('./S3Adapter'),
     middlewares = require('./middlewares'),
     multer = require('multer'),
     Parse = require('parse/node').Parse,
     PromiseRouter = require('./PromiseRouter'),
+    BaseProvider = require('./classes/BaseProvider'),
+    DatabaseProvider = require('./classes/DatabaseProvider'),
+    FilesProvider = require('./classes/FilesProvider'),
     httpRequest = require('./httpRequest');
 
 // Mutate the Parse object to add the Cloud Code handlers
@@ -38,20 +39,24 @@ addParseCloud();
 // "dotNetKey": optional key from Parse dashboard
 // "restAPIKey": optional key from Parse dashboard
 // "javascriptKey": optional key from Parse dashboard
+// 
+
+var DefaultDatabaseAdapter = require('./ExportAdapter');
+var DefaultFilesAdapter = require('./GridStoreAdapter');
+
 function ParseServer(args) {
   if (!args.appId || !args.masterKey) {
     throw 'You must provide an appId and masterKey!';
   }
 
-  if (args.databaseAdapter) {
-    DatabaseAdapter.setAdapter(args.databaseAdapter);
-  }
-  if (args.filesAdapter) {
-    FilesAdapter.setAdapter(args.filesAdapter);
-  }
+  this.databaseProvider = new DatabaseProvider(args.databaseAdapter || DefaultDatabaseAdapter);
+  this.filesProvider = new FilesProvider(args.filesAdapter || DefaultFilesAdapter);
+
+  // TODO: Move this into the instantiation
   if (args.databaseURI) {
-    DatabaseAdapter.setAppDatabaseURI(args.appId, args.databaseURI);
+    this.databaseProvider.setAppDatabaseURI(args.appId, args.databaseURI);
   }
+
   if (args.cloud) {
     addParseCloud();
     if (typeof args.cloud === 'function') {

interfaces/ServiceProvider.js

@@ -0,0 +1,12 @@
+function ServiceProviderInterface() {
+};
+
+ServiceProviderInterface.prototype.getAdapter = function() {
+    throw new Error('A service provider must implement getAdapter!');
+}
+
+ServiceProviderInterface.prototype.setAdapter = function() {
+    throw new Error('A service provider must implement setAdapter!');
+}
+
+module.exports = ServiceProviderInterface;

spec/ParseAPI.spec.js

@@ -1,8 +1,9 @@
 // A bunch of different tests are in here - it isn't very thematic.
 // It would probably be better to refactor them into different files.
 
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var request = require('request');
+var dbProvider = new DatabaseProvider();
 
 describe('miscellaneous', function() {
   it('create a GameScore object', function(done) {
@@ -358,7 +359,7 @@ describe('miscellaneous', function() {
       obj.set('foo', 'bar');
       return obj.save();
     }).then(() => {
-      var db = DatabaseAdapter.getDatabaseConnection(appId);
+      var db = dbProvider.getDatabaseConnection(appId);
       return db.mongoFind('TestObject', {}, {});
     }).then((results) => {
       expect(results.length).toEqual(1);

spec/ParseInstallation.spec.js

@@ -4,12 +4,12 @@
 var auth = require('../Auth');
 var cache = require('../cache');
 var Config = require('../Config');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var Parse = require('parse/node').Parse;
 var rest = require('../rest');
 
 var config = new Config('test');
-var database = DatabaseAdapter.getDatabaseConnection('test');
+var database = (new DatabaseProvider()).getDatabaseConnection('test');
 
 describe('Installations', () => {
 

spec/RestCreate.spec.js

@@ -2,13 +2,13 @@
 var auth = require('../Auth');
 var cache = require('../cache');
 var Config = require('../Config');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var Parse = require('parse/node').Parse;
 var rest = require('../rest');
 var request = require('request');
 
 var config = new Config('test');
-var database = DatabaseAdapter.getDatabaseConnection('test');
+var database = (new DatabaseProvider()).getDatabaseConnection('test');
 
 describe('rest create', () => {
   it('handles _id', (done) => {