Merge pull request #584 from flovilmart/hotfix-pushadapters

hotfix for #549

spec/AdapterLoader.spec.js

@@ -1,5 +1,5 @@
 
-var AdapterLoader = require("../src/Adapters/AdapterLoader").AdapterLoader;
+var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter;
 var FilesAdapter = require("../src/Adapters/Files/FilesAdapter").default;
 
 describe("AdaptableController", ()=>{
@@ -7,7 +7,7 @@ describe("AdaptableController", ()=>{
   it("should instantiate an adapter from string in object", (done) => {
     var adapterPath = require('path').resolve("./spec/MockAdapter");
 
-    var adapter = AdapterLoader.load({
+    var adapter = loadAdapter({
       adapter: adapterPath,
       key: "value", 
       foo: "bar"
@@ -21,7 +21,7 @@ describe("AdaptableController", ()=>{
   
   it("should instantiate an adapter from string", (done) => {
     var adapterPath = require('path').resolve("./spec/MockAdapter");
-    var adapter = AdapterLoader.load(adapterPath);
+    var adapter = loadAdapter(adapterPath);
     
     expect(adapter instanceof Object).toBe(true);
     expect(adapter.options).toBe(adapterPath);
@@ -30,7 +30,7 @@ describe("AdaptableController", ()=>{
   
   it("should instantiate an adapter from string that is module", (done) => {
     var adapterPath = require('path').resolve("./src/Adapters/Files/FilesAdapter");
-    var adapter = AdapterLoader.load({
+    var adapter = loadAdapter({
       adapter: adapterPath
     });
     
@@ -39,7 +39,7 @@ describe("AdaptableController", ()=>{
   });
   
   it("should instantiate an adapter from function/Class", (done) => {
-    var adapter = AdapterLoader.load({
+    var adapter = loadAdapter({
       adapter: FilesAdapter
     });
     expect(adapter instanceof FilesAdapter).toBe(true);
@@ -47,22 +47,22 @@ describe("AdaptableController", ()=>{
   });
   
   it("should instantiate the default adapter from Class", (done) => {
-    var adapter = AdapterLoader.load(null, FilesAdapter);
+    var adapter = loadAdapter(null, FilesAdapter);
     expect(adapter instanceof FilesAdapter).toBe(true);
     done();
   });
   
   it("should use the default adapter", (done) => {
     var defaultAdapter = new FilesAdapter();
-    var adapter = AdapterLoader.load(null, defaultAdapter);
+    var adapter = loadAdapter(null, defaultAdapter);
     expect(adapter instanceof FilesAdapter).toBe(true);
     done();
   });
   
   it("should use the provided adapter", (done) => {
     var originalAdapter = new FilesAdapter();
-    var adapter = AdapterLoader.load(originalAdapter);
+    var adapter = loadAdapter(originalAdapter);
     expect(adapter).toBe(originalAdapter);
     done();
   });
-});
+});

spec/OneSignalPushAdapter.spec.js

@@ -1,6 +1,6 @@
 
 var OneSignalPushAdapter = require('../src/Adapters/Push/OneSignalPushAdapter');
-
+var classifyInstallations = require('../src/Adapters/Push/PushAdapterUtils').classifyInstallations;
 describe('OneSignalPushAdapter', () => {
   it('can be initialized', (done) => {
     // Make mock config
@@ -47,7 +47,7 @@ describe('OneSignalPushAdapter', () => {
       }
     ];
 
-    var deviceMap = OneSignalPushAdapter.classifyInstallation(installations, validPushTypes);
+    var deviceMap = OneSignalPushAdapter.classifyInstallations(installations, validPushTypes);
     expect(deviceMap['android']).toEqual([makeDevice('androidToken')]);
     expect(deviceMap['ios']).toEqual([makeDevice('iosToken')]);
     expect(deviceMap['win']).toBe(undefined);

spec/ParsePushAdapter.spec.js

@@ -80,7 +80,7 @@ describe('ParsePushAdapter', () => {
       }
     ];
 
-    var deviceMap = ParsePushAdapter.classifyInstallation(installations, validPushTypes);
+    var deviceMap = ParsePushAdapter.classifyInstallations(installations, validPushTypes);
     expect(deviceMap['android']).toEqual([makeDevice('androidToken')]);
     expect(deviceMap['ios']).toEqual([makeDevice('iosToken')]);
     expect(deviceMap['win']).toBe(undefined);

src/Adapters/AdapterLoader.js

@@ -1,39 +1,35 @@
 
-export class AdapterLoader {
+export function loadAdapter(options, defaultAdapter) {
-  static load(options, defaultAdapter) {
+  let adapter;
-    let adapter;
 
-    // We have options and options have adapter key
+  // We have options and options have adapter key
-    if (options) {
+  if (options) {
-      // Pass an adapter as a module name, a function or an instance
+    // Pass an adapter as a module name, a function or an instance
-      if (typeof options == "string" || typeof options == "function" || options.constructor != Object) {
+    if (typeof options == "string" || typeof options == "function" || options.constructor != Object) {
-        adapter = options;
+      adapter = options;
-      }
-      if (options.adapter) {
-        adapter = options.adapter;
-      }
     }
-    
+    if (options.adapter) {
-    if (!adapter) {
+      adapter = options.adapter;
-      adapter = defaultAdapter;
     }
-
-    // This is a string, require the module
-    if (typeof adapter === "string") {
-      adapter = require(adapter);
-      // If it's define as a module, get the default
-      if (adapter.default) {
-        adapter = adapter.default;
-      }
-    }
-    // From there it's either a function or an object
-    // if it's an function, instanciate and pass the options 
-    if (typeof adapter === "function") {
-      var Adapter = adapter;
-      adapter = new Adapter(options);
-    }
-    return adapter;
   }
-}
+  
+  if (!adapter) {
+    adapter = defaultAdapter;
+  }
 
-export default AdapterLoader;
+  // This is a string, require the module
+  if (typeof adapter === "string") {
+    adapter = require(adapter);
+    // If it's define as a module, get the default
+    if (adapter.default) {
+      adapter = adapter.default;
+    }
+  }
+  // From there it's either a function or an object
+  // if it's an function, instanciate and pass the options 
+  if (typeof adapter === "function") {
+    var Adapter = adapter;
+    adapter = new Adapter(options);
+  }
+  return adapter;
+}

src/Adapters/Push/OneSignalPushAdapter.js

@@ -3,6 +3,8 @@
 // PushAdapter, it uses GCM for android push and APNS
 // for ios push.
 
+import { classifyInstallations } from './PushAdapterUtils';
+
 const Parse = require('parse/node').Parse;
 var deepcopy = require('deepcopy');
 import PushAdapter from './PushAdapter';
@@ -25,7 +27,7 @@ export class OneSignalPushAdapter extends PushAdapter {
   
   send(data, installations) {
     console.log("Sending notification to "+installations.length+" devices.")
-    let deviceMap = PushAdapter.classifyInstallation(installations, this.validPushTypes);
+    let deviceMap = classifyInstallations(installations, this.validPushTypes);
 
     let sendPromises = [];
     for (let pushType in deviceMap) {
@@ -43,6 +45,14 @@ export class OneSignalPushAdapter extends PushAdapter {
     return Parse.Promise.when(sendPromises);
   }
   
+  static classifyInstallations(installations, validTypes) {
+    return classifyInstallations(installations, validTypes)
+  }
+  
+  getValidPushTypes() {
+    return this.validPushTypes;
+  }
+  
   sendToAPNS(data,tokens) {
 
     data= deepcopy(data['data']);

src/Adapters/Push/ParsePushAdapter.js

@@ -7,6 +7,7 @@ const Parse = require('parse/node').Parse;
 const GCM = require('../../GCM');
 const APNS = require('../../APNS');
 import PushAdapter from './PushAdapter';
+import { classifyInstallations } from './PushAdapterUtils';
 
 export class ParsePushAdapter extends PushAdapter {
   constructor(pushConfig = {}) {
@@ -31,8 +32,16 @@ export class ParsePushAdapter extends PushAdapter {
     }
   }
   
+  getValidPushTypes() {
+    return this.validPushTypes;
+  }
+
+  static classifyInstallations(installations, validTypes) {
+    return classifyInstallations(installations, validTypes)
+  }
+  
   send(data, installations) {
-    let deviceMap = PushAdapter.classifyInstallation(installations, this.validPushTypes);
+    let deviceMap = classifyInstallations(installations, this.validPushTypes);
     let sendPromises = [];
     for (let pushType in deviceMap) {
       let sender = this.senderMap[pushType];

src/Adapters/Push/PushAdapter.js

@@ -16,39 +16,7 @@ export class PushAdapter {
    * Get an array of valid push types.
    * @returns {Array} An array of valid push types
    */
-  getValidPushTypes() {
+  getValidPushTypes() {}
-    return this.validPushTypes;
-  }
-  
-  /**g
-   * Classify the device token of installations based on its device type.
-   * @param {Object} installations An array of installations
-   * @param {Array} validPushTypes An array of valid push types(string)
-   * @returns {Object} A map whose key is device type and value is an array of device
-   */
-  static classifyInstallation(installations, validPushTypes) {
-    // Init deviceTokenMap, create a empty array for each valid pushType
-    let deviceMap = {};
-    for (let validPushType of validPushTypes) {
-      deviceMap[validPushType] = [];
-    }
-    for (let installation of installations) {
-      // No deviceToken, ignore
-      if (!installation.deviceToken) {
-        continue;
-      }
-      let pushType = installation.deviceType;
-      if (deviceMap[pushType]) {
-        deviceMap[pushType].push({
-          deviceToken: installation.deviceToken,
-          appIdentifier: installation.appIdentifier
-        });
-      } else {
-        console.log('Unknown push type from installation %j', installation);
-      }
-    }
-    return deviceMap;
-  }
 }
 
 export default PushAdapter;

src/Adapters/Push/PushAdapterUtils.js

@@ -0,0 +1,30 @@
+/**g
+   * Classify the device token of installations based on its device type.
+   * @param {Object} installations An array of installations
+   * @param {Array} validPushTypes An array of valid push types(string)
+   * @returns {Object} A map whose key is device type and value is an array of device
+   */
+export function classifyInstallations(installations, validPushTypes) {
+  // Init deviceTokenMap, create a empty array for each valid pushType
+  let deviceMap = {};
+  for (let validPushType of validPushTypes) {
+    deviceMap[validPushType] = [];
+  }
+  for (let installation of installations) {
+    // No deviceToken, ignore
+    if (!installation.deviceToken) {
+      continue;
+    }
+    let pushType = installation.deviceType;
+    if (deviceMap[pushType]) {
+      deviceMap[pushType].push({
+        deviceToken: installation.deviceToken,
+        appIdentifier: installation.appIdentifier
+      });
+    } else {
+      console.log('Unknown push type from installation %j', installation);
+    }
+  }
+  return deviceMap;
+}
+

src/index.js

@@ -33,7 +33,7 @@ import { PushRouter }          from './Routers/PushRouter';
 import { FilesRouter }         from './Routers/FilesRouter';
 import { LogsRouter }         from './Routers/LogsRouter';
 
-import { AdapterLoader }       from './Adapters/AdapterLoader';
+import { loadAdapter }       from './Adapters/AdapterLoader';
 import { FileLoggerAdapter }   from './Adapters/Logger/FileLoggerAdapter';
 import { LoggerController }    from './Controllers/LoggerController';
 
@@ -107,9 +107,9 @@ function ParseServer({
   }
   
   
-  const filesControllerAdapter = AdapterLoader.load(filesAdapter, GridStoreAdapter);
+  const filesControllerAdapter = loadAdapter(filesAdapter, GridStoreAdapter);
-  const pushControllerAdapter = AdapterLoader.load(push, ParsePushAdapter);
+  const pushControllerAdapter = loadAdapter(push, ParsePushAdapter);
-  const loggerControllerAdapter = AdapterLoader.load(loggerAdapter, FileLoggerAdapter);
+  const loggerControllerAdapter = loadAdapter(loggerAdapter, FileLoggerAdapter);
 
   // We pass the options and the base class for the adatper,
   // Note that passing an instance would work too