Merge pull request #472 from Igor-Palaguta/AndWithMutableProperty

MutableProperty can be right operand in logical operations

Author: andersio

Sources/Property.swift

@@ -383,7 +383,7 @@ extension PropertyProtocol where Value == Bool {
 	///   - property: Property to be combined with `self`.
 	///
 	/// - returns: A property that contains the logial AND results.
-	public func and(_ property: Property<Value>) -> Property<Value> {
+	public func and<P: PropertyProtocol>(_ property: P) -> Property<Value> where P.Value == Value {
 		return self.lift(SignalProducer.and)(property)
 	}
 
@@ -394,7 +394,7 @@ extension PropertyProtocol where Value == Bool {
 	///   - property: Property to be combined with `self`.
 	///
 	/// - returns: A property that contains the logial OR results.
-	public func or(_ property: Property<Value>) -> Property<Value> {
+	public func or<P: PropertyProtocol>(_ property: P) -> Property<Value> where P.Value == Value {
 		return self.lift(SignalProducer.or)(property)
 	}
 }

Tests/ReactiveSwiftTests/PropertySpec.swift

@@ -1571,27 +1571,27 @@ class PropertySpec: QuickSpec {
 			describe("and attribute") {
 				it("should emit true when both properties contains the same value") {
 					let property1 = MutableProperty(true)
-					let property2 = Property(MutableProperty(true))
+					let property2 = MutableProperty(true)
 					expect(property1.and(property2).value).to(beTrue())
 				}
 
 				it("should emit false when both properties contains opposite values") {
 					let property1 = MutableProperty(true)
-					let property2 = Property(MutableProperty(false))
+					let property2 = MutableProperty(false)
 					expect(property1.and(property2).value).to(beFalse())
 				}
 			}
 
 			describe("or attribute") {
 				it("should emit true when at least one of the properties contains true") {
 					let property1 = MutableProperty(true)
-					let property2 = Property(MutableProperty(false))
+					let property2 = MutableProperty(false)
 					expect(property1.or(property2).value).to(beTrue())
 				}
 
 				it("should emit false when both properties contains false") {
 					let property1 = MutableProperty(false)
-					let property2 = Property(MutableProperty(false))
+					let property2 = MutableProperty(false)
 					expect(property1.or(property2).value).to(beFalse())
 				}
 			}