created TimerCreator which allows to inject a mock timer into ImperativeGestureReactor for testability

Author: fabb

functional-reactive-intuition/Project/RFP.xcodeproj/project.pbxproj

@@ -20,6 +20,7 @@
 		1FD5DC431C69D4B60050B3D9 /* ImperativeGestureReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD5DC421C69D4B60050B3D9 /* ImperativeGestureReactor.swift */; };
 		1FD5DC451C69D60C0050B3D9 /* GestureReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD5DC441C69D60C0050B3D9 /* GestureReactor.swift */; };
 		1FD5DC471C69D7EE0050B3D9 /* ReactiveGestureReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD5DC461C69D7EE0050B3D9 /* ReactiveGestureReactor.swift */; };
+		1FE3E4351C6C782F00804CA2 /* TimerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE3E4341C6C782F00804CA2 /* TimerProtocol.swift */; };
 		B48DEEE7DD9FCD9E8F77A13B /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3577BA56804CC07EC782AF /* Pods.framework */; };
 /* End PBXBuildFile section */
 
@@ -52,6 +53,7 @@
 		1FD5DC421C69D4B60050B3D9 /* ImperativeGestureReactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImperativeGestureReactor.swift; sourceTree = "<group>"; };
 		1FD5DC441C69D60C0050B3D9 /* GestureReactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GestureReactor.swift; sourceTree = "<group>"; };
 		1FD5DC461C69D7EE0050B3D9 /* ReactiveGestureReactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveGestureReactor.swift; sourceTree = "<group>"; };
+		1FE3E4341C6C782F00804CA2 /* TimerProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimerProtocol.swift; sourceTree = "<group>"; };
 		350C6FD680F3FD2ADAEA261D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		AA3577BA56804CC07EC782AF /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -111,6 +113,7 @@
 				1FD5DC441C69D60C0050B3D9 /* GestureReactor.swift */,
 				1FD5DC461C69D7EE0050B3D9 /* ReactiveGestureReactor.swift */,
 				1FB180CB1C6C72EF008BC2D1 /* UIGestureRecognizerProtocol.swift */,
+				1FE3E4341C6C782F00804CA2 /* TimerProtocol.swift */,
 			);
 			path = RFP;
 			sourceTree = "<group>";
@@ -300,6 +303,7 @@
 				0C153D611C4F001300CBD947 /* Observable+Extension.swift in Sources */,
 				0CDDAB481C56C21C00D5DA3D /* ReactiveShortViewController.swift in Sources */,
 				1FD5DC451C69D60C0050B3D9 /* GestureReactor.swift in Sources */,
+				1FE3E4351C6C782F00804CA2 /* TimerProtocol.swift in Sources */,
 				0C9FFB351C46625F00FD6C05 /* ReactiveViewController.swift in Sources */,
 				1FB180CC1C6C72EF008BC2D1 /* UIGestureRecognizerProtocol.swift in Sources */,
 			);

functional-reactive-intuition/Project/RFP/ImperativeGestureReactor.swift

@@ -6,11 +6,18 @@ import UIKit
 
 	var delegate: GestureReactorDelegate?
 
+	var timerCreator: TimerCreator
+	
 	var panPresent = false
 	var pinchPresent = false
-	var gestureTimer: NSTimer?
+	var gestureTimer: TimerType?
 	var secondsLeft = 3
 
+	init(timerCreator: TimerCreator) {
+		self.timerCreator = timerCreator
+		super.init()
+	}
+	
 	func handlePan(panGesture: UIPanGestureRecognizerType) {
 		if panGesture.state == .Began && self.panPresent == false {
 			self.panPresent = true
@@ -34,7 +41,9 @@ import UIKit
 	func checkIfBothGesturesPresent() {
 		if self.pinchPresent == true && self.panPresent == true && self.gestureTimer == nil {
 			self.secondsLeft = 3
-			self.gestureTimer = NSTimer.scheduledTimerWithTimeInterval(1, target: self, selector: "tick:", userInfo: nil, repeats: true)
+			self.gestureTimer = timerCreator(interval: 1, repeats: true, onTick: { [weak self] sender in
+				self?.tick(sender)
+			})
 			delegate?.didStart()
 		}
 	}
@@ -47,7 +56,7 @@ import UIKit
 		}
 	}
 
-	func tick(timer: NSTimer) {
+	func tick(timer: TimerType) {
 		if self.secondsLeft <= 0 {
 			self.stopTimerIfNeeded()
 			return

functional-reactive-intuition/Project/RFP/ImperativeViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class ImperativeViewController: UIViewController, UIGestureRecognizerDelegate, GestureReactorDelegate {
 
-	var gestureReactor: GestureReactor = ImperativeGestureReactor()
+	var gestureReactor: GestureReactor = ImperativeGestureReactor(timerCreator: { interval, repeats, onTick in Timer(interval: interval, repeats: repeats, onTick: onTick) })
 
 	override func viewDidLoad() {
 		super.viewDidLoad()

functional-reactive-intuition/Project/RFP/TimerProtocol.swift

@@ -0,0 +1,33 @@
+import Foundation
+
+
+typealias TimerCreator = (interval: NSTimeInterval, repeats: Bool, onTick: TimerTicker) -> TimerType
+typealias TimerTicker = (sender: TimerType) -> Void
+
+
+protocol TimerType {
+	
+	func invalidate()
+	
+}
+
+@objc class Timer: NSObject, TimerType {
+	
+	private var timer: NSTimer?
+	private let onTick: TimerTicker
+		
+	init(interval: NSTimeInterval, repeats: Bool, onTick: TimerTicker) {
+		self.onTick = onTick
+		super.init()
+		timer = NSTimer.scheduledTimerWithTimeInterval(interval, target: self, selector: "tick", userInfo: nil, repeats: repeats)
+	}
+	
+	func tick() {
+		onTick(sender: self)
+	}
+	
+	func invalidate() {
+		timer?.invalidate()
+	}
+
+}