Closed #40

Revolucent · Revolucent · commit c0247d97bb67 · 2016-04-21T15:36:10.000-04:00
diff --git a/CoreDataQueryInterface.xcodeproj/project.pbxproj b/CoreDataQueryInterface.xcodeproj/project.pbxproj
@@ -109,6 +109,8 @@
 		F39C7A741B718E34008DB31C /* CoreDataQueryInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F37C46A51B2A780200B35B1B /* CoreDataQueryInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F39E485D1CB0208F00A60255 /* NSManagedObjectID.swift in Sources */ = {isa = PBXBuildFile; fileRef = F39E485C1CB0208F00A60255 /* NSManagedObjectID.swift */; };
 		F39E485E1CB0214900A60255 /* NSManagedObjectID.swift in Sources */ = {isa = PBXBuildFile; fileRef = F39E485C1CB0208F00A60255 /* NSManagedObjectID.swift */; };
+		F3AE4B191CC960F100AAEE1D /* PredicateComparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3AE4B181CC960F100AAEE1D /* PredicateComparable.swift */; };
+		F3AE4B1A1CC960F100AAEE1D /* PredicateComparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3AE4B181CC960F100AAEE1D /* PredicateComparable.swift */; };
 		F3E6B5501B2BFCA500F735EE /* FilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E6B54F1B2BFCA500F735EE /* FilterTests.swift */; };
 		F3E6B5511B2BFCA500F735EE /* FilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E6B54F1B2BFCA500F735EE /* FilterTests.swift */; };
 		F3E6B5531B2C01CC00F735EE /* OrderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E6B5521B2C01CC00F735EE /* OrderTests.swift */; };
@@ -193,6 +195,7 @@
 		F38B43031CB04AFE0028E515 /* EntityAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntityAttribute.swift; sourceTree = "<group>"; };
 		F39C7A711B718DB2008DB31C /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		F39E485C1CB0208F00A60255 /* NSManagedObjectID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSManagedObjectID.swift; sourceTree = "<group>"; };
+		F3AE4B181CC960F100AAEE1D /* PredicateComparable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredicateComparable.swift; sourceTree = "<group>"; };
 		F3DEBD9F1B40FCCD00EE1382 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = "<group>"; };
 		F3E6B54F1B2BFCA500F735EE /* FilterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterTests.swift; sourceTree = "<group>"; };
 		F3E6B5521B2C01CC00F735EE /* OrderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderTests.swift; sourceTree = "<group>"; };
@@ -293,6 +296,7 @@
 				F371ABD51B2BC14A002A8A85 /* Ordering.swift */,
 				F37A46F41B2BD77900D4EE61 /* Predicate.swift */,
 				F35DD3671CAF8BC400FB2EF8 /* PredicateBuilder.swift */,
+				F3AE4B181CC960F100AAEE1D /* PredicateComparable.swift */,
 				F371ABB71B2BA8BA002A8A85 /* QueryBuilder.swift */,
 				F371ABC61B2BB80E002A8A85 /* QueryType.swift */,
 				F371ABDF1B2BC1F7002A8A85 /* Selecting.swift */,
@@ -531,6 +535,7 @@
 				F371ABBA1B2BA8BA002A8A85 /* QueryBuilder.swift in Sources */,
 				F371ABE21B2BC1F7002A8A85 /* Selecting.swift in Sources */,
 				F39E485E1CB0214900A60255 /* NSManagedObjectID.swift in Sources */,
+				F3AE4B1A1CC960F100AAEE1D /* PredicateComparable.swift in Sources */,
 				F33863A41C322DB700818352 /* CustomPropertyConvertible.swift in Sources */,
 				F37A46F21B2BD61700D4EE61 /* Attribute.swift in Sources */,
 				8EC22BC11CAA3AE400642BB6 /* TypedExpressionConvertible.swift in Sources */,
@@ -595,6 +600,7 @@
 				F371ABB81B2BA8BA002A8A85 /* QueryBuilder.swift in Sources */,
 				F371ABE01B2BC1F7002A8A85 /* Selecting.swift in Sources */,
 				F39E485D1CB0208F00A60255 /* NSManagedObjectID.swift in Sources */,
+				F3AE4B191CC960F100AAEE1D /* PredicateComparable.swift in Sources */,
 				F33863A21C322DB700818352 /* CustomPropertyConvertible.swift in Sources */,
 				F37A46F01B2BD61700D4EE61 /* Attribute.swift in Sources */,
 				8EC22BBF1CAA37D500642BB6 /* TypedExpressionConvertible.swift in Sources */,
diff --git a/CoreDataQueryInterface/Attribute.swift b/CoreDataQueryInterface/Attribute.swift
@@ -29,7 +29,7 @@ import CoreData
  The base class for attributes.
  - note: Don't use this class directly. Create or use one of its subclasses, such as `KeyAttribute`.
 */
