diff --git a/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle Mac.xcscheme b/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle Mac.xcscheme
index f0a0f9a7..7a6e91a8 100644
--- a/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle Mac.xcscheme
+++ b/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle Mac.xcscheme
@@ -15,9 +15,9 @@
+ BuildableName = "Mantle.framework"
+ BlueprintName = "Mantle Mac"
+ ReferencedContainer = "container:Mantle.xcodeproj">
+ BuildableName = "Mantle Mac Tests.octest"
+ BlueprintName = "Mantle Mac Tests"
+ ReferencedContainer = "container:Mantle.xcodeproj">
@@ -47,9 +47,9 @@
+ BuildableName = "Mantle Mac Tests.octest"
+ BlueprintName = "Mantle Mac Tests"
+ ReferencedContainer = "container:Mantle.xcodeproj">
diff --git a/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle iOS.xcscheme b/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle iOS.xcscheme
index bd7a2ad1..f37c7acc 100644
--- a/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle iOS.xcscheme
+++ b/Mantle.xcodeproj/xcshareddata/xcschemes/Mantle iOS.xcscheme
@@ -15,9 +15,9 @@
+ BuildableName = "libMantle.a"
+ BlueprintName = "Mantle iOS"
+ ReferencedContainer = "container:Mantle.xcodeproj">
+ BuildableName = "Mantle iOS Tests.octest"
+ BlueprintName = "Mantle iOS Tests"
+ ReferencedContainer = "container:Mantle.xcodeproj">
@@ -47,9 +47,9 @@
+ BuildableName = "Mantle iOS Tests.octest"
+ BlueprintName = "Mantle iOS Tests"
+ ReferencedContainer = "container:Mantle.xcodeproj">
diff --git a/Mantle/MTLModel.h b/Mantle/MTLModel.h
index c94623cb..60994308 100644
--- a/Mantle/MTLModel.h
+++ b/Mantle/MTLModel.h
@@ -1,6 +1,6 @@
//
-// MAVModel.h
-// Maverick
+// MTLModel.h
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -18,7 +18,7 @@
// The default implementations of , -hash, and -isEqual: all make use
// of the dictionaryRepresentation property.
//
-@interface MAVModel : NSObject
+@interface MTLModel : NSObject
// Returns a new instance of the receiver initialized using
// -initWithDictionary:.
@@ -70,7 +70,7 @@
// +dictionaryKeysByPropertyKey.
//
// The default implementation of this property finds all @property declarations
-// (except for those on MAVModel) and combines their values into a dictionary.
+// (except for those on MTLModel) and combines their values into a dictionary.
// Any nil values will be represented by NSNull.
//
// This property must never be nil.
@@ -98,10 +98,10 @@
// Returns the merged value. If `MergedFromModel:` is not implemented, the
// value for the given key on `model` is returned (unless `model` is nil, in
// which case the value from the receiver is used).
-- (id)valueForKey:(NSString *)key mergedFromModel:(MAVModel *)model;
+- (id)valueForKey:(NSString *)key mergedFromModel:(MTLModel *)model;
// Returns a copy of the receiver merged with the given model object, using
// -valueForKey:mergedFromModel: for each @property key on the receiver.
-- (instancetype)modelByMergingFromModel:(MAVModel *)model;
+- (instancetype)modelByMergingFromModel:(MTLModel *)model;
@end
diff --git a/Mantle/MTLModel.m b/Mantle/MTLModel.m
index 976b77b0..7dc2aa39 100644
--- a/Mantle/MTLModel.m
+++ b/Mantle/MTLModel.m
@@ -1,24 +1,24 @@
//
-// MAVModel.m
-// Maverick
+// MTLModel.m
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "MAVModel.h"
+#import "MTLModel.h"
#import "EXTKeyPathCoding.h"
#import "EXTScope.h"
-#import "NSDictionary+MAVHigherOrderAdditions.h"
+#import "NSDictionary+MTLHigherOrderAdditions.h"
#import
// Used in archives to store the modelVersion of the archived instance.
-static NSString * const MAVModelVersionKey = @"MAVModelVersion";
+static NSString * const MTLModelVersionKey = @"MTLModelVersion";
-@interface MAVModel ()
+@interface MTLModel ()
// Enumerates all properties of the receiver's class hierarchy, starting at the
-// receiver, and continuing up until (but not including) MAVModel.
+// receiver, and continuing up until (but not including) MTLModel.
//
// The given block will be invoked multiple times for any properties declared on
// multiple classes in the hierarchy.
@@ -26,7 +26,7 @@ + (void)enumeratePropertiesUsingBlock:(void (^)(objc_property_t property, BOOL *
@end
-@implementation MAVModel
+@implementation MTLModel
#pragma mark Lifecycle
@@ -93,7 +93,7 @@ + (void)enumeratePropertiesUsingBlock:(void (^)(objc_property_t property, BOOL *
Class cls = self;
BOOL stop = NO;
- while (!stop && ![cls isEqual:MAVModel.class]) {
+ while (!stop && ![cls isEqual:MTLModel.class]) {
unsigned count = 0;
objc_property_t *properties = class_copyPropertyList(cls, &count);
if (properties == NULL) continue;
@@ -185,7 +185,7 @@ + (NSDictionary *)migrateDictionaryRepresentation:(NSDictionary *)dictionary fro
#pragma mark Merging
-- (id)valueForKey:(NSString *)key mergedFromModel:(MAVModel *)model {
+- (id)valueForKey:(NSString *)key mergedFromModel:(MTLModel *)model {
NSParameterAssert(key != nil);
SEL selector = NSSelectorFromString([key stringByAppendingString:@"MergedFromModel:"]);
@@ -206,7 +206,7 @@ - (id)valueForKey:(NSString *)key mergedFromModel:(MAVModel *)model {
return mergedValue;
}
-- (instancetype)modelByMergingFromModel:(MAVModel *)model {
+- (instancetype)modelByMergingFromModel:(MTLModel *)model {
NSParameterAssert(model == nil || [model isKindOfClass:self.class]);
NSSet *keys = self.class.propertyKeys;
@@ -237,7 +237,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder {
NSDictionary *dictionary = [coder decodeObjectForKey:@keypath(self.dictionaryRepresentation)];
if (dictionary == nil) return nil;
- NSNumber *version = [coder decodeObjectForKey:MAVModelVersionKey];
+ NSNumber *version = [coder decodeObjectForKey:MTLModelVersionKey];
if (version == nil) {
NSLog(@"Warning: decoding a dictionary representation without a version: %@", dictionary);
} else if (version.unsignedIntegerValue > self.class.modelVersion) {
@@ -253,7 +253,7 @@ - (instancetype)initWithCoder:(NSCoder *)coder {
- (void)encodeWithCoder:(NSCoder *)coder {
[coder encodeObject:self.dictionaryRepresentation forKey:@keypath(self.dictionaryRepresentation)];
- [coder encodeObject:@(self.class.modelVersion) forKey:MAVModelVersionKey];
+ [coder encodeObject:@(self.class.modelVersion) forKey:MTLModelVersionKey];
}
#pragma mark NSObject
@@ -266,7 +266,7 @@ - (NSUInteger)hash {
return self.dictionaryRepresentation.hash;
}
-- (BOOL)isEqual:(MAVModel *)model {
+- (BOOL)isEqual:(MTLModel *)model {
if (self == model) return YES;
if (![model isMemberOfClass:self.class]) return NO;
diff --git a/Mantle/MTLValueTransformer.h b/Mantle/MTLValueTransformer.h
index cae603fe..ca0257b4 100644
--- a/Mantle/MTLValueTransformer.h
+++ b/Mantle/MTLValueTransformer.h
@@ -1,6 +1,6 @@
//
-// MAVValueTransformer.h
-// Maverick
+// MTLValueTransformer.h
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -8,25 +8,25 @@
#import
-typedef id (^MAVValueTransformerBlock)(id);
+typedef id (^MTLValueTransformerBlock)(id);
// The name for a value transformer that converts strings into URLs and back.
-extern NSString * const MAVURLValueTransformerName;
+extern NSString * const MTLURLValueTransformerName;
//
// A value transformer supporting block-based transformation.
//
-@interface MAVValueTransformer : NSValueTransformer
+@interface MTLValueTransformer : NSValueTransformer
// Returns a transformer which transforms values using the given block. Reverse
// transformations will not be allowed.
-+ (instancetype)transformerWithBlock:(MAVValueTransformerBlock)transformationBlock;
++ (instancetype)transformerWithBlock:(MTLValueTransformerBlock)transformationBlock;
// Returns a transformer which transforms values using the given block, for
// forward or reverse transformations.
-+ (instancetype)reversibleTransformerWithBlock:(MAVValueTransformerBlock)transformationBlock;
++ (instancetype)reversibleTransformerWithBlock:(MTLValueTransformerBlock)transformationBlock;
// Returns a transformer which transforms values using the given blocks.
-+ (instancetype)reversibleTransformerWithForwardBlock:(MAVValueTransformerBlock)forwardBlock reverseBlock:(MAVValueTransformerBlock)reverseBlock;
++ (instancetype)reversibleTransformerWithForwardBlock:(MTLValueTransformerBlock)forwardBlock reverseBlock:(MTLValueTransformerBlock)reverseBlock;
@end
diff --git a/Mantle/MTLValueTransformer.m b/Mantle/MTLValueTransformer.m
index 305f25c8..5a9f2312 100644
--- a/Mantle/MTLValueTransformer.m
+++ b/Mantle/MTLValueTransformer.m
@@ -1,46 +1,46 @@
//
-// MAVValueTransformer.m
-// Maverick
+// MTLValueTransformer.m
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "MAVValueTransformer.h"
+#import "MTLValueTransformer.h"
-NSString * const MAVURLValueTransformerName = @"MAVURLValueTransformerName";
+NSString * const MTLURLValueTransformerName = @"MTLURLValueTransformerName";
//
-// Any MAVValueTransformer supporting reverse transformation. Necessary because
+// Any MTLValueTransformer supporting reverse transformation. Necessary because
// +allowsReverseTransformation is a class method.
//
-@interface MAVReversibleValueTransformer : MAVValueTransformer
+@interface MTLReversibleValueTransformer : MTLValueTransformer
@end
-@interface MAVValueTransformer ()
+@interface MTLValueTransformer ()
-@property (nonatomic, copy, readonly) MAVValueTransformerBlock forwardBlock;
-@property (nonatomic, copy, readonly) MAVValueTransformerBlock reverseBlock;
+@property (nonatomic, copy, readonly) MTLValueTransformerBlock forwardBlock;
+@property (nonatomic, copy, readonly) MTLValueTransformerBlock reverseBlock;
@end
-@implementation MAVValueTransformer
+@implementation MTLValueTransformer
#pragma mark Lifecycle
-+ (instancetype)transformerWithBlock:(MAVValueTransformerBlock)transformationBlock {
++ (instancetype)transformerWithBlock:(MTLValueTransformerBlock)transformationBlock {
return [[self alloc] initWithForwardBlock:transformationBlock reverseBlock:nil];
}
-+ (instancetype)reversibleTransformerWithBlock:(MAVValueTransformerBlock)transformationBlock {
++ (instancetype)reversibleTransformerWithBlock:(MTLValueTransformerBlock)transformationBlock {
return [self reversibleTransformerWithForwardBlock:transformationBlock reverseBlock:transformationBlock];
}
-+ (instancetype)reversibleTransformerWithForwardBlock:(MAVValueTransformerBlock)forwardBlock reverseBlock:(MAVValueTransformerBlock)reverseBlock {
- return [[MAVReversibleValueTransformer alloc] initWithForwardBlock:forwardBlock reverseBlock:reverseBlock];
++ (instancetype)reversibleTransformerWithForwardBlock:(MTLValueTransformerBlock)forwardBlock reverseBlock:(MTLValueTransformerBlock)reverseBlock {
+ return [[MTLReversibleValueTransformer alloc] initWithForwardBlock:forwardBlock reverseBlock:reverseBlock];
}
-- (id)initWithForwardBlock:(MAVValueTransformerBlock)forwardBlock reverseBlock:(MAVValueTransformerBlock)reverseBlock {
+- (id)initWithForwardBlock:(MTLValueTransformerBlock)forwardBlock reverseBlock:(MTLValueTransformerBlock)reverseBlock {
NSParameterAssert(forwardBlock != nil);
self = [super init];
@@ -68,14 +68,14 @@ - (id)transformedValue:(id)value {
@end
-@implementation MAVReversibleValueTransformer
+@implementation MTLReversibleValueTransformer
#pragma mark Class Initialization
// Set up common transformers in this subclass so that we can be sure that both
// classes have been properly loaded.
+ (void)load {
- MAVValueTransformer *URLValueTransformer = [self
+ MTLValueTransformer *URLValueTransformer = [self
reversibleTransformerWithForwardBlock:^ id (NSString *str) {
if (![str isKindOfClass:[NSString class]]) return nil;
return [NSURL URLWithString:str];
@@ -85,12 +85,12 @@ + (void)load {
return URL.absoluteString;
}];
- [NSValueTransformer setValueTransformer:URLValueTransformer forName:MAVURLValueTransformerName];
+ [NSValueTransformer setValueTransformer:URLValueTransformer forName:MTLURLValueTransformerName];
}
#pragma mark Lifecycle
-- (id)initWithForwardBlock:(MAVValueTransformerBlock)forwardBlock reverseBlock:(MAVValueTransformerBlock)reverseBlock {
+- (id)initWithForwardBlock:(MTLValueTransformerBlock)forwardBlock reverseBlock:(MTLValueTransformerBlock)reverseBlock {
NSParameterAssert(reverseBlock != nil);
return [super initWithForwardBlock:forwardBlock reverseBlock:reverseBlock];
}
diff --git a/Mantle/Mantle-Prefix.pch b/Mantle/Mantle-Prefix.pch
index 31513d74..da5b7f7d 100644
--- a/Mantle/Mantle-Prefix.pch
+++ b/Mantle/Mantle-Prefix.pch
@@ -1,5 +1,5 @@
//
-// Prefix header for all source files of the 'Maverick' target in the 'Maverick' project
+// Prefix header for all source files of the 'Mantle' target in the 'Mantle' project
//
#ifdef __OBJC__
diff --git a/Mantle/Mantle.h b/Mantle/Mantle.h
index f77c6db0..4ee356ff 100644
--- a/Mantle/Mantle.h
+++ b/Mantle/Mantle.h
@@ -1,14 +1,14 @@
//
-// Maverick.h
-// Maverick
+// Mantle.h
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-04.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "MAVModel.h"
-#import "MAVValueTransformer.h"
-#import "NSArray+MAVHigherOrderAdditions.h"
-#import "NSDictionary+MAVHigherOrderAdditions.h"
-#import "NSOrderedSet+MAVHigherOrderAdditions.h"
-#import "NSSet+MAVHigherOrderAdditions.h"
+#import "MTLModel.h"
+#import "MTLValueTransformer.h"
+#import "NSArray+MTLHigherOrderAdditions.h"
+#import "NSDictionary+MTLHigherOrderAdditions.h"
+#import "NSOrderedSet+MTLHigherOrderAdditions.h"
+#import "NSSet+MTLHigherOrderAdditions.h"
diff --git a/Mantle/NSArray+MTLHigherOrderAdditions.h b/Mantle/NSArray+MTLHigherOrderAdditions.h
index 62cc5f72..69a9fd6c 100644
--- a/Mantle/NSArray+MTLHigherOrderAdditions.h
+++ b/Mantle/NSArray+MTLHigherOrderAdditions.h
@@ -1,6 +1,6 @@
//
-// NSArray+MAVHigherOrderAdditions.h
-// Maverick
+// NSArray+MTLHigherOrderAdditions.h
+// Mantle
//
// Created by Josh Vera on 12/7/11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -14,7 +14,7 @@
/**
* Higher-order functions for `NSArray`.
*/
-@interface NSArray (MAVHigherOrderAdditions)
+@interface NSArray (MTLHigherOrderAdditions)
/**
* Returns an array of filtered objects for which `block` returns true.
diff --git a/Mantle/NSArray+MTLHigherOrderAdditions.m b/Mantle/NSArray+MTLHigherOrderAdditions.m
index 457d8092..a3f38ed4 100644
--- a/Mantle/NSArray+MTLHigherOrderAdditions.m
+++ b/Mantle/NSArray+MTLHigherOrderAdditions.m
@@ -1,6 +1,6 @@
//
-// NSArray+MAVHigherOrderAdditions.m
-// Maverick
+// NSArray+MTLHigherOrderAdditions.m
+// Mantle
//
// Created by Josh Vera on 12/7/11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -9,11 +9,11 @@
// See the LICENSE file for more information.
//
-#import "NSArray+MAVHigherOrderAdditions.h"
+#import "NSArray+MTLHigherOrderAdditions.h"
#import "EXTScope.h"
#import
-@implementation NSArray (MAVHigherOrderAdditions)
+@implementation NSArray (MTLHigherOrderAdditions)
- (id)mav_filterUsingBlock:(BOOL(^)(id obj))block {
return [self mav_filterWithOptions:0 usingBlock:block];
diff --git a/Mantle/NSArray+MTLManipulationAdditions.h b/Mantle/NSArray+MTLManipulationAdditions.h
index 3f486bc4..83634691 100644
--- a/Mantle/NSArray+MTLManipulationAdditions.h
+++ b/Mantle/NSArray+MTLManipulationAdditions.h
@@ -1,6 +1,6 @@
//
-// NSArray+MAVManipulationAdditions.h
-// Maverick
+// NSArray+MTLManipulationAdditions.h
+// Mantle
//
// Created by Josh Abernathy on 9/19/12.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -8,7 +8,7 @@
#import
-@interface NSArray (MAVManipulationAdditions)
+@interface NSArray (MTLManipulationAdditions)
// The first object in the array or nil if the array is empty.
@property (nonatomic, readonly, strong) id mav_firstObject;
diff --git a/Mantle/NSArray+MTLManipulationAdditions.m b/Mantle/NSArray+MTLManipulationAdditions.m
index e6ee5cfc..8ac9b405 100644
--- a/Mantle/NSArray+MTLManipulationAdditions.m
+++ b/Mantle/NSArray+MTLManipulationAdditions.m
@@ -1,15 +1,15 @@
//
-// NSArray+MAVManipulationAdditions.m
-// Maverick
+// NSArray+MTLManipulationAdditions.m
+// Mantle
//
// Created by Josh Abernathy on 9/19/12.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "NSArray+MAVManipulationAdditions.h"
-#import "NSArray+MAVHigherOrderAdditions.h"
+#import "NSArray+MTLManipulationAdditions.h"
+#import "NSArray+MTLHigherOrderAdditions.h"
-@implementation NSArray (MAVManipulationAdditions)
+@implementation NSArray (MTLManipulationAdditions)
- (id)mav_firstObject {
return self.count > 0 ? [self objectAtIndex:0] : nil;
diff --git a/Mantle/NSDictionary+MTLHigherOrderAdditions.h b/Mantle/NSDictionary+MTLHigherOrderAdditions.h
index 3ae50f79..83c10d0c 100644
--- a/Mantle/NSDictionary+MTLHigherOrderAdditions.h
+++ b/Mantle/NSDictionary+MTLHigherOrderAdditions.h
@@ -1,6 +1,6 @@
//
-// NSDictionary+MAVHigherOrderAdditions.h
-// Maverick
+// NSDictionary+MTLHigherOrderAdditions.h
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -14,7 +14,7 @@
/**
* Higher-order functions for `NSDictionary`.
*/
-@interface NSDictionary (MAVHigherOrderAdditions)
+@interface NSDictionary (MTLHigherOrderAdditions)
/**
* Filters the keys and values of the receiver with the given predicate,
diff --git a/Mantle/NSDictionary+MTLHigherOrderAdditions.m b/Mantle/NSDictionary+MTLHigherOrderAdditions.m
index 3ab65e2b..11c5e7e8 100644
--- a/Mantle/NSDictionary+MTLHigherOrderAdditions.m
+++ b/Mantle/NSDictionary+MTLHigherOrderAdditions.m
@@ -1,6 +1,6 @@
//
-// NSDictionary+MAVHigherOrderAdditions.m
-// Maverick
+// NSDictionary+MTLHigherOrderAdditions.m
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -9,11 +9,11 @@
// See the LICENSE file for more information.
//
-#import "NSDictionary+MAVHigherOrderAdditions.h"
+#import "NSDictionary+MTLHigherOrderAdditions.h"
#import "EXTScope.h"
#import
-@implementation NSDictionary (MAVHigherOrderAdditions)
+@implementation NSDictionary (MTLHigherOrderAdditions)
- (NSDictionary *)mav_filterEntriesUsingBlock:(BOOL (^)(id key, id value))block; {
return [self mav_filterEntriesWithOptions:0 usingBlock:block];
diff --git a/Mantle/NSOrderedSet+MTLHigherOrderAdditions.h b/Mantle/NSOrderedSet+MTLHigherOrderAdditions.h
index c857f697..3954bd8a 100644
--- a/Mantle/NSOrderedSet+MTLHigherOrderAdditions.h
+++ b/Mantle/NSOrderedSet+MTLHigherOrderAdditions.h
@@ -1,6 +1,6 @@
//
-// NSOrderedSet+MAVHigherOrderAdditions.h
-// Maverick
+// NSOrderedSet+MTLHigherOrderAdditions.h
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -14,7 +14,7 @@
/**
* Higher-order functions for `NSOrderedSet`.
*/
-@interface NSOrderedSet (MAVHigherOrderAdditions)
+@interface NSOrderedSet (MTLHigherOrderAdditions)
/**
* Filters the objects of the receiver with the given predicate, returning a new
diff --git a/Mantle/NSOrderedSet+MTLHigherOrderAdditions.m b/Mantle/NSOrderedSet+MTLHigherOrderAdditions.m
index 4fec40fe..0c248b69 100644
--- a/Mantle/NSOrderedSet+MTLHigherOrderAdditions.m
+++ b/Mantle/NSOrderedSet+MTLHigherOrderAdditions.m
@@ -1,6 +1,6 @@
//
-// NSOrderedSet+MAVHigherOrderAdditions.m
-// Maverick
+// NSOrderedSet+MTLHigherOrderAdditions.m
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -9,12 +9,12 @@
// See the LICENSE file for more information.
//
-#import "NSOrderedSet+MAVHigherOrderAdditions.h"
+#import "NSOrderedSet+MTLHigherOrderAdditions.h"
#import "EXTScope.h"
-#import "NSArray+MAVHigherOrderAdditions.h"
+#import "NSArray+MTLHigherOrderAdditions.h"
#import
-@implementation NSOrderedSet (MAVHigherOrderAdditions)
+@implementation NSOrderedSet (MTLHigherOrderAdditions)
- (id)mav_filterUsingBlock:(BOOL(^)(id obj))block {
return [self mav_filterWithOptions:0 usingBlock:block];
diff --git a/Mantle/NSSet+MTLHigherOrderAdditions.h b/Mantle/NSSet+MTLHigherOrderAdditions.h
index 11b0e2df..cf1de15d 100644
--- a/Mantle/NSSet+MTLHigherOrderAdditions.h
+++ b/Mantle/NSSet+MTLHigherOrderAdditions.h
@@ -1,6 +1,6 @@
//
-// NSSet+MAVHigherOrderAdditions.h
-// Maverick
+// NSSet+MTLHigherOrderAdditions.h
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -14,7 +14,7 @@
/**
* Higher-order functions for `NSSet`.
*/
-@interface NSSet (MAVHigherOrderAdditions)
+@interface NSSet (MTLHigherOrderAdditions)
/**
* Filters the objects of the receiver with the given predicate, returning a new
diff --git a/Mantle/NSSet+MTLHigherOrderAdditions.m b/Mantle/NSSet+MTLHigherOrderAdditions.m
index 40ba341a..2b6c92c8 100644
--- a/Mantle/NSSet+MTLHigherOrderAdditions.m
+++ b/Mantle/NSSet+MTLHigherOrderAdditions.m
@@ -1,6 +1,6 @@
//
-// NSSet+MAVHigherOrderAdditions.m
-// Maverick
+// NSSet+MTLHigherOrderAdditions.m
+// Mantle
//
// Created by Justin Spahr-Summers on 15.12.11.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -9,11 +9,11 @@
// See the LICENSE file for more information.
//
-#import "NSSet+MAVHigherOrderAdditions.h"
+#import "NSSet+MTLHigherOrderAdditions.h"
#import "EXTScope.h"
#import
-@implementation NSSet (MAVHigherOrderAdditions)
+@implementation NSSet (MTLHigherOrderAdditions)
- (id)mav_filterUsingBlock:(BOOL (^)(id obj))block; {
return [self mav_filterWithOptions:0 usingBlock:block];
diff --git a/MantleTests/MTLArrayManipulationSpec.m b/MantleTests/MTLArrayManipulationSpec.m
index e9f70bf7..5786c94f 100644
--- a/MantleTests/MTLArrayManipulationSpec.m
+++ b/MantleTests/MTLArrayManipulationSpec.m
@@ -1,14 +1,14 @@
//
-// MAVArrayManipulationSpec.m
-// Maverick
+// MTLArrayManipulationSpec.m
+// Mantle
//
// Created by Josh Abernathy on 9/19/12.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "NSArray+MAVManipulationAdditions.h"
+#import "NSArray+MTLManipulationAdditions.h"
-SpecBegin(MAVArrayManipulationAdditions)
+SpecBegin(MTLArrayManipulationAdditions)
describe(@"-mav_firstObject", ^{
it(@"should return the first object", ^{
diff --git a/MantleTests/MTLHigherOrderAdditionsSpec.m b/MantleTests/MTLHigherOrderAdditionsSpec.m
index d2a3d058..34810ae2 100644
--- a/MantleTests/MTLHigherOrderAdditionsSpec.m
+++ b/MantleTests/MTLHigherOrderAdditionsSpec.m
@@ -1,6 +1,6 @@
//
-// MAVHigherOrderAdditionsTests.m
-// Maverick
+// MTLHigherOrderAdditionsTests.m
+// Mantle
//
// Created by Justin Spahr-Summers on 23.01.12.
// Copyright (c) 2012 GitHub. All rights reserved.
@@ -9,7 +9,7 @@
// See the LICENSE file for more information.
//
-SpecBegin(MAVHigherOrderAdditions)
+SpecBegin(MTLHigherOrderAdditions)
describe(@"dictionary", ^{
NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:
diff --git a/MantleTests/MTLModelSpec.m b/MantleTests/MTLModelSpec.m
index fb7e9faa..9e8d0bf7 100644
--- a/MantleTests/MTLModelSpec.m
+++ b/MantleTests/MTLModelSpec.m
@@ -1,22 +1,22 @@
//
-// MAVModelSpec.m
-// Maverick
+// MTLModelSpec.m
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "MAVTestModel.h"
+#import "MTLTestModel.h"
-SpecBegin(MAVModel)
+SpecBegin(MTLModel)
it(@"should have empty default values", ^{
- expect([MAVModel defaultValuesForKeys]).to.equal(@{});
+ expect([MTLModel defaultValuesForKeys]).to.equal(@{});
});
describe(@"subclass", ^{
it(@"should initialize with default values", ^{
- MAVTestModel *model = [[MAVTestModel alloc] init];
+ MTLTestModel *model = [[MTLTestModel alloc] init];
expect(model).notTo.beNil();
expect(model.name).to.beNil();
@@ -29,7 +29,7 @@
it(@"should initialize with property values", ^{
NSDictionary *values = @{ @"name": @"foobar", @"count": @(5) };
- MAVTestModel *model = [[MAVTestModel alloc] initWithPropertyKeysAndValues:values];
+ MTLTestModel *model = [[MTLTestModel alloc] initWithPropertyKeysAndValues:values];
expect(model).notTo.beNil();
expect(model.name).to.equal(@"foobar");
@@ -41,9 +41,9 @@
describe(@"with a dictionary of values", ^{
NSDictionary *values = @{ @"username": @"foobar", @"count": @"5" };
- __block MAVTestModel *model;
+ __block MTLTestModel *model;
beforeEach(^{
- model = [[MAVTestModel alloc] initWithDictionary:values];
+ model = [[MTLTestModel alloc] initWithDictionary:values];
expect(model).notTo.beNil();
});
@@ -57,13 +57,13 @@
it(@"should compare equal to matching model", ^{
expect(model).to.equal(model);
- MAVTestModel *matchingModel = [[MAVTestModel alloc] initWithDictionary:values];
+ MTLTestModel *matchingModel = [[MTLTestModel alloc] initWithDictionary:values];
expect(model).to.equal(matchingModel);
expect(model.hash).to.equal(matchingModel.hash);
});
it(@"should not compare equal to different model", ^{
- MAVTestModel *differentModel = [[MAVTestModel alloc] init];
+ MTLTestModel *differentModel = [[MTLTestModel alloc] init];
expect(model).notTo.equal(differentModel);
});
@@ -75,31 +75,31 @@
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:model];
expect(data).notTo.beNil();
- MAVTestModel *unarchivedModel = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+ MTLTestModel *unarchivedModel = [NSKeyedUnarchiver unarchiveObjectWithData:data];
expect(model).to.equal(unarchivedModel);
});
});
it(@"should fail to initialize if validation fails", ^{
- MAVTestModel *model = [[MAVTestModel alloc] initWithDictionary:@{ @"username": @"this is too long a name" }];
+ MTLTestModel *model = [[MTLTestModel alloc] initWithDictionary:@{ @"username": @"this is too long a name" }];
expect(model).to.beNil();
});
describe(@"migration", ^{
beforeAll(^{
- [MAVTestModel setModelVersion:0];
+ [MTLTestModel setModelVersion:0];
});
afterAll(^{
- [MAVTestModel setModelVersion:1];
+ [MTLTestModel setModelVersion:1];
});
NSDictionary *oldValues = @{ @"mav_name": @"foobar", @"mav_count": @"5" };
NSDictionary *newValues = @{ @"username": @"M: foobar", @"count": @"5" };
- __block MAVTestModel *oldModel;
+ __block MTLTestModel *oldModel;
beforeEach(^{
- oldModel = [[MAVTestModel alloc] initWithDictionary:oldValues];
+ oldModel = [[MTLTestModel alloc] initWithDictionary:oldValues];
expect(oldModel).notTo.beNil();
});
@@ -111,22 +111,22 @@
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:oldModel];
expect(data).notTo.beNil();
- [MAVTestModel setModelVersion:1];
+ [MTLTestModel setModelVersion:1];
- MAVTestModel *newModel = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+ MTLTestModel *newModel = [NSKeyedUnarchiver unarchiveObjectWithData:data];
expect(newModel).notTo.beNil();
expect(newModel.dictionaryRepresentation).to.equal(newValues);
});
});
it(@"should merge two models together", ^{
- MAVTestModel *target = [[MAVTestModel alloc] initWithDictionary:@{ @"username": @"foo", @"count": @"5" }];
+ MTLTestModel *target = [[MTLTestModel alloc] initWithDictionary:@{ @"username": @"foo", @"count": @"5" }];
expect(target).notTo.beNil();
- MAVTestModel *source = [[MAVTestModel alloc] initWithDictionary:@{ @"username": @"bar", @"count": @"3" }];
+ MTLTestModel *source = [[MTLTestModel alloc] initWithDictionary:@{ @"username": @"bar", @"count": @"3" }];
expect(source).notTo.beNil();
- MAVTestModel *merged = [target modelByMergingFromModel:source];
+ MTLTestModel *merged = [target modelByMergingFromModel:source];
expect(merged).notTo.beNil();
expect(merged.name).to.equal(@"bar");
diff --git a/MantleTests/MTLTestModel.h b/MantleTests/MTLTestModel.h
index 0a834f44..f9483b40 100644
--- a/MantleTests/MTLTestModel.h
+++ b/MantleTests/MTLTestModel.h
@@ -1,12 +1,12 @@
//
-// MAVTestModel.h
-// Maverick
+// MTLTestModel.h
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-@interface MAVTestModel : MAVModel
+@interface MTLTestModel : MTLModel
// Defaults to 1. This changes the behavior of some of the receiver's methods to
// emulate a migration.
diff --git a/MantleTests/MTLTestModel.m b/MantleTests/MTLTestModel.m
index a6293cdb..2a052b66 100644
--- a/MantleTests/MTLTestModel.m
+++ b/MantleTests/MTLTestModel.m
@@ -1,16 +1,16 @@
//
-// MAVTestModel.m
-// Maverick
+// MTLTestModel.m
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-#import "MAVTestModel.h"
+#import "MTLTestModel.h"
static NSUInteger modelVersion = 1;
-@implementation MAVTestModel
+@implementation MTLTestModel
+ (void)setModelVersion:(NSUInteger)version {
modelVersion = version;
@@ -47,7 +47,7 @@ - (BOOL)validateName:(NSString **)name error:(NSError **)error {
}
+ (NSValueTransformer *)propertyTransformerForCount {
- return [MAVValueTransformer
+ return [MTLValueTransformer
reversibleTransformerWithForwardBlock:^(NSString *str) {
return @(str.integerValue);
}
@@ -56,7 +56,7 @@ + (NSValueTransformer *)propertyTransformerForCount {
}];
}
-- (id)countMergedFromModel:(MAVTestModel *)model {
+- (id)countMergedFromModel:(MTLTestModel *)model {
return @(self.count + model.count);
}
diff --git a/MantleTests/MTLValueTransformerSpec.m b/MantleTests/MTLValueTransformerSpec.m
index c3662bea..780572e6 100644
--- a/MantleTests/MTLValueTransformerSpec.m
+++ b/MantleTests/MTLValueTransformerSpec.m
@@ -1,15 +1,15 @@
//
-// MAVValueTransformerSpec.m
-// Maverick
+// MTLValueTransformerSpec.m
+// Mantle
//
// Created by Justin Spahr-Summers on 2012-09-11.
// Copyright (c) 2012 GitHub. All rights reserved.
//
-SpecBegin(MAVValueTransformer)
+SpecBegin(MTLValueTransformer)
it(@"should return a forward transformer with a block", ^{
- MAVValueTransformer *transformer = [MAVValueTransformer transformerWithBlock:^(NSString *str) {
+ MTLValueTransformer *transformer = [MTLValueTransformer transformerWithBlock:^(NSString *str) {
return [str stringByAppendingString:@"bar"];
}];
@@ -21,7 +21,7 @@
});
it(@"should return a reversible transformer with a block", ^{
- MAVValueTransformer *transformer = [MAVValueTransformer reversibleTransformerWithBlock:^(NSString *str) {
+ MTLValueTransformer *transformer = [MTLValueTransformer reversibleTransformerWithBlock:^(NSString *str) {
return [str stringByAppendingString:@"bar"];
}];
@@ -33,7 +33,7 @@
});
it(@"should return a reversible transformer with forward and reverse blocks", ^{
- MAVValueTransformer *transformer = [MAVValueTransformer
+ MTLValueTransformer *transformer = [MTLValueTransformer
reversibleTransformerWithForwardBlock:^(NSString *str) {
return [str stringByAppendingString:@"bar"];
}
@@ -50,7 +50,7 @@
describe(@"predefined transformers", ^{
it(@"should define a URL value transformer", ^{
- NSValueTransformer *transformer = [NSValueTransformer valueTransformerForName:MAVURLValueTransformerName];
+ NSValueTransformer *transformer = [NSValueTransformer valueTransformerForName:MTLURLValueTransformerName];
expect(transformer).notTo.beNil();
NSString *URLString = @"http://www.github.com/";
diff --git a/MantleTests/MantleTests-Prefix.pch b/MantleTests/MantleTests-Prefix.pch
index 651da176..614bac93 100644
--- a/MantleTests/MantleTests-Prefix.pch
+++ b/MantleTests/MantleTests-Prefix.pch
@@ -1,10 +1,10 @@
//
-// Prefix header for all source files of the 'MaverickTests' target in the 'Maverick' project
+// Prefix header for all source files of the 'MantleTests' target in the 'Mantle' project
//
#ifdef __OBJC__
#import
- #import "Maverick.h"
+ #import "Mantle.h"
#import "Specta.h"