Updated to ES6

Signed-off-by: Alexander Mays <[email protected]>

Author: Alexander Mays

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 DatabaseProvider = require('../src/classes/DatabaseProvider');
+var DatabaseProvider = require('../src/classes/DatabaseProvider').default;
 var request = require('request');
 
 describe('miscellaneous', function() {

spec/ParseInstallation.spec.js

@@ -3,7 +3,7 @@
 
 var auth = require('../src/Auth');
 var Config = require('../src/Config');
-var DatabaseProvider = require('../src/classes/DatabaseProvider');
+var DatabaseProvider = require('../src/classes/DatabaseProvider').default;
 var Parse = require('parse/node').Parse;
 var rest = require('../src/rest');
 

spec/RestCreate.spec.js

@@ -1,7 +1,7 @@
 // These tests check the "create" functionality of the REST API.
 var auth = require('../src/Auth');
 var Config = require('../src/Config');
-var DatabaseProvider = require('../src/classes/DatabaseProvider');
+var DatabaseProvider = require('../src/classes/DatabaseProvider').default;
 var Parse = require('parse/node').Parse;
 var rest = require('../src/rest');
 var request = require('request');

spec/classes/MemoryCache.spec.js

@@ -1,7 +1,9 @@
 /* global describe, it, before, beforeEach, afterEach */
 'use strict';
 
-var cache = new (require('../../src/classes/MemoryCache'));
+var MemoryCache = require('../../src/classes/MemoryCache').default;
+
+var cache = new MemoryCache();
 var _ = require('lodash');
 
 describe('MemoryCache', function() {

spec/helper.js

@@ -2,7 +2,7 @@
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 
-var DatabaseProvider = require('../src/classes/DatabaseProvider');
+var DatabaseProvider = require('../src/classes/DatabaseProvider').default;
 var express = require('express');
 var facebook = require('../src/facebook');
 var ParseServer = require('../src/index').ParseServer;

src/Auth.js

@@ -1,7 +1,7 @@
 var deepcopy = require('deepcopy');
 var Parse = require('parse/node').Parse;
 var RestQuery = require('./RestQuery');
-var CacheProvider = require('./classes/CacheProvider');
+var CacheProvider = require('./classes/CacheProvider').default;
 
 // An Auth object tells you who is requesting something and whether
 // the master key was used.

src/Config.js

@@ -1,9 +1,11 @@
 // 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.
+
 function Config(applicationId, mount) {
-  var cache = require('./classes/CacheProvider').getAdapter();
-  var DatabaseProvider = require('./classes/DatabaseProvider');
+  var DatabaseProvider = require('./classes/DatabaseProvider').default;
+  var CacheProvider = require('./classes/CacheProvider').default;
+  var cache = CacheProvider.getAdapter();
 
   var cacheInfo = cache.get(applicationId);
   this.valid = !!cacheInfo;

src/classes/BaseProvider.js

@@ -1,72 +1,66 @@
-var ServiceProviderInterface = require('../interfaces/ServiceProvider');
-var util = require('util');
-
+import { default as ServiceProviderInterface } from '../interfaces/ServiceProvider';
 /**
  * A base provider class that allows for an abstraction of adapter implementations
  *
  * @class
  * @implements {ServiceProvider}
  * @param {Object} adapter - An adapter
  */
-function BaseProvider(adapter) {
+export class BaseProvider {
+  constructor(adapter){
     if (adapter) {
         this.adapter = adapter;
     }
-};
+  }
 
-util.inherits(BaseProvider, ServiceProviderInterface);
+  /**
+   * Get the adapter
+   *
+   * @returns {Object} An adapter instance
+   */
+  getAdapter() {
+      return this.adapter;
+  }
 
-/**
- * Get the adapter
- *
- * @returns {Object} An adapter instance
- */
-function getAdapter() {
-    return this.adapter;
-}
+  /**
+   * Set the adapter
+   *
+   * @param {Object} adapter - An adapter
+   */
+  setAdapter(adapter) {
+      this.adapter = adapter;
+  }
 
-/**
- * Set the adapter
- *
- * @param {Object} adapter - An adapter
- */
-function setAdapter(adapter) {
-    this.adapter = adapter;
-}
+  /**
+   * Resolves the adapter
+   *
+   * @param {Object|String|Function} adapter - [1] An object implementing the adapter interface, or [2] a function that returns [1], or [3] A string of either the name of an included npm module or a path to a local module that returns [1] or [2].
+   * @param {Object} options - An object passed to the adapter on instantiation (if adapter is not already instantiated)
+   * @returns {Object} An object implementing the adapter interface
+   */
+  resolveAdapter(adapter, options) {
+      // Support passing in adapter paths
+      if (typeof adapter === 'string') {
+          adapter = require(adapter);
 
-/**
- * Resolves the adapter
- *
- * @param {Object|String|Function} adapter - [1] An object implementing the adapter interface, or [2] a function that returns [1], or [3] A string of either the name of an included npm module or a path to a local module that returns [1] or [2].
- * @param {Object} options - An object passed to the adapter on instantiation (if adapter is not already instantiated)
- * @returns {Object} An object implementing the adapter interface
- */
-function resolveAdapter(adapter, options) {
-    // Support passing in adapter paths
-    if (typeof adapter === 'string') {
-        adapter = require(adapter);
-    }
+          // TODO: Figure out a better way to deal with this
+          if (adapter && adapter.default) 
+            adapter = adapter.default;
+      }
+      
+      // Instantiate the adapter if the class got passed instead of an instance
+      if (typeof adapter === 'function') {
+          adapter = new adapter(options);
+      }
 
-    // Instantiate the adapter if the class got passed instead of an instance
-    if (typeof adapter === 'function') {
-        adapter = new adapter(options);
-    }
+      return adapter;
+  }
 
-    return adapter;
+  setup (config = {}) {
+    const adapter = this.resolveAdapter(config.adapter || this.DEFAULT_ADAPTER, config.options);
+    this.setAdapter(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;
+export default BaseProvider;

src/classes/CacheProvider.js

@@ -1,7 +1,4 @@
-var util = require('util');
-
-var BaseProvider = require('./BaseProvider');
-var DefaultCacheAdapter = require('./MemoryCache');
+import { default as BaseProvider } from './BaseProvider';
 
 /**
 * Abstract class the provides a reference to an adapter instance (a caching implementation)
@@ -10,29 +7,11 @@ var DefaultCacheAdapter = require('./MemoryCache');
 * @extends {BaseProvider}
 * @param {Object} adapter - A cache adapter
 */
-function CacheProvider(adapter) {
-    CacheProvider.super_.call(this)
-};
-
-/**
-* Setup the cache provider given a configuration object
-*
-* @method
-* @param {Object} config - A configuration object
-* @param {Any} config.adapter - A string, object, instance, or function that resolves to an adapter implementation
-* @param {Object} config.options - An object passed to the adapter on instantiation (if adapter is not already instantiated)
-*/
-function setup (config) {
-  config = config || {};
-  config.adapter = config.adapter || DefaultCacheAdapter;
-
-  var adapter = this.resolveAdapter(config.adapter, config.options);
-  this.setAdapter(adapter);
+export class CacheProvider extends BaseProvider {
+  constructor() {
+    super(...arguments);
+    this.DEFAULT_ADAPTER = './MemoryCache';
+  }
 }
 
-util.inherits(CacheProvider, BaseProvider);
-
-CacheProvider.prototype.setup = setup;
-CacheProvider.prototype.CacheProvider = CacheProvider;
-
-exports = module.exports = new CacheProvider();
+export default new CacheProvider();

src/classes/DatabaseProvider.js

@@ -1,72 +1,65 @@
-var BaseProvider = require('./BaseProvider');
-var CacheProvider = require('./CacheProvider');
-var util = require('util');
+import { default as BaseProvider } from './BaseProvider';
+import { default as CacheProvider } from './CacheProvider';
 
-var DefaultDatabaseAdapter = require('../ExportAdapter');
-var defaultURI = "mongodb://localhost:27017/parse";
+const DEFAULT_URI = "mongodb://localhost:27017/parse";
 
-function DatabaseProvider(adapter) {
-    DatabaseProvider.super_.call(this)
-};
+export class DatabaseProvider extends BaseProvider {
+  constructor() {
+    super(...arguments);
+    this.DEFAULT_ADAPTER = '../ExportAdapter';
+  }
 
-function setup(config) {
-    config = config || {};
-    config.adapter = config.adapter || DefaultDatabaseAdapter;
+  setup(config = {}) {
     this.dbConnections = config.dbConnections || this.dbConnections || {};
-    this.databaseURI = config.defaultURI || defaultURI;
+    this.databaseURI = config.defaultURI || DEFAULT_URI;
     this.appDatabaseURIs = config.appDatabaseURIs || {};
 
-    var adapter = this.resolveAdapter(config.adapter, config.options);
-    this.setAdapter(adapter);
-}
+    super.setup(...arguments);
+  }
 
-// TODO: Reimplement this whenever @Flovilmart finishes running CloudCode in subprocesses
-function registerAppDatabaseURI(appId, uri) {
-  this.appDatabaseURIs[appId] = uri;
-}
+  // TODO: Reimplement this whenever @Flovilmart finishes running CloudCode in subprocesses
+  registerAppDatabaseURI(appId, uri) {
+    this.appDatabaseURIs[appId] = uri;
+  }
 
-function getDatabaseConnections() {
+  getDatabaseConnections() {
     return this.dbConnections;
-}
-
-function getDatabaseConnection(appId) {
-  if (this.dbConnections[appId]) {
-    return this.dbConnections[appId];
   }
 
-  var cache = CacheProvider.getAdapter();
-  var app = cache.get(appId);
+  getDatabaseConnection(appId) {
+    if (this.dbConnections[appId]) {
+      return this.dbConnections[appId];
+    }
 
-  if (!app) {
-    throw new Error('Application ID provided is not a registered application.');
-  }
+    const cache = CacheProvider.getAdapter();
+    const app = cache.get(appId);
 
-  var adapterFn = this.getAdapter();
-  var dbURI = this.appDatabaseURIs[appId] || this.databaseURI;
-  var options = { collectionPrefix: app.collectionPrefix };
+    if (!app) {
+      throw new Error('Application ID provided is not a registered application.');
+    }
 
-  this.dbConnections[appId] = new adapterFn(dbURI, options);
-  this.dbConnections[appId].connect();
-  return this.dbConnections[appId];
-}
+    const adapterClass = this.getAdapter();
+    const dbURI = this.appDatabaseURIs[appId] || this.databaseURI;
+    const options = { collectionPrefix: app.collectionPrefix };
 
-// 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);
-    }
+    this.dbConnections[appId] = new adapterClass(dbURI, options);
+    this.dbConnections[appId].connect();
+    return this.dbConnections[appId];
+  }
 
-    return adapter;
-}
+  // Overriding resolveAdapter to prevent instantiation
+  resolveAdapter(adapter, options) {
+      // Support passing in adapter paths
+      if (typeof adapter === 'string') {
+          adapter = require(adapter);
 
-util.inherits(DatabaseProvider, BaseProvider);
+          // TODO: Figure out a better way to deal with this
+          if (adapter && adapter.default) 
+            adapter = adapter.default;
+      }
 
-DatabaseProvider.prototype.setup = setup;
-DatabaseProvider.prototype.registerAppDatabaseURI = registerAppDatabaseURI;
-DatabaseProvider.prototype.getDatabaseConnections = getDatabaseConnections;
-DatabaseProvider.prototype.getDatabaseConnection = getDatabaseConnection;
-DatabaseProvider.prototype.resolveAdapter = resolveAdapter;
-DatabaseProvider.prototype.DatabaseProvider = DatabaseProvider;
+      return adapter;
+  }
+}
 
-exports = module.exports = new DatabaseProvider();
+export default new DatabaseProvider();

src/classes/FilesProvider.js

@@ -1,23 +1,10 @@
-var BaseProvider = require('./BaseProvider');
-var util = require('util');
+import { default as BaseProvider } from './BaseProvider';
 
-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);
+export class FilesProvider extends BaseProvider {
+  constructor() {
+    super(...arguments);
+    this.DEFAULT_ADAPTER = '../GridStoreAdapter'
+  }
 }
 
-util.inherits(FilesProvider, BaseProvider);
-
-FilesProvider.prototype.setup = setup;
-FilesProvider.prototype.FilesProvider = FilesProvider;
-
-exports = module.exports = new FilesProvider();
+export default new FilesProvider();