Merge pull request #548 from ParsePlatform/nlutsenko.modern.file

Convert isDataAvailable, isDirty methods in PFFile to properties.

Author: nlutsenko

Parse/Internal/PFEncoder.m

@@ -47,7 +47,7 @@ - (id)encodeObject:(id)object {
                  };
 
     } else if ([object isKindOfClass:[PFFile class]]) {
-        if (((PFFile *)object).isDirty) {
+        if (((PFFile *)object).dirty) {
             // TODO: (nlutsenko) Figure out what to do with things like an unsaved file
             // in a mutable container, where we don't normally want to allow serializing
             // such a thing inside an object.

Parse/PFFile.h

@@ -145,7 +145,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  @abstract Whether the file has been uploaded for the first time.
  */
-@property (nonatomic, assign, readonly) BOOL isDirty;
+@property (nonatomic, assign, readonly, getter=isDirty) BOOL dirty;
 
 ///--------------------------------------
 /// @name Storing Data with Parse
@@ -220,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  @abstract Whether the data is available in memory or needs to be downloaded.
  */
-@property (nonatomic, assign, readonly) BOOL isDataAvailable;
+@property (nonatomic, assign, readonly, getter=isDataAvailable) BOOL dataAvailable;
 
 /*!
  @abstract *Synchronously* gets the data from cache if available or fetches its contents from the network.

Parse/PFFile.m

@@ -37,7 +37,6 @@ @interface PFFile () {
 
 @property (nonatomic, strong, readwrite) PFFileState *state;
 @property (nonatomic, copy, readonly) NSString *stagedFilePath;
-@property (nonatomic, assign, readonly, getter=isDirty) BOOL dirty;
 
 //
 // Private
@@ -389,7 +388,7 @@ - (BFTask *)_downloadAsyncWithProgressBlock:(PFProgressBlock)progressBlock {
     @weakify(self);
     return [self.taskQueue enqueue:^id(BFTask *task) {
         @strongify(self);
-        if (self.isDataAvailable) {
+        if (self.dataAvailable) {
             [self _performProgressBlockAsync:progressBlock withProgress:100];
             return [BFTask taskWithResult:nil];
         }
@@ -418,7 +417,7 @@ - (BFTask *)_downloadStreamAsyncWithProgressBlock:(PFProgressBlock)progressBlock
     @weakify(self);
     return [self.taskQueue enqueue:^id(BFTask *task) {
         @strongify(self);
-        if (self.isDataAvailable) {
+        if (self.dataAvailable) {
             [self _performProgressBlockAsync:progressBlock withProgress:100];
             return [self _cachedDataStream];
         }

Tests/Unit/FileUnitTests.m

@@ -140,53 +140,53 @@ - (void)testContructors {
     PFFile *file = [PFFile fileWithData:[NSData data]];
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     file = [PFFile fileWithData:[NSData data] contentType:@"content-type"];
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     file = [PFFile fileWithName:@"name" data:[NSData data]];
     XCTAssertEqualObjects(file.name, @"name");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     file = [PFFile fileWithName:nil contentsAtPath:[self sampleFilePath]];
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     NSError *error = nil;
     file = [PFFile fileWithName:nil contentsAtPath:[self sampleFilePath] error:&error];
     XCTAssertNil(error);
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     file = [PFFile fileWithName:nil data:[NSData data] contentType:@"content-type"];
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 
     [self clearStagingAndTemporaryFiles];
     file = [PFFile fileWithName:nil data:[NSData data] contentType:@"content-type" error:&error];
     XCTAssertNil(error);
     XCTAssertEqualObjects(file.name, @"file");
     XCTAssertNil(file.url);
-    XCTAssertTrue(file.isDirty);
-    XCTAssertTrue(file.isDataAvailable);
+    XCTAssertTrue(file.dirty);
+    XCTAssertTrue(file.dataAvailable);
 }
 
 - (void)testConstructorWithTooLargeData {