Merge branch 'fix/canEditRowAtIndexPath' of git://github.com/serluca/RxDataSources into serluca-fix/canEditRowAtIndexPath

kzaher · kzaher · commit 8508464d5fd0 · 2016-06-20T21:55:02.000+02:00
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "2.4"
+github "ReactiveX/RxSwift" "2.5.0"
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - RxCocoa (2.4):
-    - RxSwift (~> 2.4)
-  - RxSwift (2.4)
+  - RxCocoa (2.5.0):
+    - RxSwift (~> 2.5)
+  - RxSwift (2.5.0)
 
 DEPENDENCIES:
   - RxCocoa (~> 2.4)
   - RxSwift (~> 2.4)
 
 SPEC CHECKSUMS:
-  RxCocoa: 7d6cd877de99f5640306b3d6cf87f580c1d91b61
-  RxSwift: 67b9ef4e8b34fb394e200e754c6a09cc16559f94
+  RxCocoa: e1b1562e57a554d0fb2aabf9d71b637f177257c7
+  RxSwift: 402b41a50e922a0368fc14cb3bc9f4427920e8ae
 
 PODFILE CHECKSUM: 2bee9e71ef9f4d55178dc0c062c7349d481a71f5
 
-COCOAPODS: 1.0.0.rc.2
+COCOAPODS: 1.0.1
diff --git a/RxDataSources.xcodeproj/project.pbxproj b/RxDataSources.xcodeproj/project.pbxproj
@@ -539,13 +539,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C8984CAA1C36B6FA001E4272 /* Build configuration list for PBXNativeTarget "Example" */;
 			buildPhases = (
-				CE301EF235F2B45D0C3E30B9 /* 📦 Check Pods Manifest.lock */,
+				CE301EF235F2B45D0C3E30B9 /* [CP] Check Pods Manifest.lock */,
 				C8984C971C36B6FA001E4272 /* Sources */,
 				C8984C981C36B6FA001E4272 /* Frameworks */,
 				C8984C991C36B6FA001E4272 /* Resources */,
 				C8EC65CA1C4C441B00FC9207 /* Embed Frameworks */,
-				5D41B451D84BA67C35C4AC67 /* 📦 Embed Pods Frameworks */,
-				FF90FC9979157345588A89F5 /* 📦 Copy Pods Resources */,
+				5D41B451D84BA67C35C4AC67 /* [CP] Embed Pods Frameworks */,
+				FF90FC9979157345588A89F5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -598,12 +598,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C8BB767E1C4C3E53002B21C8 /* Build configuration list for PBXNativeTarget "RxDataSources" */;
 			buildPhases = (
-				C6F25DB535B519D2FD763EC9 /* 📦 Check Pods Manifest.lock */,
+				C6F25DB535B519D2FD763EC9 /* [CP] Check Pods Manifest.lock */,
 				C8BB765F1C4C3E53002B21C8 /* Sources */,
 				C8BB76761C4C3E53002B21C8 /* Frameworks */,
 				C8BB767A1C4C3E53002B21C8 /* Headers */,
 				C8BB767C1C4C3E53002B21C8 /* Resources */,
-				07272154CEBF20D8EC983364 /* 📦 Copy Pods Resources */,
+				07272154CEBF20D8EC983364 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -714,74 +714,74 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		07272154CEBF20D8EC983364 /* 📦 Copy Pods Resources */ = {
+		07272154CEBF20D8EC983364 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxDataSources/Pods-RxDataSources-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		5D41B451D84BA67C35C4AC67 /* 📦 Embed Pods Frameworks */ = {
+		5D41B451D84BA67C35C4AC67 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C6F25DB535B519D2FD763EC9 /* 📦 Check Pods Manifest.lock */ = {
+		C6F25DB535B519D2FD763EC9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		CE301EF235F2B45D0C3E30B9 /* 📦 Check Pods Manifest.lock */ = {
+		CE301EF235F2B45D0C3E30B9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		FF90FC9979157345588A89F5 /* 📦 Copy Pods Resources */ = {
+		FF90FC9979157345588A89F5 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Sources/DataSources/TableViewSectionedDataSource.swift b/Sources/DataSources/TableViewSectionedDataSource.swift
@@ -57,12 +57,8 @@ public class _TableViewSectionedDataSource
         return _rx_tableView(tableView, titleForFooterInSection: section)
     }
 
-    public var canEditRowAtIndexPathImplemented: Bool {
-        return false
-    }
-
     func _rx_tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return true
+        return false
     }
     
     public func tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {
@@ -100,13 +96,6 @@ public class _TableViewSectionedDataSource
         _rx_tableView(tableView, moveRowAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)
     }
 
-    override public func respondsToSelector(aSelector: Selector) -> Bool {
-        if aSelector == #selector(UITableViewDataSource.tableView(_:canEditRowAtIndexPath:)) {
-            return self.canEditRowAtIndexPathImplemented
-        }
-
-        return super.respondsToSelector(aSelector)
-    }
 }
 
 public class RxTableViewSectionedDataSource<S: SectionModelType>
@@ -197,10 +186,6 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
         }
     }
 
-    override public var canEditRowAtIndexPathImplemented: Bool {
-        let result = canEditRowAtIndexPath != nil
-        return result
-    }
     public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: NSIndexPath) -> Bool)? {
         didSet {
             #if DEBUG
@@ -209,7 +194,6 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
         }
     }
 
