Merge branch 'master' into greenkeeper/initial

Author: flovilmart

README.md

@@ -6,7 +6,7 @@
 [![Npm Version][npm-svg]][npm-link]
 [![License][license-svg]][license-link]
 
-A library that gives you access to the powerful Parse cloud platform from your JavaScript app. For more information on Parse and its features, see [the website](https://parse.com) or [the JavaScript guide](https://parseplatform.github.io/docs/js/guide/).
+A library that gives you access to the powerful Parse cloud platform from your JavaScript app. For more information on Parse and its features, see [the website](http://parseplatform.org) or [the JavaScript guide](https://docs.parseplatform.org/js/guide/).
 
 ## Getting Started
 
@@ -36,18 +36,20 @@ For React Native applications, include `'parse/react-native'`:
 var Parse = require('parse/react-native');
 ```
 
+> As of `v1.9.3`, Parse-SDK-JS supports React Native 0.43+. Please use `v1.9.2` for previous versions of React Native.
+
 ## License
 
 ```
 Copyright (c) 2015-present, Parse, LLC.
 All rights reserved.
 
 This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree. An additional grant 
+LICENSE file in the root directory of this source tree. An additional grant
 of patent rights can be found in the PATENTS file in the same directory.
 ```
 
-As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. 
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.
 
  [build-status-svg]: https://travis-ci.org/parse-community/Parse-SDK-JS.svg?branch=master
  [build-status-link]: https://travis-ci.org/parse-community/Parse-SDK-JS

integration/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "express": "^4.13.4",
     "mocha": "^2.4.5",
-    "parse-server": "2.2.17"
+    "parse-server": "2.4.2"
   },
   "scripts": {
     "test": "mocha --reporter dot -t 5000"

integration/test/ParseGeoBoxTest.js

@@ -11,10 +11,10 @@ describe('Geo Box', () => {
     Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
     Parse.Storage._clear();
   });
-
-  beforeEach((done) => {
+    
+  beforeEach((done) => {  
     clear().then(() => {
-      done();
+      Parse.User.logOut().then(() => { done() }, () => { done() });
     });
   });
 

integration/test/ParseGeoPointTest.js

@@ -9,7 +9,7 @@ const TestObject = Parse.Object.extend('TestObject');
 const TestPoint = Parse.Object.extend('TestPoint');
 
 describe('Geo Point', () => {
-  before(() => {
+  before((done) => {
     Parse.initialize('integration');
     Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
     Parse.Storage._clear();
@@ -28,8 +28,8 @@ describe('Geo Point', () => {
 
       return Parse.Object.saveAll([sacramento, honolulu, sf]);
     }).then(() => {
-      done();
-    });
+      return Parse.User.logOut();
+    }).then(() => { done() }, () => { done() });
   });
 
   it('can save geo points', (done) => {

integration/test/ParseObjectTest.js

@@ -1183,8 +1183,8 @@ describe('Parse Object', () => {
     }).then(() => {
       assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
       assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
-      done();
-    });
+      return Parse.User.logOut().then(() => { done(); }, () => { done(); });
+    }).catch(done.fail);
   });
 
   it('can fetchAllIfNeeded', (done) => {

integration/test/ParseQueryTest.js

@@ -19,8 +19,9 @@ describe('Parse Query', () => {
       }
       return Parse.Object.saveAll(numbers);
     }).then(() => {
-      done();
-    });
+      return Parse.User.logOut();
+    })
+    .then(() => { done() }, () => { done() });
   });
 
   it('can do basic queries', (done) => {
@@ -1182,6 +1183,10 @@ describe('Parse Query', () => {
         assert(o.get('x') <= 15);
       });
       done();
+    })
+    .catch(err => {
+      console.dir(err);
+      done.fail();
     });
   });
 

src/ParseError.js

@@ -19,6 +19,10 @@ export default class ParseError {
     this.code = code;
     this.message = message;
   }
+  
+  toString() {
+    return 'ParseError: ' + this.code + ' ' + this.message;
+  }
 }
 
 /**

src/ParseLiveQuery.js

@@ -196,6 +196,12 @@ const DefaultLiveQueryController = {
         subscription.on('delete', (object) => {
           subscriptionWrap.emit('delete', object);
         });
+        subscription.on('close', (object) => {
+          subscriptionWrap.emit('close', object);
+        });
+        subscription.on('error', (object) => {
+          subscriptionWrap.emit('error', object);
+        });
 
         this.resolve();
       });

src/ParseQuery.js

@@ -44,6 +44,70 @@ function quote(s: string) {
   return '\\Q' + s.replace('\\E', '\\E\\\\E\\Q') + '\\E';
 }
 
+/**
+ * Handles pre-populating the result data of a query with select fields,
+ * making sure that the data object contains keys for all objects that have
+ * been requested with a select, so that our cached state updates correctly.
+ */
+function handleSelectResult(data: any, select: Array<string>){
+  var serverDataMask = {};
+
+  select.forEach((field) => {
+    let hasSubObjectSelect = field.indexOf(".") !== -1;
+    if (!hasSubObjectSelect && !data.hasOwnProperty(field)){
+      // this field was selected, but is missing from the retrieved data
+      data[field] = undefined
+    } else if (hasSubObjectSelect) {
+      // this field references a sub-object,
+      // so we need to walk down the path components 
+      let pathComponents = field.split(".");
+      var obj = data;
+      var serverMask = serverDataMask;
+
+      pathComponents.forEach((component, index, arr) => {
+        // add keys if the expected data is missing
+        if (!obj[component]) {
+          obj[component] = (index == arr.length-1) ? undefined : {};
+        }
+        obj = obj[component];
+
+        //add this path component to the server mask so we can fill it in later if needed
+        if (index < arr.length-1) {
+          if (!serverMask[component]) {
+            serverMask[component] = {};
+          }
+        }
+      });
+    }
+  });
+
+  if (Object.keys(serverDataMask).length > 0) {
+    // When selecting from sub-objects, we don't want to blow away the missing
+    // information that we may have retrieved before. We've already added any
+    // missing selected keys to sub-objects, but we still need to add in the
+    // data for any previously retrieved sub-objects that were not selected.
+
+    let serverData = CoreManager.getObjectStateController().getServerData({id:data.objectId, className:data.className});
+
+    function copyMissingDataWithMask(src, dest, mask, copyThisLevel){
+      //copy missing elements at this level
+      if (copyThisLevel) {
+        for (var key in src) {
+          if (src.hasOwnProperty(key) && !dest.hasOwnProperty(key)) {
+            dest[key] = src[key]
+          }
+        }
+      }
+      for (var key in mask) {
+        //traverse into objects as needed
+        copyMissingDataWithMask(src[key], dest[key], mask[key], true);
+      }
+    }
+
+    copyMissingDataWithMask(serverData, data, serverDataMask, false);
+  }
+}
+
 /**
  * Creates a new parse Parse.Query for the given Parse.Object subclass.
  * @class Parse.Query
@@ -273,6 +337,8 @@ export default class ParseQuery {
 
     let controller = CoreManager.getQueryController();
 
+    let select = this._select;
+
     return controller.find(
       this.className,
       this.toJSON(),
@@ -285,7 +351,15 @@ export default class ParseQuery {
         if (!data.className) {
           data.className = override;
         }
-        return ParseObject.fromJSON(data, true);
+
+        // Make sure the data object contains keys for all objects that
+        // have been requested with a select, so that our cached state
+        // updates correctly.
+        if (select) {
+          handleSelectResult(data, select);
+        }
+        
+        return ParseObject.fromJSON(data, !select);
       });
     })._thenRunCallbacks(options);
   }
@@ -371,6 +445,8 @@ export default class ParseQuery {
     var params = this.toJSON();
     params.limit = 1;
 
+    var select = this._select;
+
     return controller.find(
       this.className,
       params,
@@ -383,7 +459,15 @@ export default class ParseQuery {
       if (!objects[0].className) {
         objects[0].className = this.className;
       }
-      return ParseObject.fromJSON(objects[0], true);
+
+      // Make sure the data object contains keys for all objects that
+      // have been requested with a select, so that our cached state
+      // updates correctly.
+      if (select) {
+        handleSelectResult(objects[0], select);
+      }
+
+      return ParseObject.fromJSON(objects[0], !select);
     })._thenRunCallbacks(options);
   }
 

src/ParseUser.js

@@ -655,7 +655,7 @@ export default class ParseUser extends ParseObject {
   static logOut() {
     if (!canUseCurrentUser) {
       throw new Error(
-        'There is no current user user on a node.js server environment.'
+        'There is no current user on a node.js server environment.'
       );
     }
 

src/StorageController.react-native.js

@@ -11,7 +11,7 @@
 
 import ParsePromise from './ParsePromise';
 // RN packager nonsense
-import { AsyncStorage } from 'react-native/Libraries/react-native/react-native.js';
+import { AsyncStorage } from 'react-native/Libraries/react-native/react-native-implementation';
 
 var StorageController = {
   async: 1,

src/__tests__/ParseError-test.js

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Parse, LLC.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+jest.dontMock('../ParseError');
+
+var ParseError = require('../ParseError').default;
+
+describe('ParseError', () => {
+  it('have sensible string representation', () => {
+    var error = new ParseError(123, 'some error message');
+    
+    expect(error.toString()).toMatch('ParseError');
+    expect(error.toString()).toMatch('123');
+    expect(error.toString()).toMatch('some error message');
+  });
+});

src/__tests__/ParseLiveQuery-test.js

@@ -11,11 +11,16 @@ jest.dontMock('../ParseLiveQuery');
 jest.dontMock('../CoreManager');
 jest.dontMock('../ParsePromise');
 jest.dontMock('../LiveQueryClient');
+jest.dontMock('../LiveQuerySubscription');
 jest.dontMock('../ParseObject');
+jest.dontMock('../ParsePromise');
+jest.dontMock('../ParseQuery');
+jest.dontMock('../EventEmitter');
 
 const ParseLiveQuery = require('../ParseLiveQuery');
 const CoreManager = require('../CoreManager');
 const ParsePromise = require('../ParsePromise').default;
+const ParseQuery = require('../ParseQuery').default;
 
 describe('ParseLiveQuery', () => {
   beforeEach(() => {
@@ -99,4 +104,83 @@ describe('ParseLiveQuery', () => {
       done();
     });
   });
+
+  it('subscribes to all subscription events', (done) => {
+
+    CoreManager.set('UserController', {
+      currentUserAsync() {
+        return ParsePromise.as({
+          getSessionToken() {
+            return 'token';
+          }
+        });
+      }
+    });
+    CoreManager.set('APPLICATION_ID', 'appid');
+    CoreManager.set('JAVASCRIPT_KEY', 'jskey');
+    CoreManager.set('LIVEQUERY_SERVER_URL', null);
+
+    const controller = CoreManager.getLiveQueryController();
+
+    controller.getDefaultLiveQueryClient().then((client) => {
+
+      const query = new ParseQuery("ObjectType");
+      query.equalTo("test", "value");
+      const ourSubscription = controller.subscribe(query, "close");
+
+      var isCalled = {};
+      ["open", 
+        "close",
+        "error",
+        "create",
+        "update", 
+        "enter", 
+        "leave", 
+        "delete"].forEach((key) =>{
+        ourSubscription.on(key, () => {
+          isCalled[key] = true;
+        });
+      });
+      
+      // controller.subscribe() completes asynchronously, 
+      // so we need to give it a chance to complete before finishing
+      setTimeout(() => { 
+        try {
+          client.connectPromise.resolve();
+          var actualSubscription = client.subscriptions.get(1);
+
+          expect(actualSubscription).toBeDefined();
+
+          actualSubscription.emit("open");
+          expect(isCalled["open"]).toBe(true);
+
+          actualSubscription.emit("close");
+          expect(isCalled["close"]).toBe(true);
+
+          actualSubscription.emit("error");
+          expect(isCalled["error"]).toBe(true);
+
+          actualSubscription.emit("create");
+          expect(isCalled["create"]).toBe(true);
+
+          actualSubscription.emit("update");
+          expect(isCalled["update"]).toBe(true);
+
+          actualSubscription.emit("enter");
+          expect(isCalled["enter"]).toBe(true);
+
+          actualSubscription.emit("leave");
+          expect(isCalled["leave"]).toBe(true);
+
+          actualSubscription.emit("delete");
+          expect(isCalled["delete"]).toBe(true);
+
+          done();
+        } catch(e){
+          done.fail(e);
+        }
+      }, 1); 
+    });
+
+  });
 });