Update extensions to Cocoa Foundation classes.

Standardize category names and unify to have one category per class. Move files to "Additions" directory.

Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj

@@ -33,6 +33,46 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		841ADDFF1CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDEB1CB6C942000004B0 /* NSArray+BUYAdditions.h */; };
+		841ADE001CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDEB1CB6C942000004B0 /* NSArray+BUYAdditions.h */; };
+		841ADE011CB6C942000004B0 /* NSArray+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDEC1CB6C942000004B0 /* NSArray+BUYAdditions.m */; };
+		841ADE021CB6C942000004B0 /* NSArray+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDEC1CB6C942000004B0 /* NSArray+BUYAdditions.m */; };
+		841ADE031CB6C942000004B0 /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDED1CB6C942000004B0 /* NSDate+BUYAdditions.h */; };
+		841ADE041CB6C942000004B0 /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDED1CB6C942000004B0 /* NSDate+BUYAdditions.h */; };
+		841ADE051CB6C942000004B0 /* NSDate+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDEE1CB6C942000004B0 /* NSDate+BUYAdditions.m */; };
+		841ADE061CB6C942000004B0 /* NSDate+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDEE1CB6C942000004B0 /* NSDate+BUYAdditions.m */; };
+		841ADE071CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDEF1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h */; };
+		841ADE081CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDEF1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h */; };
+		841ADE091CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF01CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m */; };
+		841ADE0A1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF01CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m */; };
+		841ADE0B1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF11CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h */; };
+		841ADE0C1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF11CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h */; };
+		841ADE0D1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF21CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m */; };
+		841ADE0E1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF21CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m */; };
+		841ADE0F1CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF31CB6C942000004B0 /* NSDictionary+BUYAdditions.h */; };
+		841ADE101CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF31CB6C942000004B0 /* NSDictionary+BUYAdditions.h */; };
+		841ADE111CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF41CB6C942000004B0 /* NSDictionary+BUYAdditions.m */; };
+		841ADE121CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF41CB6C942000004B0 /* NSDictionary+BUYAdditions.m */; };
+		841ADE131CB6C942000004B0 /* NSException+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF51CB6C942000004B0 /* NSException+BUYAdditions.h */; };
+		841ADE141CB6C942000004B0 /* NSException+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF51CB6C942000004B0 /* NSException+BUYAdditions.h */; };
+		841ADE151CB6C942000004B0 /* NSException+BUYModelAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF61CB6C942000004B0 /* NSException+BUYModelAdditions.m */; };
+		841ADE161CB6C942000004B0 /* NSException+BUYModelAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF61CB6C942000004B0 /* NSException+BUYModelAdditions.m */; };
+		841ADE171CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF71CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h */; };
+		841ADE181CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF71CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h */; };
+		841ADE191CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF81CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m */; };
+		841ADE1A1CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDF81CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m */; };
+		841ADE1B1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF91CB6C942000004B0 /* NSString+BUYAdditions.h */; };
+		841ADE1C1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDF91CB6C942000004B0 /* NSString+BUYAdditions.h */; };
+		841ADE1D1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFA1CB6C942000004B0 /* NSString+BUYAdditions.m */; };
+		841ADE1E1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFA1CB6C942000004B0 /* NSString+BUYAdditions.m */; };
+		841ADE1F1CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDFB1CB6C942000004B0 /* NSURL+BUYAdditions.h */; };
+		841ADE201CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDFB1CB6C942000004B0 /* NSURL+BUYAdditions.h */; };
+		841ADE211CB6C942000004B0 /* NSURL+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFC1CB6C942000004B0 /* NSURL+BUYAdditions.m */; };
+		841ADE221CB6C942000004B0 /* NSURL+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFC1CB6C942000004B0 /* NSURL+BUYAdditions.m */; };
+		841ADE231CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDFD1CB6C942000004B0 /* NSURLComponents+BUYAdditions.h */; };
+		841ADE241CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 841ADDFD1CB6C942000004B0 /* NSURLComponents+BUYAdditions.h */; };
+		841ADE251CB6C942000004B0 /* NSURLComponents+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFE1CB6C942000004B0 /* NSURLComponents+BUYAdditions.m */; };
+		841ADE261CB6C942000004B0 /* NSURLComponents+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 841ADDFE1CB6C942000004B0 /* NSURLComponents+BUYAdditions.m */; };
 		9003969B1B601DF400226B73 /* BUYCartLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 900396991B601DF400226B73 /* BUYCartLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9003969C1B601DF400226B73 /* BUYCartLineItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9003969A1B601DF400226B73 /* BUYCartLineItem.m */; };
 		900396AC1B627CB900226B73 /* BUYProductView.h in Headers */ = {isa = PBXBuildFile; fileRef = 900396AA1B627CB900226B73 /* BUYProductView.h */; };
@@ -43,24 +83,17 @@
 		900396F71B69563400226B73 /* BUYCollection+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 900396F51B69563400226B73 /* BUYCollection+Additions.m */; };
 		900E7C841B5DA553006F3C81 /* BUYImageKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 900E7C811B5DA32F006F3C81 /* BUYImageKit.h */; };
 		900E7C851B5DA559006F3C81 /* BUYImageKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 900E7C821B5DA32F006F3C81 /* BUYImageKit.m */; };
-		901335461C187E0400410ED0 /* NSURLComponents+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 901335441C187E0400410ED0 /* NSURLComponents+BUYAdditions.h */; };
-		901335471C187E0400410ED0 /* NSURLComponents+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 901335441C187E0400410ED0 /* NSURLComponents+BUYAdditions.h */; };
-		901335481C187E0400410ED0 /* NSURLComponents+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 901335451C187E0400410ED0 /* NSURLComponents+BUYAdditions.m */; };
-		901335491C187E0400410ED0 /* NSURLComponents+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 901335451C187E0400410ED0 /* NSURLComponents+BUYAdditions.m */; };
 		901930E31BC5B9BC00D1134E /* BUYApplePayHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */; };
 		901930E41BC5B9BC00D1134E /* BUYOptionSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9496AF1B4D96D800B38949 /* BUYOptionSelectionViewController.m */; };
 		901930E51BC5B9BC00D1134E /* BUYVariantOptionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 90516CA21B4D771400E35E45 /* BUYVariantOptionView.m */; };
 		901930E61BC5B9BC00D1134E /* BUYPresentationControllerForVariantSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB74A201B554BF20005A300 /* BUYPresentationControllerForVariantSelection.m */; };
-		901930E71BC5B9BC00D1134E /* NSDecimalNumber+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A9C1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.m */; };
 		901930E81BC5B9BC00D1134E /* BUYImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A7A1A700B0A0087DB2C /* BUYImage.m */; };
 		901930E91BC5B9BC00D1134E /* BUYProductVariant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A821A700B0A0087DB2C /* BUYProductVariant.m */; };
 		901930EA1BC5B9BC00D1134E /* BUYProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 905ECCC11B4C39710094F336 /* BUYProductViewController.m */; };
-		901930EB1BC5B9BC00D1134E /* NSDateFormatter+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A446241B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m */; };
 		901930EC1BC5B9BC00D1134E /* BUYError.m in Sources */ = {isa = PBXBuildFile; fileRef = BE47340E1B66C4EF00AA721A /* BUYError.m */; };
 		901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 90516C861B4C6F7000E35E45 /* BUYProductViewHeader.m */; };
 		901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90516CC21B4F1ED700E35E45 /* BUYNavigationController.m */; };
 		901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9496B11B4D96D800B38949 /* BUYVariantSelectionViewController.m */; };
-		901930F11BC5B9BC00D1134E /* NSString+Trim.m in Sources */ = {isa = PBXBuildFile; fileRef = F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */; };
 		901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 90E83BC31B9F550E00C95A1B /* BUYOrder.m */; };
 		901930F31BC5B9BC00D1134E /* BUYAddress+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4FA1B177EC80067982B /* BUYAddress+Additions.m */; };
 		901930F41BC5B9BC00D1134E /* BUYProductViewHeaderBackgroundImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 90FC31A71B50371600AFAB51 /* BUYProductViewHeaderBackgroundImageView.m */; };
@@ -75,14 +108,12 @@
 		901930FD1BC5B9BC00D1134E /* BUYTaxLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 90AFAA5D1B011EA600F21C23 /* BUYTaxLine.m */; };
 		901930FE1BC5B9BC00D1134E /* BUYCollection+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 900396F51B69563400226B73 /* BUYCollection+Additions.m */; };
 		901930FF1BC5B9BC00D1134E /* BUYVariantOptionBreadCrumbsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 90DE926F1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.m */; };
-		901931001BC5B9BC00D1134E /* NSURL+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */; };
 		901931011BC5B9BC00D1134E /* BUYTheme+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 906EAE421B836DE000976165 /* BUYTheme+Additions.m */; };
 		901931021BC5B9BC00D1134E /* BUYStoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1C4DF41AE98FBB00E21624 /* BUYStoreViewController.m */; };
 		901931031BC5B9BC00D1134E /* BUYOptionValue.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEA83E61B0B76C7000C6483 /* BUYOptionValue.m */; };
 		901931041BC5B9BC00D1134E /* BUYApplePayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */; };
 		901931051BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB74A261B554BFB0005A300 /* BUYOptionSelectionNavigationController.m */; };
 		901931061BC5B9BC00D1134E /* BUYDiscount.m in Sources */ = {isa = PBXBuildFile; fileRef = 90AFAA691B0139DE00F21C23 /* BUYDiscount.m */; };
-		901931071BC5B9BC00D1134E /* NSDate+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A446201B5E8614009602AA /* NSDate+BUYAdditions.m */; };
 		901931081BC5B9BC00D1134E /* BUYRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A741A700AC80087DB2C /* BUYRuntime.m */; };
 		901931091BC5B9BC00D1134E /* BUYCart.m in Sources */ = {isa = PBXBuildFile; fileRef = F773744819C77A210039681C /* BUYCart.m */; };
 		9019310A1BC5B9BC00D1134E /* BUYPaymentButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 905AA9701B3B32A500CAE037 /* BUYPaymentButton.m */; };
