Merge remote-tracking branch 'ParsePlatform/master' into release/1.15.1

* ParsePlatform/master:
  ⚡ Release 1.15.1
  Makes sure we stop the dispatch_source to prevent cycle/leak (parse-community#1161)
  Add Polygon Type and PolygonContain to Query (parse-community#1157)

Author: tkhoa87

Parse.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.15.0'
+  s.version          = '1.15.1'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

Parse.xcodeproj/project.pbxproj

@@ -67,7 +67,7 @@ extern NSTimeInterval const PFEventuallyQueueDefaultTimeoutRetryInterval;
 - (void)start NS_REQUIRES_SUPER;
 - (void)resume NS_REQUIRES_SUPER;
 - (void)pause NS_REQUIRES_SUPER;
-
+- (void)stop NS_REQUIRES_SUPER;
 - (void)removeAllCommands NS_REQUIRES_SUPER;
 
 @end

Parse/Internal/PFEventuallyQueue.h

@@ -197,6 +197,10 @@ - (void)pause {
     dispatch_suspend(_processingQueueSource);
 }
 
+- (void)stop {
+    dispatch_source_cancel(_processingQueueSource);
+}
+
 - (void)removeAllCommands {
     dispatch_sync(_synchronizationQueue, ^{
         [_taskCompletionSources removeAllObjects];

Parse/Internal/PFEventuallyQueue.m

@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <Parse/PFPolygon.h>
+
+@class PFPolygon;
+
+@interface PFPolygon (Private)
+
+// Internal commands
+
+/*
+ Gets the encoded format for a Polygon.
+ */
+- (NSDictionary *)encodeIntoDictionary;
+
+/**
+ Creates a Polygon from its encoded format.
+ */
++ (instancetype)polygonWithDictionary:(NSDictionary *)dictionary;
+
+@end

Parse/Internal/PFPolygonPrivate.h

@@ -16,6 +16,7 @@
 #import "PFEventuallyQueue.h"
 #import "PFFieldOperation.h"
 #import "PFGeoPointPrivate.h"
+#import "PFPolygonPrivate.h"
 #import "PFInternalUtils.h"
 #import "PFKeyValueCache.h"
 #import "PFObjectPrivate.h"

Parse/Internal/ParseInternal.h

@@ -174,12 +174,15 @@ - (PFEventuallyQueue *)eventuallyQueue {
                                 [PFPinningEventuallyQueue newDefaultPinningEventuallyQueueWithDataSource:self]
                                 :
                                 commandCache);
-
             // We still need to clear out the old command cache even if we're using Pinning in case
             // anything is left over when the user upgraded. Checking number of pending and then
             // clearing should be enough.
-            if (self.offlineStoreLoaded && commandCache.commandCount > 0) {
-                [commandCache removeAllCommands];
+            if (self.offlineStoreLoaded) {
+                if (commandCache.commandCount > 0) {
+                    [commandCache removeAllCommands];
+                }
+                // we won't need it after stop everything...
+                [commandCache stop];
             }
         }
 #endif

Parse/Internal/ParseManager.m

@@ -22,6 +22,7 @@ extern NSString *const PFQueryKeyContainsAll;
 extern NSString *const PFQueryKeyNearSphere;
 extern NSString *const PFQueryKeyWithin;
 extern NSString *const PFQueryKeyGeoWithin;
+extern NSString *const PFQueryKeyGeoIntersects;
 extern NSString *const PFQueryKeyRegex;
 extern NSString *const PFQueryKeyExists;
 extern NSString *const PFQueryKeyInQuery;
@@ -37,6 +38,7 @@ extern NSString *const PFQueryKeyObject;
 extern NSString *const PFQueryOptionKeyMaxDistance;
 extern NSString *const PFQueryOptionKeyBox;
 extern NSString *const PFQueryOptionKeyPolygon;
+extern NSString *const PFQueryOptionKeyPoint;
 extern NSString *const PFQueryOptionKeyRegexOptions;
 
 NS_ASSUME_NONNULL_END

Parse/Internal/Query/PFQueryConstants.h

@@ -20,6 +20,7 @@
 NSString *const PFQueryKeyNearSphere = @"$nearSphere";
 NSString *const PFQueryKeyWithin = @"$within";
 NSString *const PFQueryKeyGeoWithin = @"$geoWithin";
+NSString *const PFQueryKeyGeoIntersects = @"$geoIntersects";
 NSString *const PFQueryKeyRegex = @"$regex";
 NSString *const PFQueryKeyExists = @"$exists";
 NSString *const PFQueryKeyInQuery = @"$inQuery";
@@ -35,4 +36,5 @@
 NSString *const PFQueryOptionKeyMaxDistance = @"$maxDistance";
 NSString *const PFQueryOptionKeyBox = @"$box";
 NSString *const PFQueryOptionKeyPolygon = @"$polygon";
+NSString *const PFQueryOptionKeyPoint = @"$point";
 NSString *const PFQueryOptionKeyRegexOptions = @"$options";

Parse/Internal/Query/PFQueryConstants.m

@@ -13,7 +13,7 @@
 #pragma mark - SDK Version
 ///--------------------------------------
 
-#define PARSE_VERSION @"1.15.0"
+#define PARSE_VERSION @"1.15.1"
 
 ///--------------------------------------
 #pragma mark - Platform

Parse/PFConstants.h

@@ -15,6 +15,7 @@
 #import "PFFieldOperationDecoder.h"
 #import "PFFile_Private.h"
 #import "PFGeoPointPrivate.h"
+#import "PFPolygonPrivate.h"
 #import "PFInternalUtils.h"
 #import "PFMacros.h"
 #import "PFObjectPrivate.h"
@@ -56,6 +57,9 @@ - (id)decodeDictionary:(NSDictionary *)dictionary {
         } else if ([type isEqualToString:@"GeoPoint"]) {
             return [PFGeoPoint geoPointWithDictionary:dictionary];
 
+        } else if ([type isEqualToString:@"Polygon"]) {
+            return [PFPolygon polygonWithDictionary:dictionary];
+
         } else if ([type isEqualToString:@"Relation"]) {
             return [PFRelation relationFromDictionary:dictionary withDecoder:self];
 

Parse/PFDecoder.m

@@ -16,6 +16,7 @@
 #import "PFFieldOperation.h"
 #import "PFFile_Private.h"
 #import "PFGeoPointPrivate.h"
+#import "PFPolygonPrivate.h"
 #import "PFObjectPrivate.h"
 #import "PFOfflineStore.h"
 #import "PFRelationPrivate.h"
@@ -75,6 +76,10 @@ - (id)encodeObject:(id)object {
         // TODO (hallucinogen): pass object encoder here
         return [object encodeIntoDictionary];
 
+    } else if ([object isKindOfClass:[PFPolygon class]]) {
+        // TODO (hallucinogen): pass object encoder here
+        return [object encodeIntoDictionary];
+
     } else if ([object isKindOfClass:[PFRelation class]]) {
         // TODO (hallucinogen): pass object encoder here
         return [object encodeIntoDictionary];

Parse/PFEncoder.m

@@ -0,0 +1,55 @@
+/**
+ * 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.
+ */
+
+#import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
+#import "PFGeoPoint.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class PFPolygon;
+
+/**
+ `PFPolygon` may be used to embed a latitude / longitude points as the value for a key in a `PFObject`.
+ It could be used to perform queries in a geospatial manner using `PFQuery.-whereKey:polygonContains:`.
+ */
+@interface PFPolygon : NSObject <NSCopying, NSCoding>
+
+///--------------------------------------
+#pragma mark - Creating a Polygon
+///--------------------------------------
+
+/**
+ Creates a new `PFPolygon` object for the given `CLLocation`, set to the location's coordinates.
+
+ @param coordinates Array of `CLLocation`, `PFGeoPoint` or `(lat,lng)`
+ @return Returns a new PFPolygon at specified location.
+ */
++ (instancetype)polygonWithCoordinates:(NSArray *)coordinates;
+
+/**
+ Test if this polygon contains a point
+ 
+ @param point `PFGeoPoint` to test
+ @return Returns a boolean.
+ */
+- (BOOL)containsPoint:(PFGeoPoint *)point;
+
+///--------------------------------------
+#pragma mark - Controlling Position
+///--------------------------------------
+
+/**
+ Array of `PFGeoPoints` or CLLocations
+ */
+@property (nonatomic, strong) NSArray* coordinates;
+
+@end
+
+NS_ASSUME_NONNULL_END