Fix more tests

This commit is contained in:
Blake Watters
2012-09-24 23:42:16 -04:00
parent c9249bf0dc
commit 2b0dc3d5c4
5 changed files with 18 additions and 20 deletions

View File

@@ -61,6 +61,15 @@
return RKMIMETypeInSet(MIMEType, [NSSet setWithObject:self.MIMETypeStringOrRegularExpression]);
}
- (NSString *)description
{
NSString *mimeTypeDescription = [self.MIMETypeStringOrRegularExpression isKindOfClass:[NSRegularExpression class]] ?
[NSString stringWithFormat:@"MIME Type =~ \"%@\"", self.MIMETypeStringOrRegularExpression] :
[NSString stringWithFormat:@"MIME Type == \"%@\"", self.MIMETypeStringOrRegularExpression];
return [NSString stringWithFormat:@"<%@: %p, %@, serializationClass=%@>",
NSStringFromClass([self class]), self, mimeTypeDescription, NSStringFromClass(self.serializationClass)];
}
@end
@interface RKMIMETypeSerialization ()

View File

@@ -29,7 +29,7 @@ BOOL RKMIMETypeInSet(NSString *MIMEType, NSSet *MIMETypes)
{
for (id MIMETypeStringOrRegularExpression in MIMETypes) {
if ([MIMETypeStringOrRegularExpression isKindOfClass:[NSString class]]) {
return [[MIMEType lowercaseString] isEqualToString:[MIMEType lowercaseString]];
return [[MIMETypeStringOrRegularExpression lowercaseString] isEqualToString:[MIMEType lowercaseString]];
} else if ([MIMETypeStringOrRegularExpression isKindOfClass:[NSRegularExpression class]]) {
NSRegularExpression *regex = (NSRegularExpression *) MIMETypeStringOrRegularExpression;
NSUInteger numberOfMatches = [regex numberOfMatchesInString:[MIMEType lowercaseString] options:0 range:NSMakeRange(0, [MIMEType length])];