Merge remote-tracking branch 'upstream/master'

Author: Lucian Mateescu

README.md

@@ -22,6 +22,7 @@ There is a development wiki here on GitHub: https://github.com/ParsePlatform/par
 * cloud - The absolute path to your cloud code main.js file
 * fileKey - For migrated apps, this is necessary to provide access to files already hosted on Parse.
 * facebookAppIds - An array of valid Facebook application IDs.
+* serverURL - URL which will be used by Cloud Code functions to make requests against.
 
 #### Client key options:
 
@@ -49,14 +50,17 @@ var ParseServer = require('parse-server').ParseServer;
 
 var app = express();
 
+var port = process.env.PORT || 1337;
+
 // Specify the connection string for your mongodb database
 // and the location to your Parse cloud code
 var api = new ParseServer({
   databaseURI: 'mongodb://localhost:27017/dev',
   cloud: '/home/myApp/cloud/main.js', // Provide an absolute path
   appId: 'myAppId',
   masterKey: 'mySecretMasterKey',
-  fileKey: 'optionalFileKey'
+  fileKey: 'optionalFileKey',
+  serverURL: 'http://localhost:' + port + '/parse' // Don't forget to change to https if needed
 });
 
 // Serve the Parse API on the /parse URL prefix
@@ -67,13 +71,48 @@ app.get('/', function(req, res) {
   res.status(200).send('Express is running here.');
 });
 