@@ -121,7 +152,6 @@
 		9019312E1BC5B9BC00D1134E /* BUYProductDescriptionCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516C951B4D76D900E35E45 /* BUYProductDescriptionCell.h */; };
 		9019312F1BC5B9BC00D1134E /* BUYLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA16C19C939FF00AF4E93 /* BUYLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931311BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 907874971B7276BA0023775B /* BUYProductViewHeaderOverlay.h */; };
-		901931321BC5B9BC00D1134E /* NSString+Trim.h in Headers */ = {isa = PBXBuildFile; fileRef = F76CFF1B19CB7BE30079C703 /* NSString+Trim.h */; };
 		901931331BC5B9BC00D1134E /* BUYAddress+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4F91B177EC80067982B /* BUYAddress+Additions.h */; };
 		901931341BC5B9BC00D1134E /* BUYViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1C4DF51AE98FBB00E21624 /* BUYViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931351BC5B9BC00D1134E /* BUYDiscount.h in Headers */ = {isa = PBXBuildFile; fileRef = 90AFAA681B0139DE00F21C23 /* BUYDiscount.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -146,12 +176,10 @@
 		901931481BC5B9BC00D1134E /* BUYImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CAE1B4EC9FE00E35E45 /* BUYImageView.h */; };
 		901931491BC5B9BC00D1134E /* BUYGiftCard.h in Headers */ = {isa = PBXBuildFile; fileRef = 42488B321AB8761A005F21A9 /* BUYGiftCard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019314B1BC5B9BC00D1134E /* BUYNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CC11B4F1ED700E35E45 /* BUYNavigationController.h */; };
-		9019314C1BC5B9BC00D1134E /* NSURL+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */; };
 		9019314D1BC5B9BC00D1134E /* BUYVariantOptionBreadCrumbsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 90DE926E1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.h */; };
 		9019314E1BC5B9BC00D1134E /* BUYProductViewFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516C791B4C589A00E35E45 /* BUYProductViewFooter.h */; };
 		9019314F1BC5B9BC00D1134E /* BUYOptionSelectionViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BE9496AE1B4D96D800B38949 /* BUYOptionSelectionViewController.h */; };
 		901931501BC5B9BC00D1134E /* BUYOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = 90E83BC21B9F550E00C95A1B /* BUYOrder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		901931521BC5B9BC00D1134E /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */; };
 		901931531BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB74A251B554BFB0005A300 /* BUYOptionSelectionNavigationController.h */; };
 		901931541BC5B9BC00D1134E /* BUYPresentationControllerWithNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CBD1B4F110A00E35E45 /* BUYPresentationControllerWithNavigationController.h */; };
 		901931551BC5B9BC00D1134E /* BUYPresentationControllerForVariantSelection.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB74A1F1B554BF20005A300 /* BUYPresentationControllerForVariantSelection.h */; };
@@ -162,14 +190,12 @@
 		9019315A1BC5B9BC00D1134E /* BUYProductImageCollectionViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 904606AD1B6BC8D700754173 /* BUYProductImageCollectionViewCell.h */; };
 		9019315B1BC5B9BC00D1134E /* BUYImageKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 900E7C811B5DA32F006F3C81 /* BUYImageKit.h */; };
 		9019315C1BC5B9BC00D1134E /* BUYCollection+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = 900396F41B69563400226B73 /* BUYCollection+Additions.h */; };
-		9019315D1BC5B9BC00D1134E /* NSDateFormatter+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A446231B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h */; };
 		9019315E1BC5B9BC00D1134E /* BUYError.h in Headers */ = {isa = PBXBuildFile; fileRef = BE47340D1B66C4EF00AA721A /* BUYError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019315F1BC5B9BC00D1134E /* BUYProductHeaderCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516C971B4D76D900E35E45 /* BUYProductHeaderCell.h */; };
 		901931601BC5B9BC00D1134E /* BUYProductViewErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 903BCC7A1B7D1C2D00C21FEB /* BUYProductViewErrorView.h */; };
 		901931611BC5B9BC00D1134E /* BUYClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA17019C93F6F00AF4E93 /* BUYClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931631BC5B9BC00D1134E /* BUYGradientView.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CB21B4EE5E700E35E45 /* BUYGradientView.h */; };
 		901931641BC5B9BC00D1134E /* BUYCartLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 900396991B601DF400226B73 /* BUYCartLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		901931651BC5B9BC00D1134E /* NSDecimalNumber+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A9B1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.h */; };
 		901931661BC5B9BC00D1134E /* BUYCheckout.h in Headers */ = {isa = PBXBuildFile; fileRef = F773749419C77C260039681C /* BUYCheckout.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931671BC5B9BC00D1134E /* BUYCart.h in Headers */ = {isa = PBXBuildFile; fileRef = F773744719C77A210039681C /* BUYCart.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931681BC5B9BC00D1134E /* BUYProductViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 905ECCC01B4C39710094F336 /* BUYProductViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -193,10 +219,6 @@
 		9089CC5E1BB48D06009726D6 /* BUYCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9089CC5D1BB48D06009726D6 /* BUYCollection.m */; };
 		909944491B71B76800C40A33 /* UIFont+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 909944471B71B76800C40A33 /* UIFont+BUYAdditions.h */; };
 		9099444A1B71B76800C40A33 /* UIFont+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 909944481B71B76800C40A33 /* UIFont+BUYAdditions.m */; };
-		90A446211B5E8614009602AA /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */; };
-		90A446221B5E8614009602AA /* NSDate+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A446201B5E8614009602AA /* NSDate+BUYAdditions.m */; };
-		90A446251B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A446231B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h */; };
-		90A446261B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A446241B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m */; };
 		90BBCD731B87B6BA00FCCE51 /* BUYPKContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BBCD701B87B6AB00FCCE51 /* BUYPKContact.m */; };
 		90C27AAF1BB2E8F3008AF7A4 /* libOHHTTPStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE98DB501BB1ED5500C29564 /* libOHHTTPStubs.a */; };
 		90C856B51BD6B0F300936926 /* Buy.h in Headers */ = {isa = PBXBuildFile; fileRef = 90DA8DF11BC6A82D0027BCB7 /* Buy.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -223,13 +245,7 @@
 		BE4734101B66C4EF00AA721A /* BUYError.m in Sources */ = {isa = PBXBuildFile; fileRef = BE47340E1B66C4EF00AA721A /* BUYError.m */; };
 		BE5DC3631B71022D00B2BC1E /* BUYMaskedCreditCard.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5DC3611B71022D00B2BC1E /* BUYMaskedCreditCard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE5DC3641B71022D00B2BC1E /* BUYMaskedCreditCard.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5DC3621B71022D00B2BC1E /* BUYMaskedCreditCard.m */; };
-		BE5DC3A01B71B13700B2BC1E /* NSURL+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */; };
-		BE5DC3A11B71B13700B2BC1E /* NSURL+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */; };
 		BE6C07061BB1E46900BD9F7B /* mocked_responses.json in Resources */ = {isa = PBXBuildFile; fileRef = BE6C07051BB1E46900BD9F7B /* mocked_responses.json */; };
-		BE6D05991BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */; };
-		BE6D059A1BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */; };
-		BE6D059B1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */; };
-		BE6D059C1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */; };
 		BE98DB4F1BB1ED3E00C29564 /* OHHTTPStubs in Resources */ = {isa = PBXBuildFile; fileRef = BE98DB4E1BB1ED3E00C29564 /* OHHTTPStubs */; };
 		BE98DB5C1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE98DB5B1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m */; };
 		BE9A64471B503C8B0033E558 /* BUYClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA17019C93F6F00AF4E93 /* BUYClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -273,10 +289,6 @@
 		BE9A646D1B503D1C0033E558 /* BUYApplePayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */; };
 		BE9A646E1B503D1E0033E558 /* BUYRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A731A700AC80087DB2C /* BUYRuntime.h */; };
 		BE9A646F1B503D210033E558 /* BUYRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A741A700AC80087DB2C /* BUYRuntime.m */; };
-		BE9A64701B503D230033E558 /* NSDecimalNumber+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A9B1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.h */; };
-		BE9A64711B503D260033E558 /* NSDecimalNumber+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AF52A9C1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.m */; };
-		BE9A64721B503D290033E558 /* NSString+Trim.h in Headers */ = {isa = PBXBuildFile; fileRef = F76CFF1B19CB7BE30079C703 /* NSString+Trim.h */; };
-		BE9A64731B503D2C0033E558 /* NSString+Trim.m in Sources */ = {isa = PBXBuildFile; fileRef = F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */; };
 		BE9A64741B503D2E0033E558 /* BUYApplePayHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE9A64751B503D370033E558 /* BUYApplePayHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */; };
 		BE9A64781B503D3F0033E558 /* BUYAddress+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4FA1B177EC80067982B /* BUYAddress+Additions.m */; };
