Collapse Objective-C code

kylef · kylef · commit 75a3df844d71 · 2015-09-20T12:37:18.000-07:00
Due to cocoadocs thinking we're a Objective-C pod, removing some lines
diff --git a/QueryKit/ObjectiveC/QKAttribute.m b/QueryKit/ObjectiveC/QKAttribute.m
@@ -103,18 +103,9 @@ - (NSUInteger)length {
 
 #pragma mark - Comparison
 
-- (NSPredicate *)predicateWithRightExpression:(NSExpression *)expression
-                                     modifier:(NSComparisonPredicateModifier)modifier
-                                         type:(NSPredicateOperatorType)type
-                                      options:(NSComparisonPredicateOptions)options
-{
+- (NSPredicate *)predicateWithRightExpression:(NSExpression *)expression modifier:(NSComparisonPredicateModifier)modifier type:(NSPredicateOperatorType)type options:(NSComparisonPredicateOptions)options {
   NSExpression *leftExpression = [self expression];
-
-  return [NSComparisonPredicate predicateWithLeftExpression:leftExpression
-                                            rightExpression:expression
-                                                   modifier:modifier
-                                                       type:type
-                                                    options:options];
+  return [NSComparisonPredicate predicateWithLeftExpression:leftExpression rightExpression:expression modifier:modifier type:type options:options];
 }
 
 @end
@@ -123,11 +114,7 @@ @implementation QKAttribute (Predicate)
 
 - (NSPredicate *)equal:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSEqualToPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)equal:(id)value {
@@ -136,11 +123,7 @@ - (NSPredicate *)equal:(id)value {
 
 - (NSPredicate *)notEqual:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSNotEqualToPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSNotEqualToPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)notEqual:(id)value {
@@ -149,11 +132,7 @@ - (NSPredicate *)notEqual:(id)value {
 
 - (NSPredicate *)beginsWith:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSBeginsWithPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSBeginsWithPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)beginsWith:(id)value {
@@ -162,11 +141,7 @@ - (NSPredicate *)beginsWith:(id)value {
 
 - (NSPredicate *)endsWith:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSEndsWithPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSEndsWithPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)endsWith:(id)value {
@@ -175,11 +150,7 @@ - (NSPredicate *)endsWith:(id)value {
 
 - (NSPredicate *)like:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSLikePredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSLikePredicateOperatorType options:options];
 }
 
 - (NSPredicate *)like:(id)value {
@@ -188,11 +159,7 @@ - (NSPredicate *)like:(id)value {
 
 - (NSPredicate *)matches:(id)value options:(NSComparisonPredicateOptions)options {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSMatchesPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSMatchesPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)matches:(id)value {
@@ -201,81 +168,49 @@ - (NSPredicate *)matches:(id)value {
 
 - (NSPredicate *)greaterThan:(id)value {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSGreaterThanPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSGreaterThanPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)greaterThanOrEqualTo:(id)value {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSGreaterThanOrEqualToPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSGreaterThanOrEqualToPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)lessThan:(id)value {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSLessThanPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSLessThanPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)lessThanOrEqualTo:(id)value {
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSLessThanOrEqualToPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSLessThanOrEqualToPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)isNil {
   NSExpression *expression = [NSExpression expressionForConstantValue:nil];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSEqualToPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)between:(id)minimumValue and:(id)maxiumValue {
   NSParameterAssert(minimumValue != nil);
   NSParameterAssert(maxiumValue != nil);
 
   NSExpression *expression = [NSExpression expressionForConstantValue:@[minimumValue, maxiumValue]];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSBetweenPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSBetweenPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)in:(id<NSFastEnumeration>)set {
   NSParameterAssert(set != nil);
 
   NSExpression *expression = [NSExpression expressionForConstantValue:set];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSInPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSInPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)contains:(id)value options:(NSComparisonPredicateOptions)options {
   NSParameterAssert(value != nil);
 
   NSExpression *expression = [NSExpression expressionForConstantValue:value];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSContainsPredicateOperatorType
-                                    options:options];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSContainsPredicateOperatorType options:options];
 }
 
 - (NSPredicate *)contains:(id)value {
@@ -284,20 +219,12 @@ - (NSPredicate *)contains:(id)value {
 
 - (NSPredicate *)isYes {
   NSExpression *expression = [NSExpression expressionForConstantValue:@YES];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSEqualToPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType options:0];
 }
 
 - (NSPredicate *)isNo {
   NSExpression *expression = [NSExpression expressionForConstantValue:@NO];
-
-  return [self predicateWithRightExpression:expression
-                                   modifier:NSDirectPredicateModifier
-                                       type:NSEqualToPredicateOperatorType
-                                    options:0];
+  return [self predicateWithRightExpression:expression modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType options:0];
 }
 
 @end
diff --git a/QueryKit/ObjectiveC/QKQuerySet.m b/QueryKit/ObjectiveC/QKQuerySet.m
@@ -79,7 +79,7 @@ - (BOOL)isEqualToQuerySet:(QKQuerySet *)queryset {
           [self.predicate isEqual:[queryset predicate]] &&
           [self.sortDescriptors isEqual:[queryset sortDescriptors]] &&
           NSEqualRanges(self.range, queryset.range)
-          );
+  );
 }
 
 #pragma mark - NSCopying
@@ -260,9 +260,8 @@ - (NSManagedObject *)object:(NSError **)error {
   if (count == 1) {
     managedObject = [array firstObject];
   } else if ((count > 1) && error != nil) {
-    *error = [NSError errorWithDomain:QKQuerySetErrorDomain code:0 userInfo:@{
-                                                                              NSLocalizedDescriptionKey: @"Find object in fetch request failed, should only result in a single result.",
-                                                                              }];
+    NSString *errorDescription = @"Find object in fetch request failed, should only result in a single result.";
+    *error = [NSError errorWithDomain:QKQuerySetErrorDomain code:0 userInfo:@{ NSLocalizedDescriptionKey: errorDescription }];
   }
 
   return managedObject;