-    
     public var sectionIndexTitles: ((RxTableViewSectionedDataSource<S>) -> [String]?)? {
         didSet {
             #if DEBUG

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveX/RxSwift" "2.4"`
	`1`	`+github "ReactiveX/RxSwift" "2.5.0"`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,8 @@ public class _TableViewSectionedDataSource`
`57`	`57`	`return _rx_tableView(tableView, titleForFooterInSection: section)`
`58`	`58`	`}`
`59`	`59`
`60`		`- public var canEditRowAtIndexPathImplemented: Bool {`
`61`		`- return false`
`62`		`- }`
`63`		`-`
`64`	`60`	`func _rx_tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {`
`65`		`- return true`
	`61`	`+ return false`
`66`	`62`	`}`
`67`	`63`
`68`	`64`	`public func tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {`
`@@ -100,13 +96,6 @@ public class _TableViewSectionedDataSource`
`100`	`96`	`_rx_tableView(tableView, moveRowAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)`
`101`	`97`	`}`
`102`	`98`
`103`		`- override public func respondsToSelector(aSelector: Selector) -> Bool {`
`104`		`- if aSelector == #selector(UITableViewDataSource.tableView(_:canEditRowAtIndexPath:)) {`
`105`		`- return self.canEditRowAtIndexPathImplemented`
`106`		`- }`
`107`		`-`
`108`		`- return super.respondsToSelector(aSelector)`
`109`		`- }`
`110`	`99`	`}`
`111`	`100`
`112`	`101`	`public class RxTableViewSectionedDataSource<S: SectionModelType>`
`@@ -197,10 +186,6 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`197`	`186`	`}`
`198`	`187`	`}`
`199`	`188`
`200`		`- override public var canEditRowAtIndexPathImplemented: Bool {`
`201`		`- let result = canEditRowAtIndexPath != nil`
`202`		`- return result`
`203`		`- }`
`204`	`189`	`public var canMoveRowAtIndexPath: ((RxTableViewSectionedDataSource<S>, indexPath: NSIndexPath) -> Bool)? {`
`205`	`190`	`didSet {`
`206`	`191`	`#if DEBUG`
`@@ -209,7 +194,6 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>`
`209`	`194`	`}`
`210`	`195`	`}`
`211`	`196`
`212`		`-`
`213`	`197`	`public var sectionIndexTitles: ((RxTableViewSectionedDataSource<S>) -> [String]?)? {`
`214`	`198`	`didSet {`
`215`	`199`	`#if DEBUG`