BrightFutures 2.0

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/Result"]
+	path = Carthage/Checkouts/Result
+	url = https://github.com/antitypical/Result.git

BrightFutures.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'BrightFutures'
-  s.version = '1.0.1'
+  s.version = '2.0.0'
   s.license = 'MIT'
   s.summary = 'A simple Futures & Promises library for iOS and OS X written in Swift'
   s.homepage = 'https://github.com/Thomvis/BrightFutures'
@@ -13,5 +13,7 @@ Pod::Spec.new do |s|
 
   s.source_files = 'BrightFutures/*.swift'
 
+  s.dependency 'Result', '~> 0.4.3'
+
   s.requires_arc = true
 end

BrightFutures.xcodeproj/xcshareddata/xcschemes/BrightFutures-Mac.xcscheme

@@ -22,10 +22,10 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "E9D45B091AF00659000F6CA7"

BrightFutures.xcodeproj/xcshareddata/xcschemes/BrightFutures-iOS.xcscheme

@@ -22,10 +22,10 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "E9DF081F194470060083F7F2"

BrightFutures.xcworkspace/xcshareddata/BrightFutures.xccheckout

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>3A31C8B6-B0CD-4D79-9DFB-AE57C9B04C9F</string>
+	<key>IDESourceControlProjectName</key>
+	<string>BrightFutures</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>57C931977B7D2307CC013C2BD93F90CF7C676790</key>
+		<string>https://github.com/robrix/Box.git</string>
+		<key>93608FFF008CD82ADDFA850BB9C1630FA754586F</key>
+		<string>github.com:Thomvis/BrightFutures.git</string>
+		<key>956D2B21DD155C49504BB67697A67F7C5351A353</key>
+		<string>https://github.com/antitypical/Result.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>BrightFutures.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>57C931977B7D2307CC013C2BD93F90CF7C676790</key>
+		<string>..Carthage/Checkouts/Result/Carthage/Checkouts/Box</string>
+		<key>93608FFF008CD82ADDFA850BB9C1630FA754586F</key>
+		<string>..</string>
+		<key>956D2B21DD155C49504BB67697A67F7C5351A353</key>
+		<string>..Carthage/Checkouts/Result</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>github.com:Thomvis/BrightFutures.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>93608FFF008CD82ADDFA850BB9C1630FA754586F</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>57C931977B7D2307CC013C2BD93F90CF7C676790</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Box</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>93608FFF008CD82ADDFA850BB9C1630FA754586F</string>
+			<key>IDESourceControlWCCName</key>
+			<string>BrightFutures</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>956D2B21DD155C49504BB67697A67F7C5351A353</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Result</string>
+		</dict>
+	</array>
+</dict>
+</plist>

BrightFutures/Errors.swift

@@ -0,0 +1,95 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2014 Thomas Visser
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import Foundation
+import Box
+
+/// To be able to use a type as an error type with BrightFutures, it needs to conform
+/// to this protocol.
+public protocol ErrorType {
+    /// An NSError describing this error
+    var nsError: NSError { get }
+}
+
+/// Can be used as the value type of a `Future` or `Result` to indicate it can never fail.
+/// This is guaranteed by the type system, because `NoError` has no possible values and thus cannot be created.
+public enum NoError {}
+
+/// Extends `NSError` to conform to `ErrorType`
+extension NoError: ErrorType {
+
+    /// From `ErrorType`: an NSError describing this error.
+    /// Since `NoError` cannot be constructed, this property can also never be accessed.
+    public var nsError: NSError {
+        fatalError("Impossible to construct NoError")
+    }
+}
+
+/// An extension of `NSError` to make it conform to `ErrorType`
+extension NSError: ErrorType {
+
+    /// From `ErrorType`: An NSError describing this error.
+    /// Will return `self`.
+    public var nsError: NSError {
+        return self
+    }
+}
+
+/// The name of the domain that will be used when returning `NSError` representations of `BrightFuturesError` instances
+public let BrightFuturesErrorDomain = "nl.thomvis.BrightFutures"
+
+/// An enum representing every possible error for errors returned by BrightFutures
+/// A `BrightFuturesError` can also wrap an external error (e.g. coming from a user defined future)
+/// in its `External` case. `BrightFuturesError` has the type of the external error as its generic parameter.
+public enum BrightFuturesError<E: ErrorType>: ErrorType {
+
+    case NoSuchElement
+    case InvalidationTokenInvalidated
+    case External(Box<E>)
+
+    /// Constructs a BrightFutures.External with the given external error
+    public init(external: E) {
+        self = .External(Box(external))
+    }
+
+    /// From `ErrorType`: An NSError describing this error.
+    public var nsError: NSError {
+        switch self {
+        case .NoSuchElement:
+            return NSError(domain: BrightFuturesErrorDomain, code: 0, userInfo: nil)
+        case .InvalidationTokenInvalidated:
+            return NSError(domain: BrightFuturesErrorDomain, code: 1, userInfo: nil)
+        case .External(let boxedError):
+            return boxedError.value.nsError
+        }
+    }
+}
+
+/// Returns `true` if `left` and `right` are both of the same case ignoring .External associated value
+public func ==<E: Equatable>(lhs: BrightFuturesError<E>, rhs: BrightFuturesError<E>) -> Bool {
+    switch (lhs, rhs) {
+    case (.NoSuchElement, .NoSuchElement): return true
+    case (.InvalidationTokenInvalidated, .InvalidationTokenInvalidated): return true
+    case (.External(let lhs), .External(let rhs)): return lhs == rhs
+    default: return false
+    }
+}

BrightFutures/ExecutionContext.swift

@@ -26,7 +26,8 @@ import Foundation
 /// By default, an execution context can be assumed to be asynchronous unless stated otherwise
 public typealias ExecutionContext = (() -> ()) -> ()
 
-public func ImmediateExecutionContext(task: () -> ())  {
+/// Immediately executes the given task. No threading, no semaphores.
+public func ImmediateExecutionContext(@noescape task: () -> ())  {
     task()
 }