Convert BUYError to non-NSError object.

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

@@ -33,6 +33,7 @@
 #import "BUYClientTestBase.h"
 #import "BUYCollection+Additions.h"
 #import "NSURLComponents+BUYAdditions.h"
+#import "BUYShopifyErrorCodes.h"
 
 @interface BUYClient ()
 

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest_Storefront.m

@@ -33,6 +33,7 @@
 #import "BUYClientTestBase.h"
 #import <OHHTTPStubs/OHHTTPStubs.h>
 #import "OHHTTPStubsResponse+Helpers.h"
+#import "BUYShopifyErrorCodes.h"
 
 @interface BUYClientTest_Storefront : BUYClientTestBase
 @property (nonatomic, strong) BUYCollection *collection;

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

@@ -37,6 +37,7 @@
 #import "BUYProduct.h"
 #import "BUYShippingRate.h"
 #import "BUYShop.h"
+#import "BUYShopifyErrorCodes.h"
 #import "NSDecimalNumber+BUYAdditions.h"
 #import "NSURLComponents+BUYAdditions.h"
 
@@ -632,9 +633,9 @@ static NSString *const kBUYClientPathCollectionPublications = @"collection_listi
 	return status;
 }
 
-- (BUYError *)errorFromJSON:(NSDictionary *)errorDictionary statusCode:(NSInteger)statusCode
+- (NSError *)errorFromJSON:(NSDictionary *)errorDictionary statusCode:(NSInteger)statusCode
 {
-	return [[BUYError alloc] initWithDomain:kShopifyError code:statusCode userInfo:errorDictionary];
+	return [[NSError alloc] initWithDomain:kShopifyError code:statusCode userInfo:errorDictionary];
 }
 
 - (NSURLSessionDataTask *)requestForURL:(NSURL *)url method:(NSString *)method object:(id <BUYSerializable>)object completionHandler:(void (^)(NSDictionary *json, NSURLResponse *response, NSError *error))completionHandler

Mobile Buy SDK/Mobile Buy SDK/Models/BUYError.h

@@ -26,55 +26,14 @@
 
 #import <Foundation/Foundation.h>
 
-extern NSString * const BUYShopifyError;
+@interface BUYError : NSObject
 
-/**
- *  A collection of enums for error codes specific to the SDK
- */
-typedef NS_ENUM(NSUInteger, BUYCheckoutError){
-	/**
-	 *  An error occurred retrieving the cart for an existing web checkout with BUYStoreViewController
-	 */
-	BUYShopifyError_CartFetchError,
-	/**
-	 *  No shipping rates are available for the selected address
-	 */
-	BUYShopifyError_NoShippingMethodsToAddress,
-	/**
-	 *  No product or product ID was provided when loading a product in BUYProductViewController
-	 */
-	BUYShopifyError_NoProductSpecified,
-	/**
-	 *  The product ID or IDs provided were invalid for the shop. Check that the product are made visible on the Mobile App channel on /admin.
-	 */
-	BUYShopifyError_InvalidProductID,
-	/**
-	 *  No collection ID was provided when loading a collection
-	 */
-	BUYShopifyError_NoCollectionIdSpecified,
-	/**
-	 *  No gift card code was provided when applying a gift card to a checkout
-	 */
-	BUYShopifyError_NoGiftCardSpecified,
-	/**
-	 *  No credit card was provided when calling `storeCreditCard:completion:`
-	 */
-	BUYShopifyError_NoCreditCardSpecified,
-	/**
-	 *  No Apple Pay token was provided when attempting to complete a checkout using Apple Pay
-	 */
-	BUYShopifyError_NoApplePayTokenSpecified,
-	/**
-	 *  The checkout is invalid and does not have a checkout token. This generally means the BUYCheckout object 
-	 *  has not been synced with Shopify via `createCheckout:completion:` before making subsequent calls to update
-	 *  or complete the checkout
-	 */
-	BUYShopifyError_InvalidCheckoutObject,
-};
+@property (nonatomic, copy) NSString *key;
 
-/**
- *  BUYError overrides `description` and provides a human-readable dictionary for the error
- */
-@interface BUYError : NSError
+- (instancetype)initWithKey:(NSString *)key json:(NSDictionary *)json;
+
+@property (nonatomic, copy) NSString *code;
+@property (nonatomic, copy) NSString *message;
+@property (nonatomic, copy) NSDictionary<NSString *, NSString *> *options;
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Models/BUYError.m

