Merge pull request #58 from ddddxxx/rethrows

Make blocks throwable
devxoul · Nov 14, 2017 · 651cb5b · 651cb5b
2 parents f12a47f + 9016109
commit 651cb5b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Sources/Then/Then.swift b/Sources/Then/Then.swift
@@ -36,9 +36,9 @@ extension Then where Self: Any {
   ///       $0.origin.x = 10
   ///       $0.size.width = 100
   ///     }
-  public func with(_ block: (inout Self) -> Void) -> Self {
+  public func with(_ block: (inout Self) throws -> Void) rethrows -> Self {
     var copy = self
-    block(&copy)
+    try block(&copy)
     return copy
   }
 
@@ -49,8 +49,8 @@ extension Then where Self: Any {
   ///       $0.set("devxoul@gmail.com", forKey: "email")
   ///       $0.synchronize()
   ///     }
-  public func `do`(_ block: (Self) -> Void) {
-    block(self)
+  public func `do`(_ block: (Self) throws -> Void) rethrows {
+    try block(self)
   }
 
 }
@@ -64,8 +64,8 @@ extension Then where Self: AnyObject {
   ///       $0.textColor = UIColor.blackColor()
   ///       $0.text = "Hello, World!"
   ///     }
-  public func then(_ block: (Self) -> Void) -> Self {
-    block(self)
+  public func then(_ block: (Self) throws -> Void) rethrows -> Self {
+    try block(self)
     return self
   }
 

diff --git a/Tests/ThenTests/ThenTests.swift b/Tests/ThenTests/ThenTests.swift
@@ -44,4 +44,12 @@ class ThenTests: XCTestCase {
     XCTAssertEqual(UserDefaults.standard.string(forKey: "username"), "devxoul")
   }
 
+  func testRethrows() {
+    XCTAssertThrowsError(
+      try NSObject().do { _ in
+        throw NSError(domain: "", code: 0)
+      }
+    )
+  }
+
 }