@@ -360,10 +372,28 @@
 		2AF52A841A700B0A0087DB2C /* BUYShop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = BUYShop.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		2AF52A931A7010B20087DB2C /* BUYObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYObject.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		2AF52A941A7010B20087DB2C /* BUYObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = BUYObject.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		2AF52A9B1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "NSDecimalNumber+BUYAdditions.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		2AF52A9C1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = "NSDecimalNumber+BUYAdditions.m"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		42488B321AB8761A005F21A9 /* BUYGiftCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYGiftCard.h; sourceTree = "<group>"; };
 		42488B331AB8761A005F21A9 /* BUYGiftCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYGiftCard.m; sourceTree = "<group>"; };
+		841ADDEB1CB6C942000004B0 /* NSArray+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDEC1CB6C942000004B0 /* NSArray+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDED1CB6C942000004B0 /* NSDate+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDEE1CB6C942000004B0 /* NSDate+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDEF1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateFormatter+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDF01CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDateFormatter+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDF11CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDecimalNumber+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDF21CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDecimalNumber+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDF31CB6C942000004B0 /* NSDictionary+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDF41CB6C942000004B0 /* NSDictionary+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDF51CB6C942000004B0 /* NSException+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSException+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDF61CB6C942000004B0 /* NSException+BUYModelAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSException+BUYModelAdditions.m"; sourceTree = "<group>"; };
+		841ADDF71CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSRegularExpression+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDF81CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSRegularExpression+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDF91CB6C942000004B0 /* NSString+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDFA1CB6C942000004B0 /* NSString+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDFB1CB6C942000004B0 /* NSURL+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDFC1CB6C942000004B0 /* NSURL+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+BUYAdditions.m"; sourceTree = "<group>"; };
+		841ADDFD1CB6C942000004B0 /* NSURLComponents+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLComponents+BUYAdditions.h"; sourceTree = "<group>"; };
+		841ADDFE1CB6C942000004B0 /* NSURLComponents+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLComponents+BUYAdditions.m"; sourceTree = "<group>"; };
 		900396991B601DF400226B73 /* BUYCartLineItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCartLineItem.h; sourceTree = "<group>"; };
 		9003969A1B601DF400226B73 /* BUYCartLineItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYCartLineItem.m; sourceTree = "<group>"; };
 		900396AA1B627CB900226B73 /* BUYProductView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BUYProductView.h; path = "Product View/BUYProductView.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -374,8 +404,6 @@
 		900396F51B69563400226B73 /* BUYCollection+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BUYCollection+Additions.m"; sourceTree = "<group>"; };
 		900E7C811B5DA32F006F3C81 /* BUYImageKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYImageKit.h; sourceTree = "<group>"; };
 		900E7C821B5DA32F006F3C81 /* BUYImageKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYImageKit.m; sourceTree = "<group>"; };
-		901335441C187E0400410ED0 /* NSURLComponents+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLComponents+BUYAdditions.h"; sourceTree = "<group>"; };
-		901335451C187E0400410ED0 /* NSURLComponents+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLComponents+BUYAdditions.m"; sourceTree = "<group>"; };
 		901931701BC5B9BC00D1134E /* Buy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Buy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		901931761BC5BC9100D1134E /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		9032F2D81BE9457A00BB9EEF /* BUYCheckoutAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCheckoutAttribute.h; sourceTree = "<group>"; };
@@ -422,10 +450,6 @@
 		9089CC5D1BB48D06009726D6 /* BUYCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYCollection.m; sourceTree = "<group>"; };
 		909944471B71B76800C40A33 /* UIFont+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+BUYAdditions.h"; sourceTree = "<group>"; };
 		909944481B71B76800C40A33 /* UIFont+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+BUYAdditions.m"; sourceTree = "<group>"; };
-		90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+BUYAdditions.h"; sourceTree = "<group>"; };
-		90A446201B5E8614009602AA /* NSDate+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+BUYAdditions.m"; sourceTree = "<group>"; };
-		90A446231B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDateFormatter+BUYAdditions.h"; sourceTree = "<group>"; };
-		90A446241B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDateFormatter+BUYAdditions.m"; sourceTree = "<group>"; };
 		90AFAA5C1B011EA600F21C23 /* BUYTaxLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYTaxLine.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		90AFAA5D1B011EA600F21C23 /* BUYTaxLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = BUYTaxLine.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		90AFAA601B01390F00F21C23 /* BUYAddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYAddress.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -476,12 +500,8 @@
 		BE47340E1B66C4EF00AA721A /* BUYError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYError.m; sourceTree = "<group>"; };
 		BE5DC3611B71022D00B2BC1E /* BUYMaskedCreditCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYMaskedCreditCard.h; sourceTree = "<group>"; };
 		BE5DC3621B71022D00B2BC1E /* BUYMaskedCreditCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYMaskedCreditCard.m; sourceTree = "<group>"; };
-		BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+BUYAdditions.h"; sourceTree = "<group>"; };
-		BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+BUYAdditions.m"; sourceTree = "<group>"; };
 		BE6C07031BB1DE1D00BD9F7B /* OHHTTPStubs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OHHTTPStubs.framework; path = "Mobile Buy SDK Tests/OHHTTPStubs.framework"; sourceTree = "<group>"; };
 		BE6C07051BB1E46900BD9F7B /* mocked_responses.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = mocked_responses.json; sourceTree = "<group>"; };
-		BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Additions.h"; sourceTree = "<group>"; };
-		BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Additions.m"; sourceTree = "<group>"; };
 		BE9496681B45CCF400B38949 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
 		BE9496AE1B4D96D800B38949 /* BUYOptionSelectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYOptionSelectionViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		BE9496AF1B4D96D800B38949 /* BUYOptionSelectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionSelectionViewController.m; sourceTree = "<group>"; };
@@ -509,8 +529,6 @@
 		BEEA83E61B0B76C7000C6483 /* BUYOptionValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionValue.m; sourceTree = "<group>"; };
 		F70CE40D1A8BF1D90055BEB8 /* BUYApplePayAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYApplePayAdditions.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = BUYApplePayAdditions.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		F76CFF1B19CB7BE30079C703 /* NSString+Trim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = "NSString+Trim.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = "NSString+Trim.m"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		F76CFF1E19CB7C500079C703 /* BUYSerializable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYSerializable.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		F773743619C771D10039681C /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		F773744719C77A210039681C /* BUYCart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYCart.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -570,6 +588,33 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		841ADDEA1CB6C942000004B0 /* Additions */ = {
+			isa = PBXGroup;
+			children = (
+				841ADDEB1CB6C942000004B0 /* NSArray+BUYAdditions.h */,
+				841ADDEC1CB6C942000004B0 /* NSArray+BUYAdditions.m */,
+				841ADDED1CB6C942000004B0 /* NSDate+BUYAdditions.h */,
+				841ADDEE1CB6C942000004B0 /* NSDate+BUYAdditions.m */,
+				841ADDEF1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h */,
+				841ADDF01CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m */,
+				841ADDF11CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h */,
+				841ADDF21CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m */,
+				841ADDF31CB6C942000004B0 /* NSDictionary+BUYAdditions.h */,
+				841ADDF41CB6C942000004B0 /* NSDictionary+BUYAdditions.m */,
+				841ADDF51CB6C942000004B0 /* NSException+BUYAdditions.h */,
+				841ADDF61CB6C942000004B0 /* NSException+BUYModelAdditions.m */,
+				841ADDF71CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h */,
+				841ADDF81CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m */,
+				841ADDF91CB6C942000004B0 /* NSString+BUYAdditions.h */,
+				841ADDFA1CB6C942000004B0 /* NSString+BUYAdditions.m */,
+				841ADDFB1CB6C942000004B0 /* NSURL+BUYAdditions.h */,
+				841ADDFC1CB6C942000004B0 /* NSURL+BUYAdditions.m */,
+				841ADDFD1CB6C942000004B0 /* NSURLComponents+BUYAdditions.h */,
+				841ADDFE1CB6C942000004B0 /* NSURLComponents+BUYAdditions.m */,
+			);
+			path = Additions;
+			sourceTree = "<group>";
+		};
 		906CF1AE1B8B660F001F7D5B /* PKContact Test Objects */ = {
 			isa = PBXGroup;
 			children = (
@@ -823,20 +868,6 @@
 				BE1007941B6038150031CEE7 /* BUYProductVariant+Options.m */,
 				2AF52A731A700AC80087DB2C /* BUYRuntime.h */,
 				2AF52A741A700AC80087DB2C /* BUYRuntime.m */,
-				90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */,
-				90A446201B5E8614009602AA /* NSDate+BUYAdditions.m */,
-				90A446231B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h */,
-				90A446241B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m */,
-				2AF52A9B1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.h */,
-				2AF52A9C1A7011DC0087DB2C /* NSDecimalNumber+BUYAdditions.m */,
-				BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */,
-				BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */,
-				F76CFF1B19CB7BE30079C703 /* NSString+Trim.h */,
-				F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */,
-				BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */,
-				BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */,
-				901335441C187E0400410ED0 /* NSURLComponents+BUYAdditions.h */,
-				901335451C187E0400410ED0 /* NSURLComponents+BUYAdditions.m */,
 				909944471B71B76800C40A33 /* UIFont+BUYAdditions.h */,
 				909944481B71B76800C40A33 /* UIFont+BUYAdditions.m */,
 			);
@@ -859,6 +890,7 @@
 		F773749F19C77E4E0039681C /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				841ADDEA1CB6C942000004B0 /* Additions */,
 				90DA8DF11BC6A82D0027BCB7 /* Buy.h */,
 				F7FDA16F19C93F6100AF4E93 /* Data */,
 				F773744419C779C20039681C /* Models */,
@@ -896,58 +928,63 @@
 				9019312F1BC5B9BC00D1134E /* BUYLineItem.h in Headers */,
 				90C856B51BD6B0F300936926 /* Buy.h in Headers */,
 				901931311BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.h in Headers */,
-				901931321BC5B9BC00D1134E /* NSString+Trim.h in Headers */,
 				901931331BC5B9BC00D1134E /* BUYAddress+Additions.h in Headers */,
 				901931341BC5B9BC00D1134E /* BUYViewController.h in Headers */,
 				901931351BC5B9BC00D1134E /* BUYDiscount.h in Headers */,
 				901931361BC5B9BC00D1134E /* BUYProductView.h in Headers */,
 				901931371BC5B9BC00D1134E /* BUYTaxLine.h in Headers */,
 				901931381BC5B9BC00D1134E /* BUYVariantSelectionViewController.h in Headers */,
+				841ADE201CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */,
 				901931391BC5B9BC00D1134E /* BUYOptionValueCell.h in Headers */,
-				901335471C187E0400410ED0 /* NSURLComponents+BUYAdditions.h in Headers */,
 				9019313A1BC5B9BC00D1134E /* BUYImage.h in Headers */,
 				9019313B1BC5B9BC00D1134E /* BUYOptionValue.h in Headers */,
 				9019313C1BC5B9BC00D1134E /* BUYShop.h in Headers */,
+				841ADE241CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */,
 				9019313D1BC5B9BC00D1134E /* BUYShippingRate.h in Headers */,
 				9019313E1BC5B9BC00D1134E /* BUYApplePayAdditions.h in Headers */,
 				9019313F1BC5B9BC00D1134E /* BUYProduct+Options.h in Headers */,
+				841ADE141CB6C942000004B0 /* NSException+BUYAdditions.h in Headers */,
 				901931401BC5B9BC00D1134E /* BUYTheme+Additions.h in Headers */,
 				901931411BC5B9BC00D1134E /* BUYVariantOptionView.h in Headers */,
+				841ADE041CB6C942000004B0 /* NSDate+BUYAdditions.h in Headers */,
 				901931421BC5B9BC00D1134E /* BUYMaskedCreditCard.h in Headers */,
 				901931431BC5B9BC00D1134E /* BUYProductViewHeader.h in Headers */,
 				901931441BC5B9BC00D1134E /* BUYProductViewHeaderBackgroundImageView.h in Headers */,
 				901931451BC5B9BC00D1134E /* UIFont+BUYAdditions.h in Headers */,
 				901931461BC5B9BC00D1134E /* BUYCheckoutButton.h in Headers */,
+				841ADE081CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h in Headers */,
 				901931471BC5B9BC00D1134E /* BUYPaymentButton.h in Headers */,
 				901931481BC5B9BC00D1134E /* BUYImageView.h in Headers */,
 				901931491BC5B9BC00D1134E /* BUYGiftCard.h in Headers */,
 				BE6D059A1BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */,
+				9019314A1BC5B9BC00D1134E /* BUYClient+Test.h in Headers */,
 				9019314B1BC5B9BC00D1134E /* BUYNavigationController.h in Headers */,
-				9019314C1BC5B9BC00D1134E /* NSURL+BUYAdditions.h in Headers */,
 				9019314D1BC5B9BC00D1134E /* BUYVariantOptionBreadCrumbsView.h in Headers */,
 				9019314E1BC5B9BC00D1134E /* BUYProductViewFooter.h in Headers */,
 				9019314F1BC5B9BC00D1134E /* BUYOptionSelectionViewController.h in Headers */,
 				901931501BC5B9BC00D1134E /* BUYOrder.h in Headers */,
-				901931521BC5B9BC00D1134E /* NSDate+BUYAdditions.h in Headers */,
 				901931531BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.h in Headers */,
 				901931541BC5B9BC00D1134E /* BUYPresentationControllerWithNavigationController.h in Headers */,
 				901931551BC5B9BC00D1134E /* BUYPresentationControllerForVariantSelection.h in Headers */,
 				901931561BC5B9BC00D1134E /* BUYProductVariant+Options.h in Headers */,
 				901931571BC5B9BC00D1134E /* BUYObject.h in Headers */,
 				901931581BC5B9BC00D1134E /* BUYRuntime.h in Headers */,
+				841ADE001CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */,
 				901931591BC5B9BC00D1134E /* BUYCollection.h in Headers */,
 				9019315A1BC5B9BC00D1134E /* BUYProductImageCollectionViewCell.h in Headers */,
 				9019315B1BC5B9BC00D1134E /* BUYImageKit.h in Headers */,
+				841ADE101CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */,
 				9019315C1BC5B9BC00D1134E /* BUYCollection+Additions.h in Headers */,
-				9019315D1BC5B9BC00D1134E /* NSDateFormatter+BUYAdditions.h in Headers */,
+				841ADE1C1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */,
 				9032F2DB1BE9457A00BB9EEF /* BUYCheckoutAttribute.h in Headers */,
 				9019315E1BC5B9BC00D1134E /* BUYError.h in Headers */,
 				9019315F1BC5B9BC00D1134E /* BUYProductHeaderCell.h in Headers */,
+				841ADE181CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */,
 				901931601BC5B9BC00D1134E /* BUYProductViewErrorView.h in Headers */,
 				901931611BC5B9BC00D1134E /* BUYClient.h in Headers */,
 				901931631BC5B9BC00D1134E /* BUYGradientView.h in Headers */,
 				901931641BC5B9BC00D1134E /* BUYCartLineItem.h in Headers */,
-				901931651BC5B9BC00D1134E /* NSDecimalNumber+BUYAdditions.h in Headers */,
+				841ADE0C1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */,
 				901931661BC5B9BC00D1134E /* BUYCheckout.h in Headers */,
 				901931671BC5B9BC00D1134E /* BUYCart.h in Headers */,
 				901931681BC5B9BC00D1134E /* BUYProductViewController.h in Headers */,
@@ -971,7 +1008,6 @@
 				BEB74A6B1B55641B0005A300 /* BUYProductDescriptionCell.h in Headers */,
 				BE9A645B1B503CDC0033E558 /* BUYLineItem.h in Headers */,
 				907874991B7276BA0023775B /* BUYProductViewHeaderOverlay.h in Headers */,
-				BE9A64721B503D290033E558 /* NSString+Trim.h in Headers */,
 				BE9A64791B503D420033E558 /* BUYAddress+Additions.h in Headers */,
 				BE9A64801B503D990033E558 /* BUYViewController.h in Headers */,
 				BE9A644F1B503CA90033E558 /* BUYDiscount.h in Headers */,
@@ -979,51 +1015,57 @@
 				BE9A64511B503CB00033E558 /* BUYTaxLine.h in Headers */,
 				BEB74A7D1B5564870005A300 /* BUYVariantSelectionViewController.h in Headers */,
 				BE10079B1B6165EC0031CEE7 /* BUYOptionValueCell.h in Headers */,
+				841ADE1F1CB6C942000004B0 /* NSURL+BUYAdditions.h in Headers */,
 				BE9A64591B503CD40033E558 /* BUYImage.h in Headers */,
-				901335461C187E0400410ED0 /* NSURLComponents+BUYAdditions.h in Headers */,
 				BE9A64681B503D080033E558 /* BUYOptionValue.h in Headers */,
 				BE9A64661B503D010033E558 /* BUYShop.h in Headers */,
 				BE9A644D1B503CA20033E558 /* BUYShippingRate.h in Headers */,
+				841ADE231CB6C942000004B0 /* NSURLComponents+BUYAdditions.h in Headers */,
 				BE9A646C1B503D180033E558 /* BUYApplePayAdditions.h in Headers */,
 				BE9A646A1B503D100033E558 /* BUYProduct+Options.h in Headers */,
 				906EAE431B836DE000976165 /* BUYTheme+Additions.h in Headers */,
+				841ADE131CB6C942000004B0 /* NSException+BUYAdditions.h in Headers */,
 				BEB74A7B1B5564810005A300 /* BUYVariantOptionView.h in Headers */,
 				BE5DC3631B71022D00B2BC1E /* BUYMaskedCreditCard.h in Headers */,
+				841ADE031CB6C942000004B0 /* NSDate+BUYAdditions.h in Headers */,
 				BEB74A731B5564350005A300 /* BUYProductViewHeader.h in Headers */,
 				BEB74A751B55643B0005A300 /* BUYProductViewHeaderBackgroundImageView.h in Headers */,
 				909944491B71B76800C40A33 /* UIFont+BUYAdditions.h in Headers */,
 				90C856B61BD6B0F400936926 /* Buy.h in Headers */,
 				900396B01B67BD0A00226B73 /* BUYCheckoutButton.h in Headers */,
+				841ADE071CB6C942000004B0 /* NSDateFormatter+BUYAdditions.h in Headers */,
 				BE9A64821B503DAD0033E558 /* BUYPaymentButton.h in Headers */,
 				BEB74A771B55646D0005A300 /* BUYImageView.h in Headers */,
 				BE9A64571B503CCC0033E558 /* BUYGiftCard.h in Headers */,
 				BE6D05991BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */,
+				BE2E1D3A1B5E8663009610DA /* BUYClient+Test.h in Headers */,
 				BEB74A671B55640C0005A300 /* BUYNavigationController.h in Headers */,
-				BE5DC3A01B71B13700B2BC1E /* NSURL+BUYAdditions.h in Headers */,
 				90DE92701B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.h in Headers */,
 				BEB74A711B5564300005A300 /* BUYProductViewFooter.h in Headers */,
 				BEB74A791B5564790005A300 /* BUYOptionSelectionViewController.h in Headers */,
 				90E83BC41B9F550E00C95A1B /* BUYOrder.h in Headers */,
-				90A446211B5E8614009602AA /* NSDate+BUYAdditions.h in Headers */,
 				BEB74A281B554BFB0005A300 /* BUYOptionSelectionNavigationController.h in Headers */,
 				BEB74A691B5564160005A300 /* BUYPresentationControllerWithNavigationController.h in Headers */,
 				BEB74A221B554BF20005A300 /* BUYPresentationControllerForVariantSelection.h in Headers */,
 				BE1007951B6038150031CEE7 /* BUYProductVariant+Options.h in Headers */,
 				BE9A645D1B503CE30033E558 /* BUYObject.h in Headers */,
 				BE9A646E1B503D1E0033E558 /* BUYRuntime.h in Headers */,
+				841ADDFF1CB6C942000004B0 /* NSArray+BUYAdditions.h in Headers */,
 				BEB74A901B55A3D00005A300 /* BUYCollection.h in Headers */,
 				904606AF1B6BC8D700754173 /* BUYProductImageCollectionViewCell.h in Headers */,
 				900E7C841B5DA553006F3C81 /* BUYImageKit.h in Headers */,
+				841ADE0F1CB6C942000004B0 /* NSDictionary+BUYAdditions.h in Headers */,
 				900396F61B69563400226B73 /* BUYCollection+Additions.h in Headers */,
-				90A446251B5EC03F009602AA /* NSDateFormatter+BUYAdditions.h in Headers */,
+				841ADE1B1CB6C942000004B0 /* NSString+BUYAdditions.h in Headers */,
 				9032F2DA1BE9457A00BB9EEF /* BUYCheckoutAttribute.h in Headers */,
 				BE47340F1B66C4EF00AA721A /* BUYError.h in Headers */,
 				BEB74A6D1B5564200005A300 /* BUYProductHeaderCell.h in Headers */,
+				841ADE171CB6C942000004B0 /* NSRegularExpression+BUYAdditions.h in Headers */,
 				903BCC7C1B7D1C2D00C21FEB /* BUYProductViewErrorView.h in Headers */,
 				BE9A64471B503C8B0033E558 /* BUYClient.h in Headers */,
 				BEB74A651B5563FF0005A300 /* BUYGradientView.h in Headers */,
 				9003969B1B601DF400226B73 /* BUYCartLineItem.h in Headers */,
-				BE9A64701B503D230033E558 /* NSDecimalNumber+BUYAdditions.h in Headers */,
+				841ADE0B1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.h in Headers */,
 				BE9A644B1B503C9B0033E558 /* BUYCheckout.h in Headers */,
 				BE9A64491B503C940033E558 /* BUYCart.h in Headers */,
 				BEB74A2D1B554E870005A300 /* BUYProductViewController.h in Headers */,
@@ -1200,19 +1242,17 @@
 				901930E31BC5B9BC00D1134E /* BUYApplePayHelpers.m in Sources */,
 				901930E41BC5B9BC00D1134E /* BUYOptionSelectionViewController.m in Sources */,
 				901930E51BC5B9BC00D1134E /* BUYVariantOptionView.m in Sources */,
-				901335491C187E0400410ED0 /* NSURLComponents+BUYAdditions.m in Sources */,
+				841ADE1E1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */,
 				901930E61BC5B9BC00D1134E /* BUYPresentationControllerForVariantSelection.m in Sources */,
-				901930E71BC5B9BC00D1134E /* NSDecimalNumber+BUYAdditions.m in Sources */,
 				901930E81BC5B9BC00D1134E /* BUYImage.m in Sources */,
 				901930E91BC5B9BC00D1134E /* BUYProductVariant.m in Sources */,
 				901930EA1BC5B9BC00D1134E /* BUYProductViewController.m in Sources */,
-				901930EB1BC5B9BC00D1134E /* NSDateFormatter+BUYAdditions.m in Sources */,
+				841ADE021CB6C942000004B0 /* NSArray+BUYAdditions.m in Sources */,
 				901930EC1BC5B9BC00D1134E /* BUYError.m in Sources */,
-				BE6D059C1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */,
+				841ADE0E1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m in Sources */,
 				901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */,
 				901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */,
 				901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */,
-				901930F11BC5B9BC00D1134E /* NSString+Trim.m in Sources */,
 				901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */,
 				901930F31BC5B9BC00D1134E /* BUYAddress+Additions.m in Sources */,
 				901930F41BC5B9BC00D1134E /* BUYProductViewHeaderBackgroundImageView.m in Sources */,
@@ -1227,30 +1267,36 @@
 				901930FD1BC5B9BC00D1134E /* BUYTaxLine.m in Sources */,
 				901930FE1BC5B9BC00D1134E /* BUYCollection+Additions.m in Sources */,
 				901930FF1BC5B9BC00D1134E /* BUYVariantOptionBreadCrumbsView.m in Sources */,
-				901931001BC5B9BC00D1134E /* NSURL+BUYAdditions.m in Sources */,
 				901931011BC5B9BC00D1134E /* BUYTheme+Additions.m in Sources */,
 				901931021BC5B9BC00D1134E /* BUYStoreViewController.m in Sources */,
 				901931031BC5B9BC00D1134E /* BUYOptionValue.m in Sources */,
 				901931041BC5B9BC00D1134E /* BUYApplePayAdditions.m in Sources */,
 				901931051BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.m in Sources */,
 				901931061BC5B9BC00D1134E /* BUYDiscount.m in Sources */,
-				901931071BC5B9BC00D1134E /* NSDate+BUYAdditions.m in Sources */,
+				841ADE0A1CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m in Sources */,
 				901931081BC5B9BC00D1134E /* BUYRuntime.m in Sources */,
 				901931091BC5B9BC00D1134E /* BUYCart.m in Sources */,
 				9019310A1BC5B9BC00D1134E /* BUYPaymentButton.m in Sources */,
+				841ADE121CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */,
 				9019310B1BC5B9BC00D1134E /* BUYProduct+Options.m in Sources */,
 				9019310C1BC5B9BC00D1134E /* BUYGiftCard.m in Sources */,
+				841ADE161CB6C942000004B0 /* NSException+BUYModelAdditions.m in Sources */,
 				9019310D1BC5B9BC00D1134E /* BUYOptionValueCell.m in Sources */,
 				9019310E1BC5B9BC00D1134E /* BUYProduct.m in Sources */,
 				9019310F1BC5B9BC00D1134E /* BUYImageView.m in Sources */,
 				901931101BC5B9BC00D1134E /* BUYProductHeaderCell.m in Sources */,
+				841ADE1A1CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m in Sources */,
 				9032F2DD1BE9457A00BB9EEF /* BUYCheckoutAttribute.m in Sources */,
 				901931111BC5B9BC00D1134E /* BUYCartLineItem.m in Sources */,
 				901931121BC5B9BC00D1134E /* BUYMaskedCreditCard.m in Sources */,
 				901931131BC5B9BC00D1134E /* BUYCheckout.m in Sources */,
 				901931141BC5B9BC00D1134E /* BUYProductViewFooter.m in Sources */,
+				841ADE261CB6C942000004B0 /* NSURLComponents+BUYAdditions.m in Sources */,
 				901931151BC5B9BC00D1134E /* BUYPresentationControllerWithNavigationController.m in Sources */,
+				841ADE221CB6C942000004B0 /* NSURL+BUYAdditions.m in Sources */,
 				901931161BC5B9BC00D1134E /* BUYShippingRate.m in Sources */,
+				841ADE061CB6C942000004B0 /* NSDate+BUYAdditions.m in Sources */,
+				901931171BC5B9BC00D1134E /* BUYClient+Test.m in Sources */,
 				901931181BC5B9BC00D1134E /* BUYGradientView.m in Sources */,
 				901931191BC5B9BC00D1134E /* BUYViewController.m in Sources */,
 				9019311A1BC5B9BC00D1134E /* BUYImageKit.m in Sources */,
@@ -1295,19 +1341,17 @@
 				BE9A64751B503D370033E558 /* BUYApplePayHelpers.m in Sources */,
 				BEB74A7A1B55647C0005A300 /* BUYOptionSelectionViewController.m in Sources */,
 				BEB74A7C1B5564840005A300 /* BUYVariantOptionView.m in Sources */,
-				901335481C187E0400410ED0 /* NSURLComponents+BUYAdditions.m in Sources */,
+				841ADE1D1CB6C942000004B0 /* NSString+BUYAdditions.m in Sources */,
 				BEB74A241B554BF20005A300 /* BUYPresentationControllerForVariantSelection.m in Sources */,
-				BE9A64711B503D260033E558 /* NSDecimalNumber+BUYAdditions.m in Sources */,
 				BE9A645A1B503CD90033E558 /* BUYImage.m in Sources */,
 				BE9A64641B503CFB0033E558 /* BUYProductVariant.m in Sources */,
 				BEB74A2E1B554E8B0005A300 /* BUYProductViewController.m in Sources */,
-				90A446261B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m in Sources */,
+				841ADE011CB6C942000004B0 /* NSArray+BUYAdditions.m in Sources */,
 				BE4734101B66C4EF00AA721A /* BUYError.m in Sources */,
-				BE6D059B1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */,
+				841ADE0D1CB6C942000004B0 /* NSDecimalNumber+BUYAdditions.m in Sources */,
 				BEB74A741B5564380005A300 /* BUYProductViewHeader.m in Sources */,
 				BEB74A681B55640F0005A300 /* BUYNavigationController.m in Sources */,
 				BEB74A7E1B5564890005A300 /* BUYVariantSelectionViewController.m in Sources */,
-				BE9A64731B503D2C0033E558 /* NSString+Trim.m in Sources */,
 				90E83BC51B9F550E00C95A1B /* BUYOrder.m in Sources */,
 				BE9A64781B503D3F0033E558 /* BUYAddress+Additions.m in Sources */,
 				BEB74A761B55643E0005A300 /* BUYProductViewHeaderBackgroundImageView.m in Sources */,
@@ -1322,30 +1366,36 @@
 				BE9A64521B503CB80033E558 /* BUYTaxLine.m in Sources */,
 				900396F71B69563400226B73 /* BUYCollection+Additions.m in Sources */,
 				90DE92711B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.m in Sources */,
-				BE5DC3A11B71B13700B2BC1E /* NSURL+BUYAdditions.m in Sources */,
 				906EAE441B836DE000976165 /* BUYTheme+Additions.m in Sources */,
 				BE9A647F1B503D960033E558 /* BUYStoreViewController.m in Sources */,
 				BE9A64691B503D0C0033E558 /* BUYOptionValue.m in Sources */,
 				BE9A646D1B503D1C0033E558 /* BUYApplePayAdditions.m in Sources */,
 				BEB74A2A1B554BFB0005A300 /* BUYOptionSelectionNavigationController.m in Sources */,
 				BE9A64501B503CAD0033E558 /* BUYDiscount.m in Sources */,
-				90A446221B5E8614009602AA /* NSDate+BUYAdditions.m in Sources */,
+				841ADE091CB6C942000004B0 /* NSDateFormatter+BUYAdditions.m in Sources */,
 				BE9A646F1B503D210033E558 /* BUYRuntime.m in Sources */,
 				BE9A644A1B503C980033E558 /* BUYCart.m in Sources */,
 				BE9A64831B503DB10033E558 /* BUYPaymentButton.m in Sources */,
+				841ADE111CB6C942000004B0 /* NSDictionary+BUYAdditions.m in Sources */,
 				BE9A646B1B503D140033E558 /* BUYProduct+Options.m in Sources */,
 				BE9A64581B503CD10033E558 /* BUYGiftCard.m in Sources */,
+				841ADE151CB6C942000004B0 /* NSException+BUYModelAdditions.m in Sources */,
 				BE10079C1B6165EC0031CEE7 /* BUYOptionValueCell.m in Sources */,
 				BE9A64621B503CF40033E558 /* BUYProduct.m in Sources */,
 				BEB74A781B55646F0005A300 /* BUYImageView.m in Sources */,
 				BEB74A6E1B5564230005A300 /* BUYProductHeaderCell.m in Sources */,
+				841ADE191CB6C942000004B0 /* NSRegularExpression+BUYAdditions.m in Sources */,
 				9032F2DC1BE9457A00BB9EEF /* BUYCheckoutAttribute.m in Sources */,
 				9003969C1B601DF400226B73 /* BUYCartLineItem.m in Sources */,
 				BE5DC3641B71022D00B2BC1E /* BUYMaskedCreditCard.m in Sources */,
 				BE9A644C1B503C9F0033E558 /* BUYCheckout.m in Sources */,
 				BEB74A721B5564320005A300 /* BUYProductViewFooter.m in Sources */,
+				841ADE251CB6C942000004B0 /* NSURLComponents+BUYAdditions.m in Sources */,
 				BEB74A6A1B5564190005A300 /* BUYPresentationControllerWithNavigationController.m in Sources */,
+				841ADE211CB6C942000004B0 /* NSURL+BUYAdditions.m in Sources */,
 				BE9A644E1B503CA60033E558 /* BUYShippingRate.m in Sources */,
+				841ADE051CB6C942000004B0 /* NSDate+BUYAdditions.m in Sources */,
+				BE2E1D3B1B5E8663009610DA /* BUYClient+Test.m in Sources */,
 				BEB74A661B5564030005A300 /* BUYGradientView.m in Sources */,
 				BE9A64811B503D9E0033E558 /* BUYViewController.m in Sources */,
 				900E7C851B5DA559006F3C81 /* BUYImageKit.m in Sources */,

Mobile Buy SDK/Mobile Buy SDK/Additions/NSArray+BUYAdditions.h

+//
+//  NSArray+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 <Foundation/Foundation.h>
+
+typedef id (^BUYObjectMap) (id);
+
+@interface NSArray (BUYAdditions)
+
+/**
+ * Return all but the first object.
+ */
+@property (nonatomic, readonly, getter=buy_tail) NSArray *tail;
+
+/**
+ * Return a copy of the array with objects in in reverse order.
+ */
+@property (nonatomic, readonly, getter=buy_reversedArray) NSArray *reversedArray;
+
+- (NSArray *)buy_map:(BUYObjectMap)block;
+
+@end
+
+@interface NSMutableArray (BUYAdditions)
+
+/**
+ * Reverse the order of the objects in place.
+ */
+- (void)buy_reverse;
+@end
+
+@interface NSObject (BUYModelArrayCreating)
+
+/**
+ * Returns an array form of the object.
+ * Collections are converted to an array. Other objects are wrapped in an array.
+ */
+- (NSArray *)buy_array;
+
+/**
+ * Returns an object initialized with the given array.
+ * Collections convert the array to themselves. Other objects unwrap the array.
+ */
++ (instancetype)buy_convertArray:(NSArray *)array;
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Additions/NSArray+BUYAdditions.m

+//
+//  NSArray+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 "NSArray+BUYAdditions.h"
+
+@implementation NSArray (BUYAdditions)
+
+- (NSArray *)buy_reversedArray
+{
+	NSMutableArray *array = [self mutableCopy];
+	[array buy_reverse];
+	return array;
+}
+
+- (NSArray *)buy_map:(BUYObjectMap)block
+{
+	if (block == nil) {
+		return @[];
+	}
+	
+	NSMutableArray *array = [NSMutableArray array];
+	[self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+		[array addObject:block(obj)];
+	}];
+	return array;
+}
+
+- (NSArray *)buy_tail
+{
+	if (self.count > 0) {
+		return [self subarrayWithRange:NSMakeRange(1, self.count - 1)];
+	}
+	else {
+		return @[];
+	}
+}
+
+@end
+
+#pragma mark -
+
+@implementation NSMutableArray (BUYAdditions)
+
+- (void)buy_reverse
+{
+	const NSUInteger count = self.count;
+	const NSUInteger mid = count/2;
+	for (NSUInteger i=0; i<mid; ++i) {
+		const NSUInteger opposite = count-i-1;
+		id temp = self[i];
+		[self replaceObjectAtIndex:i withObject:self[opposite]];
+		[self replaceObjectAtIndex:opposite withObject:temp];
+	}
+}
+
+@end
+
+@implementation NSObject (BUYModelArrayCreating)
+
+- (NSArray *)buy_array
+{
+	return @[[self copy]];
+}
+
++ (instancetype)buy_convertArray:(NSArray *)array
+{
+	return array.firstObject;
+}
+
+@end
+
+@implementation NSArray (BUYModelArrayCreating)
+
+- (NSArray *)buy_array
+{
+	return self;
+}
+
++ (instancetype)buy_convertArray:(NSArray *)array
+{
+	return [array copy];
+}
+
+@end
+
+@implementation NSSet (BUYModelArrayCreating)
+
+- (NSArray *)buy_array
+{
+	return [self allObjects];
+}
+
++ (instancetype)buy_convertArray:(NSArray *)array
+{
+	return [NSSet setWithArray:array];
+}
+
+@end
+
+@implementation NSOrderedSet (BUYModelArrayCreating)
+
+- (NSArray *)buy_array
+{
+	return [self array];
+}
+
++ (instancetype)buy_convertArray:(NSArray *)array
+{
+	return [NSOrderedSet orderedSetWithArray:array];
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSDecimalNumber+BUYAdditions.m → Mobile Buy SDK/Mobile Buy SDK/Additions/NSDecimalNumber+BUYAdditions.m

@@ -26,19 +26,15 @@
 
 #import "NSDecimalNumber+BUYAdditions.h"
 
+@interface NSObject (BUYDecimalCreating)
+@property (nonatomic, readonly, getter=buy_decimalNumber) NSDecimalNumber *decimalNumber;
+@end
+
 @implementation NSDecimalNumber (BUYAdditions)
 
 + (NSDecimalNumber*)buy_decimalNumberOrZeroWithString:(NSString*)string
 {
-	NSDecimalNumber *decimalNumber = nil;
-	if (string) {
-		decimalNumber = [NSDecimalNumber decimalNumberWithString:string];
-	}
-	
-	if (decimalNumber == nil || decimalNumber == [NSDecimalNumber notANumber]) {
-		decimalNumber = [NSDecimalNumber zero];
-	}
-	return decimalNumber;
+	return string.length ? string.decimalNumber : [NSDecimalNumber zero];
 }
 
 + (NSDecimalNumber*)buy_decimalNumberFromJSON:(id)valueFromJSON
@@ -49,22 +45,8 @@
 		numberHandler = [[NSDecimalNumberHandler alloc] initWithRoundingMode:NSRoundBankers scale:12 raiseOnExactness:NO raiseOnOverflow:NO raiseOnUnderflow:NO raiseOnDivideByZero:NO];
 	});
 	