-var port = process.env.PORT || 1337;
 app.listen(port, function() {
   console.log('parse-server-example running on port ' + port + '.');
 });
 
 ```
 
+
+#### Standalone usage
+
+You can configure the Parse Server with environment variables:
+
+```js 
+PARSE_SERVER_DATABASE_URI
+PARSE_SERVER_CLOUD_CODE_MAIN
+PARSE_SERVER_COLLECTION_PREFIX
+PARSE_SERVER_APPLICATION_ID // required
+PARSE_SERVER_CLIENT_KEY 
+PARSE_SERVER_REST_API_KEY
+PARSE_SERVER_DOTNET_KEY
+PARSE_SERVER_JAVASCRIPT_KEY
+PARSE_SERVER_DOTNET_KEY
+PARSE_SERVER_MASTER_KEY // required
+PARSE_SERVER_FILE_KEY
+PARSE_SERVER_FACEBOOK_APP_IDS // string of comma separated list
+
+```
+
+
+
+Alernatively, you can use the `PARSE_SERVER_OPTIONS` environment variable set to the JSON of your configuration (see Usage).
+
+To start the server, just run `npm start`.
+
+##### Global installation
+
+You can install parse-server globally
+
+`$ npm install -g parse-server`
+
+Now you can just run `$ parse-server` from your command line.
+
+
 ### Supported
 
 * CRUD operations

bin/parse-server

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+var express = require('express');
+var ParseServer = require("../index").ParseServer;
+
+var app = express();
+
+var options = {};
+if (process.env.PARSE_SERVER_OPTIONS) {
+
+	options = JSON.parse(process.env.PARSE_SERVER_OPTIONS);
+
+} else {
+
+	options.databaseURI = process.env.PARSE_SERVER_DATABASE_URI;
+	options.cloud = process.env.PARSE_SERVER_CLOUD_CODE_MAIN;
+	options.collectionPrefix = process.env.PARSE_SERVER_COLLECTION_PREFIX;
+
+	// Keys and App ID
+	options.appId = process.env.PARSE_SERVER_APPLICATION_ID;
+	options.clientKey = process.env.PARSE_SERVER_CLIENT_KEY;
+	options.restAPIKey = process.env.PARSE_SERVER_REST_API_KEY;
+	options.dotNetKey = process.env.PARSE_SERVER_DOTNET_KEY;
+	options.javascriptKey = process.env.PARSE_SERVER_JAVASCRIPT_KEY;
+	options.dotNetKey = process.env.PARSE_SERVER_DOTNET_KEY;
+	options.masterKey = process.env.PARSE_SERVER_MASTER_KEY;
+	options.fileKey = process.env.PARSE_SERVER_FILE_KEY;
+	// Comma separated list of facebook app ids
+	var facebookAppIds = process.env.PARSE_SERVER_FACEBOOK_APP_IDS;
+
+	if (facebookAppIds) {
+		facebookAppIds = facebookAppIds.split(",");
+		options.facebookAppIds = facebookAppIds;
+	}
+}
+
+var mountPath = process.env.PARSE_SERVER_MOUNT_PATH || "/";
+var api = new ParseServer(options);
+app.use('/', api);
+
+var port = process.env.PORT || 1337;
+app.listen(port, function() {
+  console.log('parse-server-example running on http://localhost:'+ port + mountPath);
+});

index.js

@@ -82,6 +82,9 @@ function ParseServer(args) {
 
   // Initialize the node client SDK automatically
   Parse.initialize(args.appId, args.javascriptKey || '', args.masterKey);
+  if(args.serverURL) {
+    Parse.serverURL = args.serverURL;
+  }
 
   // This app serves the Parse API directly.
   // It's the equivalent of https://api.parse.com/1 in the hosted Parse API.

package.json

@@ -31,9 +31,13 @@
   "scripts": {
     "pretest": "MONGODB_VERSION=${MONGODB_VERSION:=3.0.8} mongodb-runner start",
     "test": "TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources -x **/spec/** ./node_modules/.bin/jasmine",
-    "posttest": "mongodb-runner stop"
+    "posttest": "mongodb-runner stop",
+    "start": "./bin/parse-server"
   },
   "engines": {
     "node": ">=4.1"
+  },
+  "bin": {
+    "parse-server": "./bin/parse-server"
   }
 }

transform.js

@@ -363,23 +363,17 @@ function transformAtom(atom, force, options) {
         objectId: atom.objectId
       };
     }
-    if (atom.__type == 'Date') {
-      return new Date(atom.iso);
+    if (DateCoder.isValidJSON(atom)) {
+      return DateCoder.JSONToDatabase(atom);
     }
-    if (atom.__type == 'GeoPoint') {
-      if (!inArray && !inObject) {
-        return [atom.longitude, atom.latitude];
-      }
-      return atom;
+    if (BytesCoder.isValidJSON(atom)) {
+      return BytesCoder.JSONToDatabase(atom);
     }
-    if (atom.__type == 'Bytes') {
-      return new mongodb.Binary(new Buffer(atom.base64, 'base64'));
+    if (GeoPointCoder.isValidJSON(atom)) {
+      return (inArray || inObject ? atom : GeoPointCoder.JSONToDatabase(atom));
     }
-    if (atom.__type == 'File') {
-      if (!inArray && !inObject) {
-        return atom.name;
-      }
-      return atom;
+    if (FileCoder.isValidJSON(atom)) {
+      return (inArray || inObject ? atom : FileCoder.JSONToDatabase(atom));
     }
 
     if (force) {
@@ -620,11 +614,8 @@ function untransformObject(schema, className, mongoObject) {
       return Parse._encode(mongoObject);
     }
 
-    if (mongoObject instanceof mongodb.Binary) {
-      return {
-        __type: 'Bytes',
-        base64: mongoObject.buffer.toString('base64')
-      };
+    if (BytesCoder.isValidDatabaseObject(mongoObject)) {
+      return BytesCoder.databaseToJSON(mongoObject);
     }
 
     var restObject = untransformACL(mongoObject);
@@ -699,20 +690,14 @@ function untransformObject(schema, className, mongoObject) {
         //} else if (mongoObject[key] === null) {
           //break;
         } else {
-          var expected = schema.getExpectedType(className, key);
-          if (expected == 'file' && mongoObject[key]) {
-            restObject[key] = {
-              __type: 'File',
-              name: mongoObject[key]
-            };
+          var expectedType = schema.getExpectedType(className, key);
+          var value = mongoObject[key];
+          if (expectedType === 'file' && FileCoder.isValidDatabaseObject(value)) {
+            restObject[key] = FileCoder.databaseToJSON(value);
             break;
           }
-          if (expected == 'geopoint') {
-            restObject[key] = {
-              __type: 'GeoPoint',
-              latitude: mongoObject[key][1],
-              longitude: mongoObject[key][0]
-            };
+          if (expectedType === 'geopoint' && GeoPointCoder.isValidDatabaseObject(value)) {
+            restObject[key] = GeoPointCoder.databaseToJSON(value);
             break;
           }
         }
@@ -726,6 +711,94 @@ function untransformObject(schema, className, mongoObject) {
   }
 }
 
+var DateCoder = {
+  JSONToDatabase(json) {
+    return new Date(json.iso);
+  },
+
+  isValidJSON(value) {
+    return (typeof value === 'object' &&
+      value !== null &&
+      value.__type === 'Date'
+    );
+  }
+};
+
+var BytesCoder = {
+  databaseToJSON(object) {
+    return {
+      __type: 'Bytes',
+      base64: object.buffer.toString('base64')
+    };
+  },
+
+  isValidDatabaseObject(object) {
+    return (object instanceof mongodb.Binary);
+  },
+
+  JSONToDatabase(json) {
+    return new mongodb.Binary(new Buffer(json.base64, 'base64'));
+  },
+
+  isValidJSON(value) {
+    return (typeof value === 'object' &&
+      value !== null &&
+      value.__type === 'Bytes'
+    );
+  }
+};
+
+var GeoPointCoder = {
+  databaseToJSON(object) {
+    return {
+      __type: 'GeoPoint',
+      latitude: object[1],
+      longitude: object[0]
+    }
+  },
+
+  isValidDatabaseObject(object) {
+    return (object instanceof Array &&
+      object.length == 2
+    );
+  },
+
+  JSONToDatabase(json) {
+    return [ json.longitude, json.latitude ];
+  },
+
+  isValidJSON(value) {
+    return (typeof value === 'object' &&
+      value !== null &&
+      value.__type === 'GeoPoint'
+    );
+  }
+};
+
+var FileCoder = {
+  databaseToJSON(object) {
+    return {
+      __type: 'File',
+      name: object
+    }
+  },
+
+  isValidDatabaseObject(object) {
+    return (typeof object === 'string');
+  },
+
+  JSONToDatabase(json) {
+    return json.name;
+  },
+
+  isValidJSON(value) {
+    return (typeof value === 'object' &&
+      value !== null &&
+      value.__type === 'File'
+    );
+  }
+};
+
 module.exports = {
   transformKey: transformKey,
   transformCreate: transformCreate,