Merge remote-tracking branch 'parse/master'

Conflicts:
	README.md
	index.js

Author: yongjhih

.ebextensions/app.config

@@ -5,6 +5,6 @@ option_settings:
     MASTER_KEY: "ReplaceWithMasterKey"
     DATABASE_URI: "ReplaceWithDatabaseURI"
     NODE_ENV: "production"
-
+    SERVER_URL: "http://myappname.elasticbeanstalk.com/parse"
   aws:elasticbeanstalk:container:nodejs:
     NodeCommand: "npm start"

README.md

@@ -321,6 +321,23 @@ $ git push origin master
 A detailed tutorial is available here:
 [Azure welcomes Parse developers](https://azure.microsoft.com/en-us/blog/azure-welcomes-parse-developers/)
 
+
+### Getting Started With Google App Engine
+
+1. Clone the repo and change directory to it 
+1. Create a project in the [Google Cloud Platform Console](https://console.cloud.google.com/).
+1. [Enable billing](https://console.cloud.google.com/project/_/settings) for your project.
+1. Install the [Google Cloud SDK](https://cloud.google.com/sdk/).
+1. Setup a MongoDB server.  You have a few options:
+  1. Create a Google Compute Engine virtual machine with [MongoDB pre-installed](https://cloud.google.com/launcher/?q=mongodb).
+  1. Use [MongoLab](https://mongolab.com/google/) to create a free MongoDB deployment on Google Cloud Platform.
+1. Modify `app.yaml` to update your environment variables.
+1. Delete `Dockerfile`
+1. Deploy it with `gcloud preview app deploy`
+
+A detailed tutorial is available here:
+[Running Parse server on Google App Engine](https://cloud.google.com/nodejs/resources/frameworks/parse-server)
+
 ### Getting Started With Scalingo
 
 #### With the Scalingo button
@@ -336,7 +353,7 @@ A detailed tutorial is available here:
 * By default it will use a path of /parse for the API routes. To change this, or use older client SDKs, run `scalingo env-set PARSE_MOUNT=/1`
 * Deploy it with: `git push scalingo master`
 
-### Using it
+# Using it
 
 You can use the REST API, the JavaScript SDK, and any of our open-source SDKs:
 
@@ -372,6 +389,24 @@ obj.save().then(function(obj) {
 }, function(err) { console.log(err); });
 ```
 
+Example using it on Android:
+```
+//in your application class
+
+Parse.initialize(new Parse.Configuration.Builder(getApplicationContext())
+        .applicationId("myAppId")
+        .clientKey("myClientKey")
+        .server("http://myServerUrl/parse/")   // '/' important after 'parse'
+        .build());
+        
+  ParseObject testObject = new ParseObject("TestObject");
+  testObject.put("foo", "bar");
+  testObject.saveInBackground();
+
+```
+
+You can change the server URL in all of the open-source SDKs, but we're releasing new builds which provide initialization time configuration of this property.
+
 ## See Also
 
 * https://github.com/ParsePlatform/parse-server

app.json

@@ -16,6 +16,10 @@
     "MASTER_KEY": {
       "description": "A key that overrides all permissions. Keep this secret.",
       "value": "myMasterKey"
+    },
+    "SERVER_URL": {
+      "description": "URL to connect to your Heroku instance (leave as http://localhost)",
+      "value": "http://localhost/parse"
     }
   },
   "image": "heroku/nodejs",

app.yaml

@@ -0,0 +1,12 @@
+runtime: nodejs
+vm: true
+
+env_variables:
+  # --REQUIRED--
+  DATABASE_URI: mongodb://localhost:27017/dev
+  APP_ID: <your-app-id>
+  MASTER_KEY: <your-master-key>
+  # --OPTIONAL--
+  # FILE_KEY: <your-file-key>
+  # PARSE_MOUNT: /parse
+  # CLOUD_CODE_MAIN:  

azuredeploy.json

@@ -44,6 +44,11 @@
       "minLength": 1,
       "defaultValue": "myMasterKey"
     },
+    "parseServerUrl": {
+      "type": "string",
+      "minLength": 1,
+      "defaultValue": "http://yourappname.azure.com/parse"
+    },
     "repoURL": {
       "type": "string",
       "defaultValue": "https://github.com/yongjhih/docker-parse-server.git",
@@ -109,6 +114,10 @@
             "name": "MASTER_KEY",
             "value": "[parameters('parseMasterKey')]"
             },
+            {
+            "name": "SERVER_URL",
+            "value": "[parameters('parseServerUrl')]"
+            },
             {
                 "name": "WEBSITE_NODE_DEFAULT_VERSION",
                 "value": "4.2.3"

index.js

@@ -6,7 +6,7 @@ var express = require('express');
 var ParseServer = require('parse-server').ParseServer;
 var links = require('docker-links').parseLinks(process.env);
 
-var databaseUri = process.env.DATABASE_URI || process.env.MONGOLAB_URI
+var databaseUri = process.env.DATABASE_URI || process.env.MONGOLAB_URI;
 
 if (!databaseUri) {
   if (links.mongo) {
@@ -36,6 +36,7 @@ var api = new ParseServer({
 
   appId: process.env.APP_ID || 'myAppId',
   masterKey: process.env.MASTER_KEY, //Add your master key here. Keep it secret!
+  serverURL: process.env.SERVER_URL || 'http://localhost:1337', // Don't forget to change to https if needed
 
   collectionPrefix: process.env.COLLECTION_PREFIX,
   clientKey: process.env.CLIENT_KEY,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server-example",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "An example Parse API server using the parse-server module",
   "main": "index.js",
   "repository": {
@@ -14,12 +14,12 @@
     "express": "~4.2.x",
     "kerberos": "~0.0.x",
     "parse": "~1.6.12",
-    "parse-server": "~2.0"
+    "parse-server": "~2.1.2"
   },
   "scripts": {
     "start": "nodemon --watch /parse/cloud index.js"
   },
   "engines": {
-    "node": ">=4.1"
+    "node": ">=4.3"
   }
 }