-	NSDecimalNumber *decimalNumber = nil;
-	if (valueFromJSON == nil || [valueFromJSON isKindOfClass:[NSNull class]]) {
-		decimalNumber = nil;
-	}
-	else if ([valueFromJSON isKindOfClass:[NSString class]]) {
-		decimalNumber = [NSDecimalNumber buy_decimalNumberOrZeroWithString:valueFromJSON];
-	}
-	else if ([valueFromJSON isKindOfClass:[NSDecimalNumber class]]) {
-		decimalNumber = valueFromJSON;
-	}
-	else if ([valueFromJSON isKindOfClass:[NSNumber class]]) {
-		NSDecimal decimal = [(NSNumber*)valueFromJSON decimalValue];
-		decimalNumber = [NSDecimalNumber decimalNumberWithDecimal:decimal];
-	}
-	else {
-		decimalNumber = nil;
+	NSDecimalNumber *decimalNumber = [valueFromJSON buy_decimalNumber];
+	if (decimalNumber == nil) {
 		NSLog(@"Could not create decimal value: %@", valueFromJSON);
 	}
 	
@@ -77,3 +59,41 @@
 }
 
 @end
+
+#pragma mark -
+
+@implementation NSObject (BUYDecimalCreating)
+
+- (NSDecimalNumber *)buy_decimalNumber
+{
+	return nil;
+}
+
+@end
+
+@implementation NSString (BUYDecimalCreating)
+
+- (NSDecimalNumber *)buy_decimalNumber
+{
+	return [NSDecimalNumber decimalNumberWithString:self];
+}
+
+@end
+
+@implementation NSNumber (BUYDecimalCreating)
+
+- (NSDecimalNumber *)buy_decimalNumber
+{
+	return [NSDecimalNumber decimalNumberWithDecimal:[self decimalValue]];
+}
+
+@end
+
+@implementation NSDecimalNumber (BUYDecimalCreating)
+
+- (NSDecimalNumber *)buy_decimalNumber
+{
+	return self;
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSDictionary+Additions.h → Mobile Buy SDK/Mobile Buy SDK/Additions/NSDictionary+BUYAdditions.h

 //
-//  NSDictionary+Additions.h
-//
+//  NSDictionary+BUYAdditions.h
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -26,8 +25,27 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "BUYSerializable.h"
+#import "NSArray+BUYAdditions.h"
+
+typedef NSString * (^BUYStringMap) (NSString *);
+
+@interface NSDictionary (BUYAdditions) <BUYSerializable>
+
+/**
+ * Return a new dictionary where the objects are used as keys, and vice versa.
+ */
+- (NSDictionary<NSString *, NSString *> *)buy_reverseDictionary;
 
-@interface NSDictionary (Additions)
+/**
+ * Return a new dictionary, replacing existing keys with new keys provided by the map block.
+ */
+- (NSDictionary *)buy_dictionaryByMappingKeysWithBlock:(BUYStringMap)map;
+
+/**
+ * Return a new dictionary, replacing existing values with new values provided by the map block.
+ */
+- (NSDictionary *)buy_dictionaryByMappingValuesWithBlock:(BUYObjectMap)map;
 
 /**
  *  Alernative to objectForKey, where NSNull is replaced with nil

Mobile Buy SDK/Mobile Buy SDK/Additions/NSDictionary+BUYAdditions.m

+//
+//  NSDictionary+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 "NSDictionary+BUYAdditions.h"
+#import "NSString+BUYAdditions.h"
+
+@implementation NSDictionary (BUYAdditions)
+
+- (NSDictionary<NSString *, NSString *> *)buy_reverseDictionary
+{
+	return [NSDictionary dictionaryWithObjects:self.allKeys forKeys:self.allValues];
+}
+
+- (NSDictionary *)buy_dictionaryByMappingKeysWithBlock:(BUYStringMap)map
+{
+	NSMutableDictionary *result = [NSMutableDictionary dictionary];
+	[self enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+		result[(map(key) ?: key)] = self[key];
+	}];
+	return result;
+}
+
+- (NSDictionary *)buy_dictionaryByMappingValuesWithBlock:(BUYObjectMap)map
+{
+	NSMutableDictionary *result = [NSMutableDictionary dictionary];
+	[self enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+		id newValue = map(self[key]);
+		result[key] = newValue;
+	}];
+	return result;
+}
+
+- (id)buy_objectForKey:(NSString *)key
+{
+	return ([self[key] isKindOfClass:[NSNull class]]) ? nil : self[key];
+}
+
+- (NSDictionary *)jsonDictionaryForCheckout
+{
+	return self;
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Additions/NSException+BUYAdditions.h

+//
+//  NSException+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 <Foundation/Foundation.h>
+
+/**
+ * A macro meant to be used with `@throw` to make it easier to raise the given exception type.
+ */
+#define BUYAbstractMethod() [NSException buy_abstractMethodExceptionForSelector:_cmd class:[self class]]
+
+@interface NSException (BUYAdditions)
+
+/**
+ * Return an exception suitable for raising in a method that requires subclasses to override it.
+ */
++ (instancetype)buy_abstractMethodExceptionForSelector:(SEL)selector class:(Class)klass;
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSDictionary+Additions.m → Mobile Buy SDK/Mobile Buy SDK/Additions/NSException+BUYModelAdditions.m

 //
-//  NSDictionary+Additions.m
-//
+//  NSException+BUYAdditions.m
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -25,13 +24,14 @@
 //  THE SOFTWARE.
 //
 
-#import "NSDictionary+Additions.h"
+#import "NSException+BUYAdditions.h"
 
-@implementation NSDictionary (Additions)
+@implementation NSException (BUYAdditions)
 
-- (id)buy_objectForKey:(NSString *)key
++ (instancetype)buy_abstractMethodExceptionForSelector:(SEL)selector class:(Class)class
 {
-	return ([self[key] isKindOfClass:[NSNull class]]) ? nil : self[key];
+	NSString *reason = [NSString stringWithFormat:@"Concrete method not implemented. Please implement %@ in %@", NSStringFromSelector(selector), NSStringFromClass(class)];
+	return [NSException exceptionWithName:@"Abstract Method Invocation Exception" reason:reason userInfo:nil];
 }
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSString+Trim.h → Mobile Buy SDK/Mobile Buy SDK/Additions/NSRegularExpression+BUYAdditions.h

 //
-//  NSString+Trim.h
+//  NSRegularExpression+BUYAdditions.h
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -24,18 +24,18 @@
 //  THE SOFTWARE.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
+
+@interface NSRegularExpression (BUYAdditions)
 
 /**
- *  Convenience method for easier white space and newline character trimming
+ * Return an array of strings which match the receiver in the given string.
  */
-@interface NSString (Trim)
+- (NSArray *)buy_matchesInString:(NSString *)string;
 
 /**
-*  Equivalent to `[self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]`
-*
-*  @return NSString without white space and newline characters
-*/
-- (NSString*)buy_trim;
+ * Return the first match which matches the receiver in the given string.
+ */
+- (NSTextCheckingResult *)buy_firstMatchInString:(NSString *)string;
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSString+Trim.m → Mobile Buy SDK/Mobile Buy SDK/Additions/NSRegularExpression+BUYAdditions.m

 //
-//  NSString+Trim.m
+//  NSRegularExpression+BUYAdditions.m
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -24,13 +24,18 @@
 //  THE SOFTWARE.
 //
 
-#import "NSString+Trim.h"
+#import "NSRegularExpression+BUYAdditions.h"
 
-@implementation NSString (Trim)
+@implementation NSRegularExpression (BUYAdditions)
 
-- (NSString*)buy_trim
+- (NSArray *)buy_matchesInString:(NSString *)string
 {
-	return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+	return [self matchesInString:string options:0 range:NSMakeRange(0, string.length)];
+}
+
+- (NSTextCheckingResult *)buy_firstMatchInString:(NSString *)string
+{
+	return [self firstMatchInString:string options:0 range:NSMakeRange(0, string.length)];
 }
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Additions/NSString+BUYAdditions.h

+//
+//  NSString+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 UIKit;
+
+@interface NSString (BUYAdditions)
+
+/**
+ * Return the current set of acronyms used when generating camel-case names;
+ */
++ (NSArray *)buy_acronymStrings;
+
+/**
+ * override built-in acronyms (which only contain "URL")
+ */
++ (void)buy_setAcronymStrings:(NSArray *)strings;
+
+/**
+ * Covert a snake-case string into a camel-case string
+ * Automatically UPPER-cases any tokens found in the current set of acronyms.
+ * @return a camel-case string
+ */
+- (NSString *)buy_camelCaseString;
+
+/**
+ * Convert a camel-case string into a snake-case string
+ * @return a snake-case string
+ */
+- (NSString *)buy_snakeCaseString;
+
+/**
+ * Return a string tokenized according to a camel-case pattern.
+ */
+- (NSArray *)buy_camelCaseTokens;
+
+/**
+ * Return an array of string matches in the receiver for the given regular expression.
+ */
+- (NSArray *)buy_matchesForRegularExpression:(NSRegularExpression *)regex;
+
+/**
+ * A convenience to return all matches in the receiver for the given regex pattern.
+ */
+- (NSArray *)buy_matchesForPattern:(NSString *)pattern;
+
+/**
+ * As `-buy_matchesForRegularExpression`, but return only the first match.
+ */
+- (NSString *)buy_firstMatchForRegularExpression:(NSRegularExpression *)regex;
+
+/**
+ * As `-buy_matchesForPattern`, but return only the first match.
+ */
+- (NSString *)buy_firstMatchForPattern:(NSString *)pattern;
+
+/**
+ * Return a new string which reverses the UTF-8 characters of the receiver.
+ */
+- (NSString *)buy_reversedString;
+
+/**
+ * @return the directory part of the file name, with no ending slash.
+ */
+@property (nonatomic, readonly) NSString *directory;
+
+/**
+ * @return the file name without the extensions.
+ */
+@property (nonatomic, readonly) NSString *baseFileName;
+
+/**
+ * @return a new string with updated directory path.
+ */
+- (NSString *)buy_stringByReplacingDirectory:(NSString *)newDirectory;
+
+/**
+ * @return a new string replacing the base part of the name, preserving existing directory and extension.
+ */
+- (NSString *)buy_stringByReplacingBaseFileName:(NSString *)newName;
+
+/**
+ * @return a new string with suffix appended to base file name, preserving existing directory and extension.
+ */
+
+- (NSString *)buy_stringByAppendingBaseFileNameSuffix:(NSString *)suffix;
+
+/**
+ * @return a new string with HTML tags stripped from the receiver.
+ */
+
+- (NSString *)buy_stringByStrippingHTML;
+
+/**
+ * @return a new attributed string with the specified attributes
+ */
+
+- (NSAttributedString *)buy_attributedStringWithLineSpacing:(CGFloat)spacing textAlignment:(NSTextAlignment)textAlignment;
+
+/**
+ *  Equivalent to `[self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]`
+ *
+ *  @return NSString without white space and newline characters
+ */
+- (NSString*)buy_trim;
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Additions/NSString+BUYAdditions.m

+//
+//  NSString+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 "NSString+BUYAdditions.h"
+#import "NSArray+BUYAdditions.h"
+#import "NSRegularExpression+BUYAdditions.h"
+
+/**
+ * A regex pattern that matches all lowercase roman characters and numbers at the beginning of a string.
+ */
+static NSString * const InitialTokenPattern = @"^[a-z][a-z0-9]*";
+/**
+ * A regex pattern that matches a either one or more capitalized roman characters, or
+ * a sequence of lower-case and number characters followed by a capitalized roman character.
+ * This matches the reverse pattern of words in a camel-case string that are either UPPER case or Capitalized.
+ */
+static NSString * const ReverseSuccessiveTokenPattern = @"([A-Z]*|[a-z0-9]*)[A-Z]";
+
+/**
+ * A convenience macro for converting a getter-style selector name into a string, to use in key-value coding.
+ */
+#define StringForSelector(sel) NSStringFromSelector(@selector(sel))
+
+@implementation NSString (BUYAdditions)
+
+#pragma mark - Transformations -
+static NSSet *acronyms;
+
++ (NSSet *)buy_acronyms
+{
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		acronyms = [NSSet setWithArray:@[ @"url" ]];
+	});
+	return acronyms;
+}
+
++ (NSArray *)buy_acronymStrings
+{
+	return [[self buy_acronyms] allObjects];
+}
+
++ (void)buy_setAcronymStrings:(NSArray *)strings
+{
+	acronyms = [NSSet setWithArray:[strings buy_map:^(NSString *string) {
+		return [string lowercaseString];
+	}]];
+}
+
+- (NSString *)buy_camelCaseString
+{
+	NSArray *tokens = [self componentsSeparatedByString:@"_"];
+	NSArray *tailTokens = [tokens.buy_tail buy_map:^(NSString *token) {
+		return [token buy_camelCaseTailTokenForm];
+	}];
+	return [[tokens.firstObject buy_camelCaseFirstTokenForm] stringByAppendingString:[tailTokens componentsJoinedByString:@""]];
+}
+
+- (NSString *)buy_camelCaseFirstTokenForm
+{
+	return [self isAcronym] ? [self uppercaseString] : self;
+}
+
+- (NSString *)buy_camelCaseTailTokenForm
+{
+	return [self isAcronym] ? [self uppercaseString] : [self capitalizedString];
+}
+
+- (BOOL)isAcronym
+{
+	return [[NSString buy_acronyms] containsObject:self];
+}
+
+- (NSString *)buy_snakeCaseString
+{
+	return [[[self buy_camelCaseTokens] valueForKey:StringForSelector(lowercaseString)] componentsJoinedByString:@"_"];
+}
+
+- (NSArray *)buy_camelCaseTokens
+{
+	NSString *first = [self buy_firstCamelCaseToken];
+	NSArray *rest = [self successiveCamelCaseTokens];
+	return first.length > 0 ? [@[first] arrayByAddingObjectsFromArray:rest] : rest;
+}
+
+- (NSString *)buy_firstCamelCaseToken
+{
+	return [self buy_firstMatchForPattern:InitialTokenPattern];
+}
+
+- (NSArray *)successiveCamelCaseTokens
+{
+	return [[[self.buy_reversedString buy_matchesForPattern:ReverseSuccessiveTokenPattern] valueForKey:StringForSelector(buy_reversedString)] buy_reversedArray];
+}
+
+- (NSArray *)buy_matchesForRegularExpression:(NSRegularExpression *)regex
+{
+	return [[regex buy_matchesInString:self] buy_map:^id(NSTextCheckingResult *result) {
+		return [self substringWithRange:result.range];
+	}];
+}
+
+- (NSString *)buy_firstMatchForRegularExpression:(NSRegularExpression *)regex
+{
+	return [self substringWithRange:[regex buy_firstMatchInString:self].range];
+}
+
+- (NSArray *)buy_matchesForPattern:(NSString *)pattern
+{
+	return [self buy_matchesForRegularExpression:[NSRegularExpression regularExpressionWithPattern:pattern options:0 error:NULL]];
+}
+
+- (NSString *)buy_firstMatchForPattern:(NSString *)pattern
+{
+	return [self buy_firstMatchForRegularExpression:[NSRegularExpression regularExpressionWithPattern:pattern options:0 error:NULL]];
+}
+
+- (NSString *)buy_reversedString
+{
+	NSAssert([self canBeConvertedToEncoding:NSUTF8StringEncoding], @"Unable to reverse string; requires a string that can be encoded in UTF8");
+
+	const char *str = [self UTF8String];
+	unsigned long len = strlen(str);
+	char *rev = malloc(sizeof(char) * len + 1);
+	
+	for (unsigned long i=0; i<len; ++i) {
+		rev[i] = str[len-i-1];
+	}
+	rev[len] = '\0';
+	
+	NSString *reversedString = [NSString stringWithUTF8String:rev];
+	free(rev);
+	
+	return reversedString;
+}
+
+#pragma mark - Path Extensions -
+- (NSString *)directory
+{
+	return [self stringByDeletingLastPathComponent];
+}
+
+- (NSString *)baseFileName
+{
+	return [[self.pathComponents lastObject] stringByDeletingPathExtension];
+}
+
+- (NSString *)buy_stringByReplacingBaseFileName:(NSString *)newName
+{
+	if (self.lastPathComponent.length > self.baseFileName.length) {
+		newName = [newName stringByAppendingPathExtension:self.pathExtension];
+	}
+	return [self.directory stringByAppendingPathComponent:newName];
+}
+
+- (NSString *)buy_stringByReplacingDirectory:(NSString *)newDirectory
+{
+	return [newDirectory stringByAppendingPathComponent:[self.baseFileName stringByAppendingPathExtension:self.pathExtension]];
+}
+
+- (NSString *)buy_stringByAppendingBaseFileNameSuffix:(NSString *)suffix
+{
+	return [self buy_stringByReplacingBaseFileName:[self.baseFileName stringByAppendingString:suffix]];
+}
+
+- (NSString *)buy_stringByStrippingHTML
+{
+	NSAttributedString *attributedString = [[NSAttributedString alloc] initWithData:[self dataUsingEncoding:NSUTF8StringEncoding]
+																			options:@{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType,  NSCharacterEncodingDocumentAttribute: @(NSUTF8StringEncoding)}
+																 documentAttributes:nil
+																			  error:nil];
+	
+	
+	return attributedString.string;
+}
+
+- (NSAttributedString *)buy_attributedStringWithLineSpacing:(CGFloat)spacing textAlignment:(NSTextAlignment)textAlignment
+{
+	NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:self];
+	NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+	style.lineSpacing = spacing;
+	style.alignment = textAlignment;
+	[attributedString addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, self.length)];
+	return attributedString;
+}
+
+#pragma mark - Trim -
+- (NSString*)buy_trim
+{
+	return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+}
+
+@end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSURL+BUYAdditions.h → Mobile Buy SDK/Mobile Buy SDK/Additions/NSURL+BUYAdditions.h

