remove peek in favor of value property

Sources/Observable+Result.swift

@@ -37,7 +37,7 @@ public extension Observable where T : ResultType {
         return self
     }
 
-    public func peekValue() -> T.Value? {
-        return peek()?.value
+    public func peek() -> T.Value? {
+        return self.value?.value
     }
 }

Sources/Observable.swift

@@ -19,7 +19,7 @@ public struct ObservingOptions: OptionSet {
 public final class Observable<T> {
     fileprivate typealias Observer = (T)->Void
     fileprivate var observers = [ObserverToken: Observer]()
-    fileprivate var lastValue: T?
+    public private(set) var value: T?
     public let options: ObservingOptions
     fileprivate let mutex = Mutex()
 
@@ -30,7 +30,7 @@ public final class Observable<T> {
     public init(_ value: T, options: ObservingOptions = []) {
         self.options = options
         if !options.contains(.NoInitialValue){
-            lastValue = value
+            self.value = value
         }
     }
 
@@ -39,10 +39,10 @@ public final class Observable<T> {
         mutex.lock {
             let newHashValue = (observers.keys.map({$0.hashValue}).max() ?? -1) + 1
             token = ObserverToken(hashValue: newHashValue)
-            if !(options.contains(.Once) && lastValue != nil) {
+            if !(options.contains(.Once) && value != nil) {
                 observers[token] = observer
             }
-            if let value = lastValue , !options.contains(.NoInitialValue) {
+            if let value = value , !options.contains(.NoInitialValue) {
                 observer(value)
             }
         }
@@ -52,7 +52,7 @@ public final class Observable<T> {
     public func update(_ value: T) {
         mutex.lock {
             if !options.contains(.NoInitialValue) {
-                lastValue = value
+                self.value = value
             }
             for observe in observers.values {
                 observe(value)
@@ -62,10 +62,6 @@ public final class Observable<T> {
             }
         }
     }
-
-    public func peek() -> T? {
-        return lastValue
-    }
 
     public func unsubscribe(_ token: ObserverToken) {
         mutex.lock {

Tests/ObservableTests.swift

@@ -21,12 +21,12 @@ class ObservableTests: XCTestCase {
 
     func testMappingAnObservable() {
         let greeting = Observable("World").map(greeter)
-        XCTAssertEqual(greeting.peek(), "Hello World")
+        XCTAssertEqual(greeting.value, "Hello World")
     }
 
     func testFlatMappingObservable() {
         let greeting = Observable("World").flatMap(greetLater)
-        XCTAssertEqual(greeting.peek(), "Hello World")
+        XCTAssertEqual(greeting.value, "Hello World")
     }
 
     func testSubscription() {
@@ -62,9 +62,9 @@ class ObservableTests: XCTestCase {
 
     func testLiveSubscriptions() {
         let observable = Observable<String>("Hello", options:[.NoInitialValue])
-        XCTAssertNil(observable.peek())
+        XCTAssertNil(observable.value)
         observable.update("Hello")
-        XCTAssertNil(observable.peek())
+        XCTAssertNil(observable.value)
     }
 
     func testUnsubscribe() {

Tests/ResultObservableTests.swift

@@ -33,11 +33,11 @@ class ResultObservableTests: XCTestCase {
 
     func testContinuingTheChain() {
         let greeting = world.then(greeter).then(throwingGreeter)
-        XCTAssertEqual(greeting.peekValue(), "Hello Hello World")
+        XCTAssertEqual(greeting.peek(), "Hello Hello World")
     }
 
     func testError() {
-        let greeting = nothing.then(throwingGreeter).peekValue()
+        let greeting = nothing.then(throwingGreeter).peek()
         XCTAssertNil(greeting)
     }
 }