Merged in the changes to DatabaseProvider and FilesProvider. Updated implementation of the said providers and added a ParseApp class. Needs to be documented.

Signed-off-by: Alexander Mays <maysale01@gmail.com>

Author: Alexander Mays

classes/BaseProvider.js

@@ -55,8 +55,18 @@ function resolveAdapter(adapter, options) {
     return adapter;
 }
 
+function setup (config) {
+  config = config || {};
+  config.adapter = config.adapter || DefaultFilesAdapter;
+
+  var adapter = this.resolveAdapter(config.adapter, config.options);
+  this.setAdapter(adapter);
+}
+
+
 BaseProvider.prototype.getAdapter = getAdapter;
 BaseProvider.prototype.setAdapter = setAdapter;
 BaseProvider.prototype.resolveAdapter = resolveAdapter;
+BaseProvider.prototype.setup = setup;
 
 exports = module.exports = BaseProvider;

classes/DatabaseProvider.js

@@ -0,0 +1,72 @@
+var BaseProvider = require('./BaseProvider');
+var CacheProvider = require('./CacheProvider');
+var util = require('util');
+
+var DefaultDatabaseAdapter = require('../ExportAdapter');
+var defaultURI = "mongodb://localhost:27017/parse";
+
+function DatabaseProvider(adapter) {
+    DatabaseProvider.super_.call(this)
+};
+
+function setup(config) {
+    config = config || {};
+    config.adapter = config.adapter || DefaultDatabaseAdapter;
+    this.dbConnections = config.dbConnections || this.dbConnections || {};
+    this.databaseURI = config.defaultURI || defaultURI;
+    this.appDatabaseURIs = config.appDatabaseURIs || {};
+
+    var adapter = this.resolveAdapter(config.adapter, config.options);
+    this.setAdapter(adapter);
+}
+
+// TODO: Reimplement this whenever @Flovilmart finishes running CloudCode in subprocesses
+function registerAppDatabaseURI(appId, uri) {
+  this.appDatabaseURIs[appId] = uri;
+}
+
+function getDatabaseConnections() {
+    return this.dbConnections;
+}
+
+function getDatabaseConnection(appId) {
+  if (this.dbConnections[appId]) {
+    return this.dbConnections[appId];
+  }
+
+  var cache = CacheProvider.getAdapter();
+  var app = cache.get(appId);
+
+  if (!app) {
+    throw new Error('Application ID provided is not a registered application.');
+  }
+
+  var adapterFn = this.getAdapter();
+  var dbURI = this.appDatabaseURIs[appId] || this.databaseURI;
+  var options = { collectionPrefix: app.collectionPrefix };
+
+  this.dbConnections[appId] = new adapterFn(dbURI, options);
+  this.dbConnections[appId].connect();
+  return this.dbConnections[appId];
+}
+
+// Overriding resolveAdapter to return the class, rather than an instance
+function resolveAdapter(adapter, options) {
+    // Support passing in adapter paths
+    if (typeof adapter === 'string') {
+        adapter = require(adapter);
+    }
+
+    return adapter;
+}
+
+util.inherits(DatabaseProvider, BaseProvider);
+
+DatabaseProvider.prototype.setup = setup;
+DatabaseProvider.prototype.registerAppDatabaseURI = registerAppDatabaseURI;
+DatabaseProvider.prototype.getDatabaseConnections = getDatabaseConnections;
+DatabaseProvider.prototype.getDatabaseConnection = getDatabaseConnection;
+DatabaseProvider.prototype.resolveAdapter = resolveAdapter;
+DatabaseProvider.prototype.DatabaseProvider = DatabaseProvider;
+
+exports = module.exports = new DatabaseProvider();

classes/FilesProvider.js

@@ -0,0 +1,23 @@
+var BaseProvider = require('./BaseProvider');
+var util = require('util');
+
+var DefaultFilesAdapter = require('../GridStoreAdapter');
+
+function FilesProvider(adapter) {
+    FilesProvider.super_.call(this)
+};
+
+function setup (config) {
+  config = config || {};
+  config.adapter = config.adapter || DefaultFilesAdapter;
+
+  var adapter = this.resolveAdapter(config.adapter, config.options);
+  this.setAdapter(adapter);
+}
+
+util.inherits(FilesProvider, BaseProvider);
+
+FilesProvider.prototype.setup = setup;
+FilesProvider.prototype.FilesProvider = FilesProvider;
+
+exports = module.exports = new FilesProvider();

classes/ParseApp.js

@@ -0,0 +1,30 @@
+var DatabaseProvider = require('./DatabaseProvider');
+
+function ParseApp(args) {
+    if (!args.appId || !args.masterKey) {
+      throw 'You must provide an appId and masterKey!';
+    }
+
+    this.appId = args.appId;
+    this.masterKey = args.masterKey;
+    this.collectionPrefix = args.collectionPrefix || '';
+    this.clientKey = args.clientKey || '';
+    this.javascriptKey = args.javascriptKey || '';
+    this.dotNetKey = args.dotNetKey || '';
+    this.restAPIKey = args.restAPIKey || '';
+    this.fileKey = args.fileKey || 'invalid-file-key';
+    this.facebookAppIds = args.facebookAppIds || [];
+    this.databaseURI = args.databaseURI;
+
+    // To maintain compatibility. TODO: Remove in v2.1
+    if (process.env.FACEBOOK_APP_ID) {
+      this['facebookAppIds'].push(process.env.FACEBOOK_APP_ID);
+    }
+
+    // Register with the database provider if we have an app specific database URI
+    if (this.databaseURI) {
+      DatabaseProvider.registerAppDatabaseURI(this.appId, this.databaseURI);
+    }
+}
+
+exports = module.exports = ParseApp;