@@ -35,6 +35,14 @@
  *
  *  @return An NSURL from an NSString
  */
-+ (NSURL *)buy_urlWithString:(NSString *)string;
++ (instancetype)buy_urlWithString:(NSString *)string;
+
+
+/**
+ * Create an NSURL by updating the file name with the given suffix, preserving other URL properties.
+ *
+ * @return an NSURL object with the updated file name.
+ */
+- (instancetype)buy_URLByAppendingFileBaseNameSuffix:(NSString *)suffix;
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Utils/NSURL+BUYAdditions.m → Mobile Buy SDK/Mobile Buy SDK/Additions/NSURL+BUYAdditions.m

@@ -25,10 +25,11 @@
 //
 
 #import "NSURL+BUYAdditions.h"
+#import "NSString+BUYAdditions.h"
 
 @implementation NSURL (BUYAdditions)
 
-+ (NSURL *)buy_urlWithString:(NSString *)string
++ (instancetype)buy_urlWithString:(NSString *)string
 {
 	NSURL *url = nil;
 	
@@ -39,5 +40,11 @@
 	return url;
 }
 
+- (instancetype)buy_URLByAppendingFileBaseNameSuffix:(NSString *)suffix
+{
+	NSURLComponents *components = [NSURLComponents componentsWithURL:self resolvingAgainstBaseURL:NO];
+	components.path = [components.path buy_stringByAppendingBaseFileNameSuffix:suffix];
+	return [components URL];
+}
 
 @end

