[Attribute] Add an IN operator

kylef · kylef · commit afa023a7fab7 · 2014-11-09T02:49:44.000Z
diff --git a/QueryKit/Attribute.swift b/QueryKit/Attribute.swift
@@ -67,6 +67,14 @@ public func ~= <T>(left: Attribute<T>, right: T) -> NSPredicate {
     return left.expression ~= NSExpression(forConstantValue: right as NSObject)
 }
 
+public func << <T>(left: Attribute<T>, right: [T]) -> NSPredicate {
+    return left.expression << NSExpression(forConstantValue: right._asCocoaArray())
+}
+
+public func << <T>(left: Attribute<T>, right: Range<T>) -> NSPredicate {
+    return left << Array<T>(right)
+}
+
 /// MARK: Bool Attributes
 
 prefix public func ! (left: Attribute<Bool>) -> NSPredicate {
diff --git a/QueryKit/Expression.swift b/QueryKit/Expression.swift
@@ -35,3 +35,7 @@ public func <= (left: NSExpression, right: NSExpression) -> NSPredicate {
 public func ~= (left: NSExpression, right: NSExpression) -> NSPredicate {
     return NSComparisonPredicate(leftExpression: left, rightExpression: right, modifier: NSComparisonPredicateModifier.DirectPredicateModifier, type: NSPredicateOperatorType.LikePredicateOperatorType, options: NSComparisonPredicateOptions(0))
 }
+
+public func << (left: NSExpression, right: NSExpression) -> NSPredicate {
+    return NSComparisonPredicate(leftExpression: left, rightExpression: right, modifier: NSComparisonPredicateModifier.DirectPredicateModifier, type: NSPredicateOperatorType.InPredicateOperatorType, options: NSComparisonPredicateOptions(0))
+}
diff --git a/QueryKitTests/AttributeTests.swift b/QueryKitTests/AttributeTests.swift
@@ -83,6 +83,16 @@ class AttributeTests: XCTestCase {
         var predicate:NSPredicate = (attribute ~= 10)
         XCTAssertEqual(predicate, NSPredicate(format:"age LIKE 10")!)
     }
+
+    func testInOperator() {
+        var predicate:NSPredicate = (attribute << [5, 10])
+        XCTAssertEqual(predicate, NSPredicate(format:"age IN %@", [5, 10])!)
+    }
+
+    func testInRangeOperator() {
+        var predicate:NSPredicate = attribute << (5..<10)
+        XCTAssertEqual(predicate, NSPredicate(format:"age IN %@", [5, 6, 7, 8, 9])!)
+    }
 }
 
 class CollectionAttributeTests: XCTestCase {
diff --git a/QueryKitTests/ExpressionTests.swift b/QueryKitTests/ExpressionTests.swift
@@ -48,4 +48,8 @@ class ExpressionTests: XCTestCase {
     func testLikeOperator() {
         XCTAssertEqual(leftHandSide ~= rightHandSide, NSPredicate(format:"age LIKE 10")!)
     }
+
+    func testInOperator() {
+        XCTAssertEqual(leftHandSide << rightHandSide, NSPredicate(format:"age IN 10")!)
+    }
 }
diff --git a/README.md b/README.md
@@ -108,9 +108,11 @@ let name = Attribute<String>("name")
 let age = Attribute<Int>("age")
 
 name == "Kyle"
+name << ["Kyle", "Katie"]
 
 age == 27
 age >= 25
+age << (22...30)
 ```
 
 #### Operators
@@ -124,6 +126,8 @@ age >= 25
 | > | x is more than y |
 | >= | x is more than or equal to y |
 | ~= | x is like y |
+| ~= | x is like y |
+| << | x IN y, where y is an array or set |
 
 ## Predicate extensions
 

Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,7 @@ public func <= (left: NSExpression, right: NSExpression) -> NSPredicate {`
`35`	`35`	`public func ~= (left: NSExpression, right: NSExpression) -> NSPredicate {`
`36`	`36`	`return NSComparisonPredicate(leftExpression: left, rightExpression: right, modifier: NSComparisonPredicateModifier.DirectPredicateModifier, type: NSPredicateOperatorType.LikePredicateOperatorType, options: NSComparisonPredicateOptions(0))`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+public func << (left: NSExpression, right: NSExpression) -> NSPredicate {`
	`40`	`+ return NSComparisonPredicate(leftExpression: left, rightExpression: right, modifier: NSComparisonPredicateModifier.DirectPredicateModifier, type: NSPredicateOperatorType.InPredicateOperatorType, options: NSComparisonPredicateOptions(0))`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,8 @@ class ExpressionTests: XCTestCase {`
`48`	`48`	`func testLikeOperator() {`
`49`	`49`	`XCTAssertEqual(leftHandSide ~= rightHandSide, NSPredicate(format:"age LIKE 10")!)`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ func testInOperator() {`
	`53`	`+ XCTAssertEqual(leftHandSide << rightHandSide, NSPredicate(format:"age IN 10")!)`
	`54`	`+ }`
`51`	`55`	`}`