@@ -26,13 +26,21 @@
 
 #import "BUYError.h"
 
-NSString * const BUYShopifyError = @"BUYShopifyError";
-
 @implementation BUYError
 
+- (instancetype)initWithKey:(NSString *)key json:(NSDictionary *)json
+{
+	self = [super init];
+	if (self) {
+		self.key = key;
+		[self setValuesForKeysWithDictionary:json];
+	}
+	return self;
+}
+
 - (NSString *)description
 {
-	return [NSString stringWithFormat:@"Error code %td: %@", self.code, [self userInfo]];
+	return [NSString stringWithFormat:@"%@ %@", self.key, self.message];
 }
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Product View/BUYProductViewController.m

@@ -44,6 +44,7 @@
 #import "BUYVariantSelectionViewController.h"
 #import "BUYError.h"
 #import "BUYShop.h"
+#import "BUYShopifyErrorCodes.h"
 #import "BUYImage.h"
 
 CGFloat const BUYMaxProductViewWidth = 414.0; // We max out to the width of the iPhone 6+

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m

@@ -31,6 +31,7 @@
 #import "BUYError.h"
 #import "BUYAddress+Additions.h"
 #import "BUYShop.h"
+#import "BUYShopifyErrorCodes.h"
 
 const NSTimeInterval PollDelay = 0.5;
 

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYError+BUYAdditions.h

+//
+//  BUYError+BUYAdditions.h
+//  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 "BUYError.h"
+
+@interface BUYError (Checkout)
++ (NSArray<BUYError *> *)errorsFromCheckoutJSON:(NSDictionary *)json;
+@property (readonly) NSString *quantityRemainingMessage;
+@end
+
+@interface BUYError (Customer)
++ (NSArray<BUYError *> *)errorsFromSignUpJSON:(NSDictionary *)json;
+@end

Mobile Buy SDK/Mobile Buy SDK/Utils/BUYError+BUYAdditions.m

+//
+//  BUYError+BUYAdditions.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 "BUYError+BUYAdditions.h"
+
+@implementation BUYError (Checkout)
+
++ (NSArray<BUYError *> *)errorsFromCheckoutJSON:(NSDictionary *)json
+{
+	NSArray *lineItems = json[@"errors"][@"checkout"][@"line_items"];
+	NSMutableArray *errors = [NSMutableArray array];
+	
+	for (NSDictionary<NSString *, NSArray *> *lineItem in lineItems) {
+		if (lineItem == (id)[NSNull null]) {
+			[errors addObject:lineItem];
+		}
+		else {
+			for (NSString *key in lineItem.allKeys) {
+				NSDictionary *reason = [lineItem[key] firstObject];
+				[errors addObject:[[BUYError alloc] initWithKey:key json:reason]];
+			};
+		}
+	};
+	return errors;
+}
+
+- (NSString *)quantityRemainingMessage
+{
+	NSNumber *remaining = (id)self.options[@"remaining"];
+	NSString *localizedString;
+	
+	if ([remaining isEqualToNumber:@0]) {
+		localizedString = NSLocalizedString(@"Completely sold out", @"String describing a line item with zero stock available");
+	} else {
+		localizedString = NSLocalizedString(@"Only %1$@ left in stock, reduce the quantity and try again.", @"String describing an out of stock line item with first parameter representing amount remaining");
+	}
+	return [NSString localizedStringWithFormat:localizedString, remaining];
+}
+
+@end
+
+@implementation BUYError (Customer)
+
++ (NSArray<BUYError *> *)errorsFromSignUpJSON:(NSDictionary *)json
+{
+	NSDictionary *reasons = json[@"errors"][@"customer"];
+	
+	__block NSMutableArray *errors = [NSMutableArray array];
+	[reasons enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSArray * _Nonnull obj, BOOL * _Nonnull stop) {
+		for (NSDictionary *reason in obj) {
+			[errors addObject:[[BUYError alloc] initWithKey:key json:reason]];
+		}
+	}];
+	
+	return errors;
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK/View Controllers/BUYStoreViewController.m

@@ -31,6 +31,7 @@
 #import "BUYStoreViewController.h"
 #import "BUYError.h"
 #import "BUYOrder.h"
+#import "BUYShopifyErrorCodes.h"
 
 @interface BUYStoreViewController () <WKNavigationDelegate, WKScriptMessageHandler>
 @end