Mobile Buy SDK/Mobile Buy SDK/Models/BUYAddress.m

@@ -25,8 +25,8 @@
 //
 
 #import "BUYAddress.h"
-#import "NSString+Trim.h"
-#import "NSDictionary+Additions.h"
+#import "NSString+BUYAdditions.h"
+#import "NSDictionary+BUYAdditions.h"
 
 @implementation BUYAddress
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m

@@ -27,6 +27,7 @@
 #import "BUYAddress.h"
 #import "BUYCart.h"
 #import "BUYCheckout.h"
+#import "BUYCheckout_Private.h"
 #import "BUYDiscount.h"
 #import "BUYLineItem.h"
 #import "BUYMaskedCreditCard.h"
@@ -37,11 +38,10 @@
 #import "BUYMaskedCreditCard.h"
 #import "BUYGiftCard.h"
 #import "NSDecimalNumber+BUYAdditions.h"
-#import "NSString+Trim.h"
-#import "BUYCheckout_Private.h"
+#import "NSString+BUYAdditions.h"
 #import "NSDateFormatter+BUYAdditions.h"
 #import "NSURL+BUYAdditions.h"
-#import "NSDictionary+Additions.h"
+#import "NSDictionary+BUYAdditions.h"
 #import "BUYCheckoutAttribute.h"
 
 @implementation BUYCheckout

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCollection.m