-public class Attribute: CustomStringConvertible, CustomExpressionConvertible {
+public class Attribute: CustomStringConvertible, CustomExpressionConvertible, PredicateComparable {
     private let _name: String?
     private let _parent: Attribute?
     private let _type: NSAttributeType?
diff --git a/CoreDataQueryInterface/Count.swift b/CoreDataQueryInterface/Count.swift
@@ -24,7 +24,7 @@ SOFTWARE.
 
 import Foundation
 
-public struct Count: TypedExpressionConvertible, ComparableExpression {
+public struct Count: TypedExpressionConvertible, ComparableExpression, PredicateComparable {
     public typealias ExpressionValueType = NSNumber
     private var parent: CustomExpressionConvertible
     
diff --git a/CoreDataQueryInterface/Info.plist b/CoreDataQueryInterface/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/CoreDataQueryInterface/Operators.swift b/CoreDataQueryInterface/Operators.swift
@@ -24,42 +24,42 @@ SOFTWARE.
 
 import Foundation
 
-public func ==<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {
+public func ==<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.equalTo(rhs)
 }
 
-public func ==<L: TypedExpressionConvertible, RE: TypedExpressionConvertible, R: SequenceType where L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {
+public func ==<L: PredicateComparable, RE: TypedExpressionConvertible, R: SequenceType where L: TypedExpressionConvertible, L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.among(rhs)
 }
 
-public func ==<L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {
+public func ==<L: PredicateComparable where L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {
     return lhs.equalTo(rhs)
 }
 
-public func !=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {
+public func !=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.notEqualTo(rhs)
 }
 
-public func !=<L: TypedExpressionConvertible, RE: TypedExpressionConvertible, R: SequenceType where L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {
+public func !=<L: PredicateComparable, RE: TypedExpressionConvertible, R: SequenceType where L: TypedExpressionConvertible, L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {
     return !lhs.among(rhs)
 }
 
-public func !=<L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {
+public func !=<L: PredicateComparable where L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {
     return lhs.notEqualTo(rhs)
 }
 
-public func ><L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
+public func ><L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.greaterThan(rhs)
 }
 
-public func >=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
+public func >=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.greaterThanOrEqualTo(rhs)
 }
 
-public func <<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
+public func <<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.lessThan(rhs)
 }
 
-public func <=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
+public func <=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {
     return lhs.lessThanOrEqualTo(rhs)
 }
diff --git a/CoreDataQueryInterface/PredicateComparable.swift b/CoreDataQueryInterface/PredicateComparable.swift
@@ -0,0 +1,15 @@
+//
+//  PredicateComparable.swift
+//  CoreDataQueryInterface
+//
+//  Created by Gregory Higley on 4/21/16.
+//  Copyright © 2016 Prosumma LLC. All rights reserved.
+//
+
+import Foundation
+
+/**
+ Types which implement this protocol can appear on the left-hand 
+ side of an expression that generates a filter predicate.
+ */
+public protocol PredicateComparable {}
diff --git a/CoreDataQueryInterface/TypedExpressionConvertible.swift b/CoreDataQueryInterface/TypedExpressionConvertible.swift
@@ -44,7 +44,7 @@ public protocol TypedExpressionConvertible: CustomExpressionConvertible {
 
 public protocol ComparableExpression { }
 
-extension TypedExpressionConvertible {
+extension TypedExpressionConvertible where Self: PredicateComparable {
     public func equalTo<R: TypedExpressionConvertible where Self.ExpressionValueType == R.ExpressionValueType>(rhs: R, options: NSComparisonPredicateOptions = []) -> NSPredicate {
         return PredicateBuilder.equalTo(lhs: self, rhs: rhs, options: options)
     }
@@ -66,7 +66,7 @@ extension TypedExpressionConvertible {
     }
 }
 
-extension TypedExpressionConvertible where ExpressionValueType: ComparableExpression {
+extension TypedExpressionConvertible where Self: PredicateComparable, ExpressionValueType: ComparableExpression {
     public func greaterThan<R: TypedExpressionConvertible where Self.ExpressionValueType == R.ExpressionValueType>(rhs: R, options: NSComparisonPredicateOptions = []) -> NSPredicate {
         return PredicateBuilder.greaterThan(lhs: self, rhs: rhs, options: options)
     }
diff --git a/CoreDataQueryInterfaceTests/SanityTests.swift b/CoreDataQueryInterfaceTests/SanityTests.swift
@@ -28,6 +28,11 @@ import XCTest
 
 class SanityTests: BaseTestCase {
     
+    func testThatComplexBooleansStillWork() {
+        let x = 14
+        XCTAssertTrue(x > 0 && x < 47)
+    }
+    
     func testCountDepartments() {
         let departmentCount = managedObjectContext.from(Department).count()
         XCTAssertEqual(departmentCount, 3)

Original file line number	Diff line number	Diff line change
`@@ -24,42 +24,42 @@ SOFTWARE.`
`24`	`24`
`25`	`25`	`import Foundation`
`26`	`26`
`27`		`-public func ==<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {`
	`27`	`+public func ==<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {`
`28`	`28`	`return lhs.equalTo(rhs)`
`29`	`29`	`}`
`30`	`30`
`31`		`-public func ==<L: TypedExpressionConvertible, RE: TypedExpressionConvertible, R: SequenceType where L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {`
	`31`	`+public func ==<L: PredicateComparable, RE: TypedExpressionConvertible, R: SequenceType where L: TypedExpressionConvertible, L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {`
`32`	`32`	`return lhs.among(rhs)`
`33`	`33`	`}`
`34`	`34`
`35`		`-public func ==<L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {`
	`35`	`+public func ==<L: PredicateComparable where L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {`
`36`	`36`	`return lhs.equalTo(rhs)`
`37`	`37`	`}`
`38`	`38`
`39`		`-public func !=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {`
	`39`	`+public func !=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType>(lhs: L, rhs: R) -> NSPredicate {`
`40`	`40`	`return lhs.notEqualTo(rhs)`
`41`	`41`	`}`
`42`	`42`
`43`		`-public func !=<L: TypedExpressionConvertible, RE: TypedExpressionConvertible, R: SequenceType where L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {`
	`43`	`+public func !=<L: PredicateComparable, RE: TypedExpressionConvertible, R: SequenceType where L: TypedExpressionConvertible, L.ExpressionValueType == RE.ExpressionValueType, R.Generator.Element == RE>(lhs: L, rhs: R) -> NSPredicate {`
`44`	`44`	`return !lhs.among(rhs)`
`45`	`45`	`}`
`46`	`46`
`47`		`-public func !=<L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {`
	`47`	`+public func !=<L: PredicateComparable where L: TypedExpressionConvertible>(lhs: L, rhs: Null) -> NSPredicate {`
`48`	`48`	`return lhs.notEqualTo(rhs)`
`49`	`49`	`}`
`50`	`50`
`51`		`-public func ><L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
	`51`	`+public func ><L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
`52`	`52`	`return lhs.greaterThan(rhs)`
`53`	`53`	`}`
`54`	`54`
`55`		`-public func >=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
	`55`	`+public func >=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
`56`	`56`	`return lhs.greaterThanOrEqualTo(rhs)`
`57`	`57`	`}`
`58`	`58`
`59`		`-public func <<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
	`59`	`+public func <<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
`60`	`60`	`return lhs.lessThan(rhs)`
`61`	`61`	`}`
`62`	`62`
`63`		`-public func <=<L: TypedExpressionConvertible, R: TypedExpressionConvertible where L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
	`63`	`+public func <=<L: PredicateComparable, R: TypedExpressionConvertible where L: TypedExpressionConvertible, L.ExpressionValueType == R.ExpressionValueType, L.ExpressionValueType: ComparableExpression>(lhs: L, rhs: R) -> NSPredicate {`
`64`	`64`	`return lhs.lessThanOrEqualTo(rhs)`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public protocol TypedExpressionConvertible: CustomExpressionConvertible {`
`44`	`44`
`45`	`45`	`public protocol ComparableExpression { }`
`46`	`46`
`47`		`-extension TypedExpressionConvertible {`
	`47`	`+extension TypedExpressionConvertible where Self: PredicateComparable {`
`48`	`48`	`public func equalTo<R: TypedExpressionConvertible where Self.ExpressionValueType == R.ExpressionValueType>(rhs: R, options: NSComparisonPredicateOptions = []) -> NSPredicate {`
`49`	`49`	`return PredicateBuilder.equalTo(lhs: self, rhs: rhs, options: options)`
`50`	`50`	`}`
`@@ -66,7 +66,7 @@ extension TypedExpressionConvertible {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`-extension TypedExpressionConvertible where ExpressionValueType: ComparableExpression {`
	`69`	`+extension TypedExpressionConvertible where Self: PredicateComparable, ExpressionValueType: ComparableExpression {`
`70`	`70`	`public func greaterThan<R: TypedExpressionConvertible where Self.ExpressionValueType == R.ExpressionValueType>(rhs: R, options: NSComparisonPredicateOptions = []) -> NSPredicate {`
`71`	`71`	`return PredicateBuilder.greaterThan(lhs: self, rhs: rhs, options: options)`
`72`	`72`	`}`