interfaces/ServiceProvider.js

@@ -33,4 +33,8 @@ ServiceProvider.prototype.resolveAdapter = function() {
     throw new Error('A service provider must implement resolveAdapter!');
 }
 
+ServiceProvider.prototype.setup = function() {
+  throw new Error('A service provider must implement setup!');
+}
+
 exports = module.exports = ServiceProvider;

spec/ParseAPI.spec.js

@@ -1,7 +1,7 @@
 // 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('../src/DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var request = require('request');
 
 describe('miscellaneous', function() {
@@ -358,7 +358,7 @@ describe('miscellaneous', function() {
       obj.set('foo', 'bar');
       return obj.save();
     }).then(() => {
-      var db = DatabaseAdapter.getDatabaseConnection(appId);
+      var db = DatabaseProvider.getDatabaseConnection(appId);
       return db.mongoFind('TestObject', {}, {});
     }).then((results) => {
       expect(results.length).toEqual(1);

spec/ParseInstallation.spec.js

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

spec/RestCreate.spec.js

@@ -1,13 +1,13 @@
 // These tests check the "create" functionality of the REST API.
 var auth = require('../Auth');
 var Config = require('../Config');
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var Parse = require('parse/node').Parse;
 var rest = require('../src/rest');
 var request = require('request');
 
 var config = new Config('test');
-var database = DatabaseAdapter.getDatabaseConnection('test');
+var database = DatabaseProvider.getDatabaseConnection('test');
 
 describe('rest create', () => {
   it('handles _id', (done) => {

spec/helper.js

@@ -2,27 +2,40 @@
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 
-var DatabaseAdapter = require('../DatabaseAdapter');
+var DatabaseProvider = require('../classes/DatabaseProvider');
 var express = require('express');
 var facebook = require('../src/facebook');
 var ParseServer = require('../src/index').ParseServer;
 
 var databaseURI = process.env.DATABASE_URI;
 var cloudMain = process.env.CLOUD_CODE_MAIN || './cloud/main.js';
 
+var config = {
+  database: {
+    databaseURI: databaseURI,
+    /** adapter: "../ExportAdapter" */
+  },
+  cache: {
+  },
+  files: {
+  },
+  cloud: {
+    entry: cloudMain
+  },
+  app: {
+    appId: 'test',
+    javascriptKey: 'test',
+    dotNetKey: 'windows',
+    clientKey: 'client',
+    restAPIKey: 'rest',
+    masterKey: 'test',
+    collectionPrefix: 'test_',
+    fileKey: 'test'
+  }
+};
+
 // Set up an API server for testing
-var api = new ParseServer({
-  databaseURI: databaseURI,
-  cloud: cloudMain,
-  appId: 'test',
-  javascriptKey: 'test',
-  dotNetKey: 'windows',
-  clientKey: 'client',
-  restAPIKey: 'rest',
-  masterKey: 'test',
-  collectionPrefix: 'test_',
-  fileKey: 'test'
-});
+var api = new ParseServer(config);
 
 var app = express();
 app.use('/1', api);
@@ -190,8 +203,9 @@ function mockFacebook() {
 
 function clearData() {
   var promises = [];
-  for (var conn in DatabaseAdapter.dbConnections) {
-    promises.push(DatabaseAdapter.dbConnections[conn].deleteEverything());
+  var connections = DatabaseProvider.getDatabaseConnections();
+  for (var conn in connections) {
+    promises.push(connections[conn].deleteEverything());
   }
   return Promise.all(promises);
 }

src/Config.js

@@ -3,7 +3,7 @@
 // mount is the URL for the root of the API; includes http, domain, etc.
 function Config(applicationId, mount) {
   var cache = require('./classes/CacheProvider').getAdapter();
-  var DatabaseAdapter = require('./DatabaseAdapter');
+  var DatabaseProvider = require('./classes/DatabaseProvider');
 
   var cacheInfo = cache.get(applicationId);
   this.valid = !!cacheInfo;
@@ -13,7 +13,7 @@ function Config(applicationId, mount) {
 
   this.applicationId = applicationId;
   this.collectionPrefix = cacheInfo.collectionPrefix || '';
-  this.database = DatabaseAdapter.getDatabaseConnection(applicationId);
+  this.database = DatabaseProvider.getDatabaseConnection(applicationId);
   this.masterKey = cacheInfo.masterKey;
   this.clientKey = cacheInfo.clientKey;
   this.javascriptKey = cacheInfo.javascriptKey;

src/files.js

@@ -3,15 +3,21 @@
 var bodyParser = require('body-parser'),
     Config = require('./Config'),
     express = require('express'),
-    FilesAdapter = require('./FilesAdapter'),
     middlewares = require('./middlewares.js'),
     mime = require('mime'),
     Parse = require('parse/node').Parse,
     rack = require('hat').rack();
 
+var FilesProvider = require('./classes/FilesProvider');
 var router = express.Router();
 
 var processCreate = function(req, res, next) {
+  var FilesAdapter = 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 = 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);