@@ -27,7 +27,7 @@
 #import "BUYCollection.h"
 #import "NSDateFormatter+BUYAdditions.h"
 #import "NSURL+BUYAdditions.h"	
-#import "NSDictionary+Additions.h"
+#import "NSDictionary+BUYAdditions.h"
 
 @interface BUYCollection ()
 @property (nonatomic, strong) NSString *title;

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCreditCard.m

@@ -25,7 +25,7 @@
 //
 
 #import "BUYCreditCard.h"
-#import "NSString+Trim.h"
+#import "NSString+BUYAdditions.h"
 
 @implementation BUYCreditCard
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYDiscount.m

@@ -26,7 +26,7 @@
 
 #import "BUYDiscount.h"
 #import "NSDecimalNumber+BUYAdditions.h"
-#import "NSString+trim.h"
+#import "NSString+BUYAdditions.h"
 
 @implementation BUYDiscount
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYLineItem.m

@@ -27,7 +27,7 @@
 #import "BUYLineItem.h"
 #import "BUYProductVariant.h"
 #import "NSDecimalNumber+BUYAdditions.h"
-#import "NSString+Trim.h"
+#import "NSString+BUYAdditions.h"
 #import "BUYProduct.h"
 
 @interface BUYLineItem ()

Mobile Buy SDK/Mobile Buy SDK/Models/BUYOrder.m

@@ -26,7 +26,7 @@
 
 #import "BUYOrder.h"
 #import "NSURL+BUYAdditions.h"
-#import "NSDictionary+Additions.h"
+#import "NSDictionary+BUYAdditions.h"
 
 @interface BUYOrder ()
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYProduct.m

@@ -29,7 +29,7 @@
 #import "BUYProduct.h"
 #import "BUYProductVariant.h"
 #import "NSDateFormatter+BUYAdditions.h"
-#import "NSDictionary+Additions.h"
+#import "NSDictionary+BUYAdditions.h"
 
 @implementation BUYProduct
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYShippingRate.m

@@ -26,7 +26,7 @@
 
 #import "BUYShippingRate.h"
 #import "NSDecimalNumber+BUYAdditions.h"
-#import "NSString+Trim.h"
+#import "NSString+BUYAdditions.h"
 #import "NSDateFormatter+BUYAdditions.h"
 
 @interface BUYShippingRate ()