Merge pull request supermarin#80 from stephencelis/find-with-condition

Find with condition
Altimor · Mar 6, 2014 · 26649cf · 26649cf
2 parents 1352e8d + b872565
commit 26649cf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/Classes/NSManagedObject+ActiveRecord.h b/Classes/NSManagedObject+ActiveRecord.h
@@ -35,7 +35,8 @@
 + (NSArray *)where:(id)condition order:(id)order limit:(NSNumber *)limit;
 + (NSArray *)whereFormat:(NSString *)format, ...;
 + (instancetype)findOrCreate:(NSDictionary *)attributes;
-+ (instancetype)find:(NSDictionary *)attributes;
++ (instancetype)find:(id)condition;
++ (instancetype)findWithFormat:(NSString *)format, ...;
 + (NSUInteger)count;
 + (NSUInteger)countWhere:(id)condition;
 
@@ -53,7 +54,7 @@
 + (NSArray *)where:(id)condition inContext:(NSManagedObjectContext *)context limit:(NSNumber *)limit;
 + (NSArray *)where:(id)condition inContext:(NSManagedObjectContext *)context order:(id)order limit:(NSNumber *)limit;
 + (instancetype)findOrCreate:(NSDictionary *)properties inContext:(NSManagedObjectContext *)context;
-+ (instancetype)find:(NSDictionary *)attributes inContext:(NSManagedObjectContext *)context;
++ (instancetype)find:(id)condition inContext:(NSManagedObjectContext *)context;
 + (NSUInteger)countInContext:(NSManagedObjectContext *)context;
 + (NSUInteger)countWhere:(id)condition inContext:(NSManagedObjectContext *)context;
 

diff --git a/Classes/NSManagedObject+ActiveRecord.m b/Classes/NSManagedObject+ActiveRecord.m
@@ -48,7 +48,7 @@ + (NSArray *)allInContext:(NSManagedObjectContext *)context order:(id)order {
 + (NSArray *)whereFormat:(NSString *)format, ... {
     va_list va_arguments;
     va_start(va_arguments, format);
-    NSString *condition = [[NSString alloc] initWithFormat:format arguments:va_arguments];
+    NSPredicate *condition = [NSPredicate predicateWithFormat:format arguments:va_arguments];
     va_end(va_arguments);
 
     return [self where:condition];
@@ -63,12 +63,21 @@ + (instancetype)findOrCreate:(NSDictionary *)properties inContext:(NSManagedObje
     return existing ?: [self create:properties inContext:context];
 }
 
-+ (instancetype)find:(NSDictionary *)attributes {
-    return [self find:attributes inContext:[NSManagedObjectContext defaultContext]];
++ (instancetype)findWithFormat:(NSString *)format, ... {
+    va_list va_arguments;
+    va_start(va_arguments, format);
+    NSPredicate *condition = [NSPredicate predicateWithFormat:format arguments:va_arguments];
+    va_end(va_arguments);
+
+    return [self find:condition];
+}
+
++ (instancetype)find:(id)condition {
+    return [self find:condition inContext:[NSManagedObjectContext defaultContext]];
 }
 
-+ (instancetype)find:(NSDictionary *)attributes inContext:(NSManagedObjectContext *)context {
-    return [self where:attributes inContext:context limit:@1].first;
++ (instancetype)find:(id)condition inContext:(NSManagedObjectContext *)context {
+    return [self where:condition inContext:context limit:@1].first;
 }
 
 + (NSArray *)where:(id)condition {

diff --git a/Example/SampleProjectTests/FindersAndCreatorsTests.m b/Example/SampleProjectTests/FindersAndCreatorsTests.m
@@ -63,14 +63,14 @@ void createSomePeople(NSArray *names, NSArray *surnames, NSManagedObjectContext
 
         it(@"Finds using [Entity where: STRING]", ^{
 
-            Person *unique = [Person where:[NSString stringWithFormat:@"firstName == '%@'",UNIQUE_NAME]].first;
+            Person *unique = [Person where:[NSPredicate predicateWithFormat:@"firstName == %@",UNIQUE_NAME]].first;
             [[unique.lastName should] equal:UNIQUE_SURNAME];
 
         });
 
         it(@"Finds using [Entity where: STRING and ARGUMENTS]", ^{
 
-            Person *unique = [Person whereFormat:@"firstName == '%@'", UNIQUE_NAME].first;
+            Person *unique = [Person whereFormat:@"firstName == %@", UNIQUE_NAME].first;
             [[unique.lastName should] equal:UNIQUE_SURNAME];
 
         });
@@ -111,6 +111,16 @@ void createSomePeople(NSArray *names, NSArray *surnames, NSManagedObjectContext
             [[johnDoe.firstName should] equal:@"John"];
         });
 
+        it(@"Finds the first match using [Entity find: STRING]", ^{
+            Person *johnDoe = [Person find:@"firstName = 'John' AND lastName = 'Doe'"];
+            [[johnDoe.firstName should] equal:@"John"];
+        });
+
+        it(@"Finds the first match using [Entity find: STRING and ARGUMENTS]", ^{
+            Person *johnDoe = [Person findWithFormat:@"firstName = %@ AND lastName = %@", @"John", @"Doe"];
+            [[johnDoe.firstName should] equal:@"John"];
+        });
+
         it(@"doesn't create an object on find", ^{
             Person *cat = [Person find:@{ @"firstName": @"Cat" }];
             [cat shouldBeNil];