Merge branch 'integration/sdk-2.0' into task/generated-models

# Conflicts:
#	Mobile Buy SDK/Mobile Buy SDK/Models/BUYCustomer.m
#	Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/BUYOrder.h
#	Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/BUYOrder.m

Mobile Buy SDK/Mobile Buy SDK Tests/BUYAccountCredentialsTests.m

+//
+//  BUYAccountCredentialsTests.m
+//  Mobile Buy SDK
+//
+//  Created by Shopify.
+//  Copyright (c) 2015 Shopify Inc. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+#import <XCTest/XCTest.h>
+#import <Buy/Buy.h>
+
+@interface BUYAccountCredentialsTests : XCTestCase
+
+@end
+
+@implementation BUYAccountCredentialsTests
+
+#pragma mark - Init -
+- (void)testInitWithoutItems {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[]];
+	XCTAssertNotNil(credentials);
+	XCTAssertEqual(credentials.count, 0);
+}
+
+- (void)testInitWithItems {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:[self sampleWithValidItems]];
+	XCTAssertNotNil(credentials);
+	XCTAssertEqual(credentials.count, 2);
+}
+
+#pragma mark - Validation -
+- (void)testValidationWithValidItems {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:[self sampleWithValidItems]];
+	XCTAssertEqual(credentials.count, 2);
+	XCTAssertTrue(credentials.isValid);
+}
+
+- (void)testValidationWithInvalidItems {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:[self sampleWithInvalidItems]];
+	XCTAssertEqual(credentials.count, 3);
+	XCTAssertFalse(credentials.isValid);
+}
+
+#pragma mark - Mutation -
+- (void)testExtendingCredentials {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:[self sampleWithValidItems]];
+	XCTAssertEqual(credentials.count, 2);
+	
+	credentials = [credentials credentialsByAddingItems:@[
+														  [BUYAccountCredentialItem itemWithFirstName:@"John"],
+														  [BUYAccountCredentialItem itemWithLastName:@"Doe"],
+														  ]];
+	XCTAssertEqual(credentials.count, 4);
+}
+
+#pragma mark - Serialization -
+- (void)testJSONSerialization {
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[
+																					   [BUYAccountCredentialItem itemWithEmail:@"john@doe.com"],
+																					   [BUYAccountCredentialItem itemWithFirstName:@"John"],
+																					   [BUYAccountCredentialItem itemWithLastName:@"Doe"],
+																					   [BUYAccountCredentialItem itemWithPassword:@"pass"],
+																					   [BUYAccountCredentialItem itemWithPasswordConfirmation:@"pass"],
+																					   ]];
+	
+	NSDictionary *json     = [credentials JSONRepresentation];
+	NSDictionary *customer = json[@"customer"];
+	
+	XCTAssertNotNil(json);
+	XCTAssertEqual(json.count, 1);
+	XCTAssertNotNil(customer);
+	XCTAssertEqual(customer[@"email"], @"john@doe.com");
+	XCTAssertEqual(customer[@"first_name"], @"John");
+	XCTAssertEqual(customer[@"last_name"], @"Doe");
+	XCTAssertEqual(customer[@"password"], @"pass");
+	XCTAssertEqual(customer[@"password_confirmation"], @"pass");
+}
+
+#pragma mark - Utilities -
+- (BUYAccountCredentialItem *)emailItem
+{
+	return [BUYAccountCredentialItem itemWithEmail:@"john@smith.com"];
+}
+
+- (BUYAccountCredentialItem *)passwordItem
+{
+	return [BUYAccountCredentialItem itemWithPassword:@"password"];
+}
+
+- (BUYAccountCredentialItem *)passwordConfirmationItem
+{
+	return [BUYAccountCredentialItem itemWithPasswordConfirmation:@"password"];
+}
+
+- (NSArray *)sampleWithValidItems {
+	NSMutableArray *items = [NSMutableArray new];
+	[items addObject:[self emailItem]];
+	[items addObject:[self passwordItem]];
+	return items;
+}
+
+- (NSArray *)sampleWithInvalidItems {
+	NSMutableArray *items = [NSMutableArray new];
+	[items addObject:[self emailItem]];
+	[items addObject:[BUYAccountCredentialItem itemWithPassword:@""]];
+	[items addObject:[BUYAccountCredentialItem itemWithPasswordConfirmation:@""]];
+	return items;
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest.m

@@ -330,14 +330,18 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 
 - (void)testCustomerCreationURL
 {
-	BUYAccountCredentialItem *firstName = [BUYAccountCredentialItem itemWithKey:@"first_name" value:@"michael"];
-	BUYAccountCredentialItem *lastName = [BUYAccountCredentialItem itemWithKey:@"last_name" value:@"scott"];
-	BUYAccountCredentialItem *email = [BUYAccountCredentialItem itemWithKey:@"email" value:@"fake@example.com"];
-	BUYAccountCredentialItem *password = [BUYAccountCredentialItem itemWithKey:@"password" value:@"password"];
-	BUYAccountCredentialItem *passwordConfirmation = [BUYAccountCredentialItem itemWithKey:@"password_confirmation" value:@"password"];
-	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[firstName, lastName, email, password, passwordConfirmation]];
-	
-	NSURLSessionDataTask *task = [self.client createCustomerWithCredentials:credentials callback:nil];
+	NSArray *items = @[
+					   [BUYAccountCredentialItem itemWithFirstName:@"michael"],
+					   [BUYAccountCredentialItem itemWithLastName:@"scott"],
+					   [BUYAccountCredentialItem itemWithEmail:@"fake@example.com"],
+					   [BUYAccountCredentialItem itemWithPassword:@"password"],
+					   [BUYAccountCredentialItem itemWithPasswordConfirmation:@"password"],
+					   ];
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:items];
+	
+	NSURLSessionDataTask *task = [self.client createCustomerWithCredentials:credentials callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers.json");
@@ -348,20 +352,25 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 	
 	XCTAssertNil(error);
 	NSDictionary *dict = @{@"customer": @{
-								   @"first_name": firstName.value,
-								   @"last_name": lastName.value,
-								   @"email": email.value,
-								   @"password": password.value,
-								   @"password_confirmation": passwordConfirmation.value}};
+								   @"first_name": @"michael",
+								   @"last_name": @"scott",
+								   @"email": @"fake@example.com",
+								   @"password": @"password",
+								   @"password_confirmation": @"password"
+								   }};
 	XCTAssertEqualObjects(payload, dict);
 }
 
 - (void)testLoginCustomerURL
 {
-	BUYAccountCredentialItem *email = [BUYAccountCredentialItem itemWithKey:@"email" value:@"fake@example.com"];
-	BUYAccountCredentialItem *password = [BUYAccountCredentialItem itemWithKey:@"password" value:@"password"];
-	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[email, password]];
-	NSURLSessionDataTask *task = [self.client loginCustomerWithCredentials:credentials callback:nil];
+	NSArray *items = @[
+					   [BUYAccountCredentialItem itemWithEmail:@"fake@example.com"],
+					   [BUYAccountCredentialItem itemWithPassword:@"password"],
+					   ];
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:items];
+	NSURLSessionDataTask *task = [self.client loginCustomerWithCredentials:credentials callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers/customer_token.json");
@@ -371,13 +380,18 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 	NSDictionary *payload = [NSJSONSerialization JSONObjectWithData:task.originalRequest.HTTPBody options:0 error:&error];
 	
 	XCTAssertNil(error);
-	NSDictionary *dict = @{@"customer": @{@"email": email.value, @"password": password.value}};
+	NSDictionary *dict = @{@"customer": @{
+								   @"email": @"fake@example.com",
+								   @"password": @"password",
+								   }};
 	XCTAssertEqualObjects(payload, dict);
 }
 
 - (void)testGetCustomerURL
 {
-	NSURLSessionDataTask *task = [self.client getCustomerWithID:nil callback:nil];
+	NSURLSessionDataTask *task = [self.client getCustomerWithID:@"" callback:^(BUYCustomer *customer, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers.json");
@@ -388,7 +402,9 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 
 - (void)testGetOrdersForCustomerURL
 {
-	NSURLSessionDataTask *task = [self.client getOrdersForCustomerWithCallback:nil];
+	NSURLSessionDataTask *task = [self.client getOrdersForCustomerWithCallback:^(NSArray<BUYOrder *> *orders, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers/orders.json");
@@ -400,7 +416,9 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 - (void)testCustomerRecovery
 {
 	NSString *email = @"fake@example.com";
-	NSURLSessionDataTask *task = [self.client recoverPasswordForCustomer:email callback:nil];
+	NSURLSessionDataTask *task = [self.client recoverPasswordForCustomer:email callback:^(BUYStatus status, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers/recover.json");
@@ -418,11 +436,13 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 {
 	self.client.customerToken = nil;
 	
-	NSURLSessionDataTask *task = [self.client renewCustomerTokenWithID:nil callback:^(NSString *token, NSError *error) {}];
+	NSURLSessionDataTask *task = [self.client renewCustomerTokenWithID:@"" callback:^(NSString *token, NSError *error) {}];
 	XCTAssertNil(task); // task should be nil if no customer token was set on the client
 	
 	self.client.customerToken = BUYFakeCustomerToken;
-	task = [self.client renewCustomerTokenWithID:@"1" callback:nil];
+	task = [self.client renewCustomerTokenWithID:@"1" callback:^(NSString *token, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers/1/customer_token/renew.json");
@@ -431,12 +451,16 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 
 - (void)testCustomerActivation
 {
-	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithKey:@"password" value:@"12345"];
-	BUYAccountCredentialItem *passwordConfItem = [BUYAccountCredentialItem itemWithKey:@"password_confirmation" value:@"12345"];
-	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[passwordItem, passwordConfItem]];
+	NSArray *items = @[
+					   [BUYAccountCredentialItem itemWithPassword:@"12345"],
+					   [BUYAccountCredentialItem itemWithPasswordConfirmation:@"12345"],
+					   ];
+	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:items];
 	NSString *customerID = @"12345";
 	NSString *customerToken = @"12345";
-	NSURLSessionDataTask *task = [self.client activateCustomerWithCredentials:credentials customerID:customerID customerToken:customerToken callback:nil];
+	NSURLSessionDataTask *task = [self.client activateCustomerWithCredentials:credentials customerID:customerID customerToken:customerToken callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
+		
+	}];
 	
 	XCTAssertEqualObjects(task.originalRequest.URL.scheme, @"https");
 	XCTAssertEqualObjects(task.originalRequest.URL.path, @"/api/customers/12345/activate.json");

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest_Customer.m

@@ -56,9 +56,9 @@
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	
-	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithKey:@"email" value:self.customerEmail];
-	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithKey:@"password" value:self.customerPassword];
-	BUYAccountCredentialItem *passwordConfItem = [BUYAccountCredentialItem itemWithKey:@"password_confirmation" value:self.customerPassword];
+	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithEmail:self.customerEmail];
+	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithPassword:self.customerPassword];
+	BUYAccountCredentialItem *passwordConfItem = [BUYAccountCredentialItem itemWithPasswordConfirmation:self.customerPassword];
 	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[emailItem, passwordItem, passwordConfItem]];
 	
 	[self.client createCustomerWithCredentials:credentials callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
@@ -93,9 +93,9 @@
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	
-	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithKey:@"email" value:@"a"];
-	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithKey:@"password" value:@"b"];
-	BUYAccountCredentialItem *passwordConfItem = [BUYAccountCredentialItem itemWithKey:@"password_confirmation" value:@"c"];
+	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithEmail:@"a"];
+	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithPassword:@"b"];
+	BUYAccountCredentialItem *passwordConfItem = [BUYAccountCredentialItem itemWithPasswordConfirmation:@"c"];
 	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[emailItem, passwordItem, passwordConfItem]];
 	
 	[self.client createCustomerWithCredentials:credentials callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
@@ -135,8 +135,8 @@
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	
-	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithKey:@"email" value:self.customerEmail];
-	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithKey:@"password" value:self.customerPassword];
+	BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithEmail:self.customerEmail];
+	BUYAccountCredentialItem *passwordItem = [BUYAccountCredentialItem itemWithPassword:self.customerPassword];
 	BUYAccountCredentials *credentials = [BUYAccountCredentials credentialsWithItems:@[emailItem, passwordItem]];
 	
 	[self.client loginCustomerWithCredentials:credentials callback:^(BUYCustomer *customer, NSString *token, NSError *error) {

Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Customers.h

@@ -25,6 +25,7 @@
 //
 
 #import "BUYClient.h"
+NS_ASSUME_NONNULL_BEGIN
 
 @class BUYCustomer;
 @class BUYOrder;
@@ -36,7 +37,7 @@
  *  @param customer A BUYCustomer
  *  @param error    An optional NSError
  */
-typedef void (^BUYDataCustomerBlock)(BUYCustomer *customer, NSError *error);
+typedef void (^BUYDataCustomerBlock)(BUYCustomer * _Nullable customer, NSError * _Nullable error);
 
 /**
  *  Return block containing a customer auth token
@@ -45,7 +46,7 @@ typedef void (^BUYDataCustomerBlock)(BUYCustomer *customer, NSError *error);
  *  @param token    An authentication token to retrieve the customer later.  Store this token securely on the device.
  *  @param error    An optional NSError
  */
-typedef void (^BUYDataCustomerTokenBlock)(BUYCustomer *customer, NSString *token, NSError *error);
+typedef void (^BUYDataCustomerTokenBlock)(BUYCustomer * _Nullable customer, NSString * _Nullable token, NSError * _Nullable error);
 
 /**
  *  Return block containing a customer auth token
@@ -53,7 +54,7 @@ typedef void (^BUYDataCustomerTokenBlock)(BUYCustomer *customer, NSString *token
  *  @param token    An authentication token to retrieve the customer later.  Store this token securely on the device.
  *  @param error    An optional NSError
  */
-typedef void (^BUYDataTokenBlock)(NSString *token, NSError *error);
+typedef void (^BUYDataTokenBlock)(NSString * _Nullable token, NSError * _Nullable error);
 
 /**
  *  Return block containing an array of BUYOrders
@@ -61,7 +62,7 @@ typedef void (^BUYDataTokenBlock)(NSString *token, NSError *error);
  *  @param orders An array of BUYOrders
  *  @param error  An optional NSError
  */
-typedef void (^BUYDataOrdersBlock)(NSArray <BUYOrder*> *orders, NSError *error);
+typedef void (^BUYDataOrdersBlock)(NSArray <BUYOrder*> * _Nullable orders, NSError * _Nullable error);
 
 
 @interface BUYClient (Customers)
@@ -163,3 +164,5 @@ typedef void (^BUYDataOrdersBlock)(NSArray <BUYOrder*> *orders, NSError *error);
 - (NSURLSessionDataTask *)getOrdersForCustomerWithCallback:(BUYDataOrdersBlock)block;
 
 @end
+
+NS_ASSUME_NONNULL_END

Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Customers.m

@@ -159,10 +159,10 @@
 	NSData *data = [NSJSONSerialization dataWithJSONObject:credentials.JSONRepresentation options:0 error:nil];
 	
 	return [self putRequestForURL:components.URL body:data completionHandler:^(NSDictionary *json, NSURLResponse *response, NSError *error) {
-		if (json && !error) {
-			BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithKey:@"email" value:json[@"customer"][@"email"]];
-			credentials[@"email"] = emailItem;
-			[self loginCustomerWithCredentials:credentials callback:block];
+		NSString *email = json[@"customer"][@"email"];
+		if (email && !error) {
+			BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithEmail:email];
+			[self loginCustomerWithCredentials:[credentials credentialsByAddingItems:@[emailItem]] callback:block];
 		}
 		else {
 			block(nil, nil, error);
@@ -176,10 +176,10 @@
 	NSData *data = [NSJSONSerialization dataWithJSONObject:credentials.JSONRepresentation options:0 error:nil];
 	
 	return [self putRequestForURL:components.URL body:data completionHandler:^(NSDictionary *json, NSURLResponse *response, NSError *error) {
-		if (json && !error) {
-			BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithKey:@"email" value:json[@"customer"][@"email"]];
-			credentials[@"email"] = emailItem;
-			[self loginCustomerWithCredentials:credentials callback:block];
+		NSString *email = json[@"customer"][@"email"];
+		if (email && !error) {
+			BUYAccountCredentialItem *emailItem = [BUYAccountCredentialItem itemWithEmail:email];
+			[self loginCustomerWithCredentials:[credentials credentialsByAddingItems:@[emailItem]] callback:block];
 		}
 		else {
 			block(nil, nil, error);

Mobile Buy SDK/Mobile Buy SDK/Models/BUYAccountCredentials.h

@@ -25,40 +25,46 @@
 //
 
 #import <Foundation/Foundation.h>
+NS_ASSUME_NONNULL_BEGIN
+
+@class BUYAccountCredentialItem;
 
 /**
- *   Intended for storing a collection of credential items representing individual values
+ * Encapsulates user's credentials represented by BUYAccountCredentialItem
+ * objects.
  */
-
-@class BUYAccountCredentialItem;
 @interface BUYAccountCredentials : NSObject
 
-NS_ASSUME_NONNULL_BEGIN
+@property (nonatomic, strong, readonly) NSArray<BUYAccountCredentialItem *> *items;
 
-+ (BUYAccountCredentials *)credentialsWithItems:(NSArray<BUYAccountCredentialItem *> *)items;
-+ (BUYAccountCredentials *)credentialsWithItemKeys:(NSArray<NSString *> *)keys;
+@property (nonatomic, assign, readonly) NSUInteger count;
+@property (nonatomic, assign, readonly, getter=isValid) BOOL valid;
+@property (nonatomic, strong, readonly) NSDictionary *JSONRepresentation;
 
-@property (readonly) NSDictionary *JSONRepresentation;
-@property (nonatomic, readonly, getter=isValid) BOOL valid;
++ (BUYAccountCredentials *)credentialsWithItems:(NSArray<BUYAccountCredentialItem *> *)items;
+- (instancetype)initWithItems:(NSArray<BUYAccountCredentialItem *> *)items;
 
-- (BUYAccountCredentialItem *)objectForKeyedSubscript:(NSString *)key;
-- (void)setObject:(BUYAccountCredentialItem *)obj forKeyedSubscript:(NSString *)key;
+- (BUYAccountCredentials *)credentialsByAddingItems:(NSArray<BUYAccountCredentialItem *> *)items;
 
 @end
 
 
 /**
- *  Represents a key and KVC-validatable value
+ * Represents a single for user's credentials such as 
+ * email or password.
  */
-
 @interface BUYAccountCredentialItem : NSObject
 
-+ (instancetype)itemWithKey:(NSString *)key value:(NSString *)value;
+@property (nonatomic, assign, readonly, getter=isValid) BOOL valid;
+@property (nonatomic, strong, readonly) NSString *key;
+@property (nonatomic, strong, readonly) NSString *value;
 
-@property (nonatomic, getter=isValid) BOOL valid;
-@property (nonatomic, strong) NSString *key;
-@property (nonatomic, strong) NSString *value;
-
-NS_ASSUME_NONNULL_END
++ (instancetype)itemWithEmail:(NSString *)value;
++ (instancetype)itemWithFirstName:(NSString *)value;
++ (instancetype)itemWithLastName:(NSString *)value;
++ (instancetype)itemWithPassword:(NSString *)value;
++ (instancetype)itemWithPasswordConfirmation:(NSString *)value;
 
 @end
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file

Mobile Buy SDK/Mobile Buy SDK/Models/BUYAccountCredentials.m

@@ -26,94 +26,129 @@
 
 #import "BUYAccountCredentials.h"
 
-@class BUYAccountCredentialItem;
+static NSString * const BUYAccountFirstNameKey            = @"first_name";
+static NSString * const BUYAccountLastNameKey             = @"last_name";
+static NSString * const BUYAccountEmailKey                = @"email";
+static NSString * const BUYAccountPasswordKey             = @"password";
+static NSString * const BUYAccountPasswordConfirmationKey = @"password_confirmation";
+
+#pragma mark - BUYAccountCredentials -
 @interface BUYAccountCredentials()
-@property (strong, nonatomic) NSMutableDictionary<NSString *, BUYAccountCredentialItem *> *items;
+
+@property (strong, nonatomic) NSDictionary<NSString *, BUYAccountCredentialItem *> *credentialItems;
+
 @end
 
 @implementation BUYAccountCredentials
 
+#pragma mark - Init -
 + (BUYAccountCredentials *)credentialsWithItems:(NSArray<BUYAccountCredentialItem *> *)items
 {
-	BUYAccountCredentials *credentials = [BUYAccountCredentials new];
-	NSMutableDictionary *keyedItems = [NSMutableDictionary dictionary];
-	for (BUYAccountCredentialItem *item in items) {
-		keyedItems[item.key] = item;
-	}
-	credentials.items = keyedItems;
-	return credentials;
+	return [[BUYAccountCredentials alloc] initWithItems:items];
 }
 
-+ (BUYAccountCredentials *)credentialsWithItemKeys:(NSArray<NSString *> *)keys
+- (instancetype)initWithItems:(NSArray<BUYAccountCredentialItem *> *)items
 {
-	NSMutableArray *items = [NSMutableArray array];
-	for (NSString *key in keys) {
-		BUYAccountCredentialItem *item = [BUYAccountCredentialItem itemWithKey:key value:@""];
-		[items addObject:item];
+	self = [super init];
+	if (self) {
+		
+		NSMutableDictionary *container = [NSMutableDictionary new];
+		for (BUYAccountCredentialItem *item in items) {
+			container[item.key] = item;
+		}
+		_credentialItems = [container copy];
 	}
-	return [BUYAccountCredentials credentialsWithItems:items];
+	return self;
+}
+
+#pragma mark - Adding Items -
+- (BUYAccountCredentials *)credentialsByAddingItems:(NSArray<BUYAccountCredentialItem *> *)items
+{
+	NSMutableArray *container = [self.items mutableCopy];
+	[container addObjectsFromArray:items];
+	return [BUYAccountCredentials credentialsWithItems:container];
+}
+
+#pragma mark - Accessors -
+- (NSArray<BUYAccountCredentialItem *> *)items
+{
+	return self.credentialItems.allValues;
+}
+
+- (NSUInteger)count
+{
+	return self.credentialItems.count;
+}
+
+- (BOOL)isValid
+{
+	__block BOOL valid = YES;
+	[self.credentialItems enumerateKeysAndObjectsUsingBlock:^(NSString *key, BUYAccountCredentialItem *item, BOOL * _Nonnull stop) {
+		if (!item.isValid) {
+			valid = NO;
+			*stop = YES;
+		}
+	}];
+	return valid;
 }
 
+#pragma mark - Serialization -
 - (NSDictionary *)JSONRepresentation
 {
 	__block NSMutableDictionary *customer = [NSMutableDictionary dictionary];
-	[self.items enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, BUYAccountCredentialItem * _Nonnull obj, BOOL * _Nonnull stop) {
+	[self.credentialItems enumerateKeysAndObjectsUsingBlock:^(NSString *key, BUYAccountCredentialItem *obj, BOOL *stop) {
 		customer[key] = obj.value;
 	}];
 	return @{ @"customer": customer };
 }
 
-- (BOOL)validateValue:(inout id  _Nullable __autoreleasing *)ioValue forKey:(NSString *)inKey error:(out NSError * _Nullable __autoreleasing *)outError
-{
-	return [self.items[inKey] validateValue:ioValue forKey:inKey error:outError];
-}
+@end
 
-- (BUYAccountCredentialItem *)objectForKeyedSubscript:(NSString *)key
+#pragma mark - BUYAccountCredentialItem -
+@implementation BUYAccountCredentialItem
+
+#pragma mark - Init -
++ (instancetype)itemWithEmail:(NSString *)value
 {
-	return self.items[key];
+	return [BUYAccountCredentialItem itemWithKey:BUYAccountEmailKey value:value];
 }
 
-- (void)setObject:(BUYAccountCredentialItem *)obj forKeyedSubscript:(NSString *)key
++ (instancetype)itemWithFirstName:(NSString *)value
 {
-	self.items[key] = obj;
+	return [BUYAccountCredentialItem itemWithKey:BUYAccountFirstNameKey value:value];
 }
 
-- (BOOL)validationForKey:(NSString *)key
++ (instancetype)itemWithLastName:(NSString *)value
 {
-	return [self.items[key] isValid];
+	return [BUYAccountCredentialItem itemWithKey:BUYAccountLastNameKey value:value];
 }
 
-- (BOOL)isValid
++ (instancetype)itemWithPassword:(NSString *)value
 {
-	__block BOOL valid = YES;
-	[self.items enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, BUYAccountCredentialItem * _Nonnull obj, BOOL * _Nonnull stop) {
-		valid = valid && [obj isValid];
-	}];
-	return valid;
+	return [BUYAccountCredentialItem itemWithKey:BUYAccountPasswordKey value:value];
 }
 
-@end
-
-@implementation BUYAccountCredentialItem
-
-+ (instancetype)itemWithKey:(NSString *)key value:(NSString *)value
++ (instancetype)itemWithPasswordConfirmation:(NSString *)value
 {
-	BUYAccountCredentialItem *item = [BUYAccountCredentialItem new];
-	item.key = key;
-	item.value = value;
-	return item;
+	return [BUYAccountCredentialItem itemWithKey:BUYAccountPasswordConfirmationKey value:value];
 }
 
-- (NSString *)value
++ (instancetype)itemWithKey:(NSString *)key value:(NSString *)value
 {
-	return _value ?: @"";
+	return [[BUYAccountCredentialItem alloc] initWithKey:key value:value];
 }
 
-- (BOOL)validateValue:(inout id  _Nullable __autoreleasing *)ioValue forKey:(NSString *)inKey error:(out NSError * _Nullable __autoreleasing *)outError
+- (instancetype)initWithKey:(NSString *)key value:(NSString *)value
 {
-	self.value = *ioValue;
-	self.valid = self.value.length > 0;
-	return [self isValid];
+	self = [super init];
+	if (self) {
+		NSAssert(value, @"Cannot initialize BUYAccountCredentialItem with nil value.");
+		
+		_key   = key;
+		_value = value;
+		_valid = value.length > 0;
+	}
+	return self;
 }
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/BUYOrder.h

 //
-//  _BUYOrder.h
+//  BUYOrder.h
 //  Mobile Buy SDK
 //
 //  Created by Shopify.