Merge pull request #246 from Shopify/task/simple-generated-models

Replace generated accessors with method redirection

Mobile Buy SDK/Mobile Buy SDK/Models/BUYManagedObject.h

@@ -59,9 +59,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)willAccessValueForKey:(NSString *)key;
 - (void)didAccessValueForKey:(NSString *)key;
 
-- (nullable id)primitiveValueForKey:(NSString *)key;
-- (void)setPrimitiveValue:(nullable id)value forKey:(NSString *)key;
-
 @end
 #endif
 

Mobile Buy SDK/Mobile Buy SDK/Models/BUYManagedObject.m

@@ -33,6 +33,7 @@
 #import "NSPropertyDescription+BUYAdditions.h"
 
 #import <CoreData/CoreData.h>
+#import <objc/runtime.h>
 
 #if defined CORE_DATA_PERSISTENCE
 
@@ -91,25 +92,89 @@ return self.entity.JSONEncodedProperties;
 	return self.JSONDictionary;
 }
 
-@end
+#pragma mark - Dynamic Property Accessor Resolution
 
-#else
+NS_INLINE NSString *KeyForSelector(SEL selector, BOOL *isSetter)
+{
+	NSString *name = NSStringFromSelector(selector);
+	BOOL setter = [name hasPrefix:@"set"];
+	if (isSetter) {
+		*isSetter = setter;
+	}
+	return setter ? [[name substringWithRange:NSMakeRange(3, name.length - 4)] lowercaseString] : name;
+}
 
-@implementation BUYObject (BUYManagedObjectConformance)
+- (BOOL)respondsToSelector:(SEL)selector
+{
+	return [super respondsToSelector:selector] || [self isPropertyAccessor:selector];
+}
 
-- (void)willAccessValueForKey:(NSString *)key {}
+static NSMutableDictionary *signatureCache;
 
-- (void)didAccessValueForKey:(NSString *)key {}
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
+{
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		signatureCache = [NSMutableDictionary dictionary];
+	});
+	
+	NSString *selectorName = NSStringFromSelector(selector);
+	NSMethodSignature *signature = signatureCache[selectorName];
+	
+	if (!signature) {
+		SEL substituteSelector = [selectorName hasPrefix:@"set"] ? @selector(setPrimitiveValue:forKey:) : @selector(primitiveValueForKey:);
+		signatureCache[selectorName] = signature = [super methodSignatureForSelector:substituteSelector];
+	}
+
+	return signature;
+}
+
+- (void)forwardInvocation:(NSInvocation *)anInvocation
+{
+	BOOL isSetter = NO;
+	NSString *key = KeyForSelector(anInvocation.selector, &isSetter);
+	id value = nil;
+	if (isSetter) {
+		[anInvocation getArgument:&value atIndex:2];
+		[self setValue:value forPropertyKey:key];
+	}
+	else {
+		value = [self valueForPropertyKey:key];
+		[anInvocation setReturnValue:&value];
+	}
+}
 
-- (id)primitiveValueForKey:(NSString *)key
+- (BOOL)isPropertyAccessor:(SEL)selector
 {
-	return [self valueForKey:key];
+	return (signatureCache[NSStringFromSelector(selector)] || [self hasPropertyForKey:KeyForSelector(selector, NULL)]);
 }
 
-- (void)setPrimitiveValue:(id)value forKey:(NSString *)key
+- (BOOL)hasPropertyForKey:(NSString *)key
 {
-	[self setValue:value forKey:key];
+	return class_getProperty([self class], [key UTF8String]) != NULL;
 }
 
+- (id)valueForPropertyKey:(NSString *)key
+{
+	[self willAccessValueForKey:key];
+	id value = [self primitiveValueForKey:key];
+	[self didAccessValueForKey:key];
+	return value;
+}
+
+- (void)setValue:(id)value forPropertyKey:(NSString *)key
+{
+	[self willChangeValueForKey:key];
+	[self setPrimitiveValue:value forKey:key];
+	[self didChangeValueForKey:key];
+}
+
+@end
+
+#else
+
+@implementation BUYObject (BUYManagedObjectConformance)
+- (void)willAccessValueForKey:(NSString *)key {}
+- (void)didAccessValueForKey:(NSString *)key {}
 @end
 #endif

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYAddress.m

@@ -71,175 +71,19 @@ const struct BUYAddressUserInfo BUYAddressUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSString*)address1 {
-    [self willAccessValueForKey:@"address1"];
-    id value = [self primitiveValueForKey:@"address1"];
-    [self didAccessValueForKey:@"address1"];
-    return value;
-}
-
-- (void)setAddress1:(NSString*)value_ {
-    [self willChangeValueForKey:@"address1"];
-    [self setPrimitiveValue:value_ forKey:@"address1"];
-    [self didChangeValueForKey:@"address1"];
-}
-
-- (NSString*)address2 {
-    [self willAccessValueForKey:@"address2"];
-    id value = [self primitiveValueForKey:@"address2"];
-    [self didAccessValueForKey:@"address2"];
-    return value;
-}
-
-- (void)setAddress2:(NSString*)value_ {
-    [self willChangeValueForKey:@"address2"];
-    [self setPrimitiveValue:value_ forKey:@"address2"];
-    [self didChangeValueForKey:@"address2"];
-}
-
-- (NSString*)city {
-    [self willAccessValueForKey:@"city"];
-    id value = [self primitiveValueForKey:@"city"];
-    [self didAccessValueForKey:@"city"];
-    return value;
-}
-
-- (void)setCity:(NSString*)value_ {
-    [self willChangeValueForKey:@"city"];
-    [self setPrimitiveValue:value_ forKey:@"city"];
-    [self didChangeValueForKey:@"city"];
-}
-
-- (NSString*)company {
-    [self willAccessValueForKey:@"company"];
-    id value = [self primitiveValueForKey:@"company"];
-    [self didAccessValueForKey:@"company"];
-    return value;
-}
-
-- (void)setCompany:(NSString*)value_ {
-    [self willChangeValueForKey:@"company"];
-    [self setPrimitiveValue:value_ forKey:@"company"];
-    [self didChangeValueForKey:@"company"];
-}
-
-- (NSString*)country {
-    [self willAccessValueForKey:@"country"];
-    id value = [self primitiveValueForKey:@"country"];
-    [self didAccessValueForKey:@"country"];
-    return value;
-}
-
-- (void)setCountry:(NSString*)value_ {
-    [self willChangeValueForKey:@"country"];
-    [self setPrimitiveValue:value_ forKey:@"country"];
-    [self didChangeValueForKey:@"country"];
-}
-
-- (NSString*)countryCode {
-    [self willAccessValueForKey:@"countryCode"];
-    id value = [self primitiveValueForKey:@"countryCode"];
-    [self didAccessValueForKey:@"countryCode"];
-    return value;
-}
-
-- (void)setCountryCode:(NSString*)value_ {
-    [self willChangeValueForKey:@"countryCode"];
-    [self setPrimitiveValue:value_ forKey:@"countryCode"];
-    [self didChangeValueForKey:@"countryCode"];
-}
-
-- (NSString*)firstName {
-    [self willAccessValueForKey:@"firstName"];
-    id value = [self primitiveValueForKey:@"firstName"];
-    [self didAccessValueForKey:@"firstName"];
-    return value;
-}
-
-- (void)setFirstName:(NSString*)value_ {
-    [self willChangeValueForKey:@"firstName"];
-    [self setPrimitiveValue:value_ forKey:@"firstName"];
-    [self didChangeValueForKey:@"firstName"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)lastName {
-    [self willAccessValueForKey:@"lastName"];
-    id value = [self primitiveValueForKey:@"lastName"];
-    [self didAccessValueForKey:@"lastName"];
-    return value;
-}
-
-- (void)setLastName:(NSString*)value_ {
-    [self willChangeValueForKey:@"lastName"];
-    [self setPrimitiveValue:value_ forKey:@"lastName"];
-    [self didChangeValueForKey:@"lastName"];
-}
-
-- (NSString*)phone {
-    [self willAccessValueForKey:@"phone"];
-    id value = [self primitiveValueForKey:@"phone"];
-    [self didAccessValueForKey:@"phone"];
-    return value;
-}
-
-- (void)setPhone:(NSString*)value_ {
-    [self willChangeValueForKey:@"phone"];
-    [self setPrimitiveValue:value_ forKey:@"phone"];
-    [self didChangeValueForKey:@"phone"];
-}
-
-- (NSString*)province {
-    [self willAccessValueForKey:@"province"];
-    id value = [self primitiveValueForKey:@"province"];
-    [self didAccessValueForKey:@"province"];
-    return value;
-}
-
-- (void)setProvince:(NSString*)value_ {
-    [self willChangeValueForKey:@"province"];
-    [self setPrimitiveValue:value_ forKey:@"province"];
-    [self didChangeValueForKey:@"province"];
-}
-
-- (NSString*)provinceCode {
-    [self willAccessValueForKey:@"provinceCode"];
-    id value = [self primitiveValueForKey:@"provinceCode"];
-    [self didAccessValueForKey:@"provinceCode"];
-    return value;
-}
-
-- (void)setProvinceCode:(NSString*)value_ {
-    [self willChangeValueForKey:@"provinceCode"];
-    [self setPrimitiveValue:value_ forKey:@"provinceCode"];
-    [self didChangeValueForKey:@"provinceCode"];
-}
-
-- (NSString*)zip {
-    [self willAccessValueForKey:@"zip"];
-    id value = [self primitiveValueForKey:@"zip"];
-    [self didAccessValueForKey:@"zip"];
-    return value;
-}
-
-- (void)setZip:(NSString*)value_ {
-    [self willChangeValueForKey:@"zip"];
-    [self setPrimitiveValue:value_ forKey:@"zip"];
-    [self didChangeValueForKey:@"zip"];
-}
-
+@dynamic address1;
+@dynamic address2;
+@dynamic city;
+@dynamic company;
+@dynamic country;
+@dynamic countryCode;
+@dynamic firstName;
+@dynamic identifier;
+@dynamic lastName;
+@dynamic phone;
+@dynamic province;
+@dynamic provinceCode;
+@dynamic zip;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYCartLineItem.m

@@ -55,19 +55,7 @@ const struct BUYCartLineItemUserInfo BUYCartLineItemUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSDecimalNumber*)quantity {
-    [self willAccessValueForKey:@"quantity"];
-    id value = [self primitiveValueForKey:@"quantity"];
-    [self didAccessValueForKey:@"quantity"];
-    return value;
-}
-
-- (void)setQuantity:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"quantity"];
-    [self setPrimitiveValue:value_ forKey:@"quantity"];
-    [self didChangeValueForKey:@"quantity"];
-}
-
+@dynamic quantity;
 #endif
 
 #if defined CORE_DATA_PERSISTENCE

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYCollection.m

@@ -72,110 +72,14 @@ const struct BUYCollectionUserInfo BUYCollectionUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSDate*)createdAt {
-    [self willAccessValueForKey:@"createdAt"];
-    id value = [self primitiveValueForKey:@"createdAt"];
-    [self didAccessValueForKey:@"createdAt"];
-    return value;
-}
-
-- (void)setCreatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"createdAt"];
-    [self setPrimitiveValue:value_ forKey:@"createdAt"];
-    [self didChangeValueForKey:@"createdAt"];
-}
-
-- (NSString*)handle {
-    [self willAccessValueForKey:@"handle"];
-    id value = [self primitiveValueForKey:@"handle"];
-    [self didAccessValueForKey:@"handle"];
-    return value;
-}
-
-- (void)setHandle:(NSString*)value_ {
-    [self willChangeValueForKey:@"handle"];
-    [self setPrimitiveValue:value_ forKey:@"handle"];
-    [self didChangeValueForKey:@"handle"];
-}
-
-- (NSString*)htmlDescription {
-    [self willAccessValueForKey:@"htmlDescription"];
-    id value = [self primitiveValueForKey:@"htmlDescription"];
-    [self didAccessValueForKey:@"htmlDescription"];
-    return value;
-}
-
-- (void)setHtmlDescription:(NSString*)value_ {
-    [self willChangeValueForKey:@"htmlDescription"];
-    [self setPrimitiveValue:value_ forKey:@"htmlDescription"];
-    [self didChangeValueForKey:@"htmlDescription"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSNumber*)published {
-    [self willAccessValueForKey:@"published"];
-    id value = [self primitiveValueForKey:@"published"];
-    [self didAccessValueForKey:@"published"];
-    return value;
-}
-
-- (void)setPublished:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"published"];
-    [self setPrimitiveValue:value_ forKey:@"published"];
-    [self didChangeValueForKey:@"published"];
-}
-
-- (NSDate*)publishedAt {
-    [self willAccessValueForKey:@"publishedAt"];
-    id value = [self primitiveValueForKey:@"publishedAt"];
-    [self didAccessValueForKey:@"publishedAt"];
-    return value;
-}
-
-- (void)setPublishedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"publishedAt"];
-    [self setPrimitiveValue:value_ forKey:@"publishedAt"];
-    [self didChangeValueForKey:@"publishedAt"];
-}
-
-- (NSString*)title {
-    [self willAccessValueForKey:@"title"];
-    id value = [self primitiveValueForKey:@"title"];
-    [self didAccessValueForKey:@"title"];
-    return value;
-}
-
-- (void)setTitle:(NSString*)value_ {
-    [self willChangeValueForKey:@"title"];
-    [self setPrimitiveValue:value_ forKey:@"title"];
-    [self didChangeValueForKey:@"title"];
-}
-
-- (NSDate*)updatedAt {
-    [self willAccessValueForKey:@"updatedAt"];
-    id value = [self primitiveValueForKey:@"updatedAt"];
-    [self didAccessValueForKey:@"updatedAt"];
-    return value;
-}
-
-- (void)setUpdatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"updatedAt"];
-    [self setPrimitiveValue:value_ forKey:@"updatedAt"];
-    [self didChangeValueForKey:@"updatedAt"];
-}
-
+@dynamic createdAt;
+@dynamic handle;
+@dynamic htmlDescription;
+@dynamic identifier;
+@dynamic published;
+@dynamic publishedAt;
+@dynamic title;
+@dynamic updatedAt;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYCustomer.m

@@ -102,227 +102,23 @@ const struct BUYCustomerRelationships BUYCustomerRelationships = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSNumber*)acceptsMarketing {
-    [self willAccessValueForKey:@"acceptsMarketing"];
-    id value = [self primitiveValueForKey:@"acceptsMarketing"];
-    [self didAccessValueForKey:@"acceptsMarketing"];
-    return value;
-}
-
-- (void)setAcceptsMarketing:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"acceptsMarketing"];
-    [self setPrimitiveValue:value_ forKey:@"acceptsMarketing"];
-    [self didChangeValueForKey:@"acceptsMarketing"];
-}
-
-- (NSDate*)createdAt {
-    [self willAccessValueForKey:@"createdAt"];
-    id value = [self primitiveValueForKey:@"createdAt"];
-    [self didAccessValueForKey:@"createdAt"];
-    return value;
-}
-
-- (void)setCreatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"createdAt"];
-    [self setPrimitiveValue:value_ forKey:@"createdAt"];
-    [self didChangeValueForKey:@"createdAt"];
-}
-
-- (NSNumber*)customerState {
-    [self willAccessValueForKey:@"customerState"];
-    id value = [self primitiveValueForKey:@"customerState"];
-    [self didAccessValueForKey:@"customerState"];
-    return value;
-}
-
-- (void)setCustomerState:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"customerState"];
-    [self setPrimitiveValue:value_ forKey:@"customerState"];
-    [self didChangeValueForKey:@"customerState"];
-}
-
-- (NSString*)email {
-    [self willAccessValueForKey:@"email"];
-    id value = [self primitiveValueForKey:@"email"];
-    [self didAccessValueForKey:@"email"];
-    return value;
-}
-
-- (void)setEmail:(NSString*)value_ {
-    [self willChangeValueForKey:@"email"];
-    [self setPrimitiveValue:value_ forKey:@"email"];
-    [self didChangeValueForKey:@"email"];
-}
-
-- (NSString*)firstName {
-    [self willAccessValueForKey:@"firstName"];
-    id value = [self primitiveValueForKey:@"firstName"];
-    [self didAccessValueForKey:@"firstName"];
-    return value;
-}
-
-- (void)setFirstName:(NSString*)value_ {
-    [self willChangeValueForKey:@"firstName"];
-    [self setPrimitiveValue:value_ forKey:@"firstName"];
-    [self didChangeValueForKey:@"firstName"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)lastName {
-    [self willAccessValueForKey:@"lastName"];
-    id value = [self primitiveValueForKey:@"lastName"];
-    [self didAccessValueForKey:@"lastName"];
-    return value;
-}
-
-- (void)setLastName:(NSString*)value_ {
-    [self willChangeValueForKey:@"lastName"];
-    [self setPrimitiveValue:value_ forKey:@"lastName"];
-    [self didChangeValueForKey:@"lastName"];
-}
-
-- (NSNumber*)lastOrderID {
-    [self willAccessValueForKey:@"lastOrderID"];
-    id value = [self primitiveValueForKey:@"lastOrderID"];
-    [self didAccessValueForKey:@"lastOrderID"];
-    return value;
-}
-
-- (void)setLastOrderID:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"lastOrderID"];
-    [self setPrimitiveValue:value_ forKey:@"lastOrderID"];
-    [self didChangeValueForKey:@"lastOrderID"];
-}
-
-- (NSString*)lastOrderName {
-    [self willAccessValueForKey:@"lastOrderName"];
-    id value = [self primitiveValueForKey:@"lastOrderName"];
-    [self didAccessValueForKey:@"lastOrderName"];
-    return value;
-}
-
-- (void)setLastOrderName:(NSString*)value_ {
-    [self willChangeValueForKey:@"lastOrderName"];
-    [self setPrimitiveValue:value_ forKey:@"lastOrderName"];
-    [self didChangeValueForKey:@"lastOrderName"];
-}
-
-- (NSString*)multipassIdentifier {
-    [self willAccessValueForKey:@"multipassIdentifier"];
-    id value = [self primitiveValueForKey:@"multipassIdentifier"];
-    [self didAccessValueForKey:@"multipassIdentifier"];
-    return value;
-}
-
-- (void)setMultipassIdentifier:(NSString*)value_ {
-    [self willChangeValueForKey:@"multipassIdentifier"];
-    [self setPrimitiveValue:value_ forKey:@"multipassIdentifier"];
-    [self didChangeValueForKey:@"multipassIdentifier"];
-}
-
-- (NSString*)note {
-    [self willAccessValueForKey:@"note"];
-    id value = [self primitiveValueForKey:@"note"];
-    [self didAccessValueForKey:@"note"];
-    return value;
-}
-
-- (void)setNote:(NSString*)value_ {
-    [self willChangeValueForKey:@"note"];
-    [self setPrimitiveValue:value_ forKey:@"note"];
-    [self didChangeValueForKey:@"note"];
-}
-
-- (NSNumber*)ordersCount {
-    [self willAccessValueForKey:@"ordersCount"];
-    id value = [self primitiveValueForKey:@"ordersCount"];
-    [self didAccessValueForKey:@"ordersCount"];
-    return value;
-}
-
-- (void)setOrdersCount:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"ordersCount"];
-    [self setPrimitiveValue:value_ forKey:@"ordersCount"];
-    [self didChangeValueForKey:@"ordersCount"];
-}
-
-- (NSString*)tags {
-    [self willAccessValueForKey:@"tags"];
-    id value = [self primitiveValueForKey:@"tags"];
-    [self didAccessValueForKey:@"tags"];
-    return value;
-}
-
-- (void)setTags:(NSString*)value_ {
-    [self willChangeValueForKey:@"tags"];
-    [self setPrimitiveValue:value_ forKey:@"tags"];
-    [self didChangeValueForKey:@"tags"];
-}
-
-- (NSNumber*)taxExempt {
-    [self willAccessValueForKey:@"taxExempt"];
-    id value = [self primitiveValueForKey:@"taxExempt"];
-    [self didAccessValueForKey:@"taxExempt"];
-    return value;
-}
-
-- (void)setTaxExempt:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"taxExempt"];
-    [self setPrimitiveValue:value_ forKey:@"taxExempt"];
-    [self didChangeValueForKey:@"taxExempt"];
-}
-
-- (NSDecimalNumber*)totalSpent {
-    [self willAccessValueForKey:@"totalSpent"];
-    id value = [self primitiveValueForKey:@"totalSpent"];
-    [self didAccessValueForKey:@"totalSpent"];
-    return value;
-}
-
-- (void)setTotalSpent:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"totalSpent"];
-    [self setPrimitiveValue:value_ forKey:@"totalSpent"];
-    [self didChangeValueForKey:@"totalSpent"];
-}
-
-- (NSDate*)updatedAt {
-    [self willAccessValueForKey:@"updatedAt"];
-    id value = [self primitiveValueForKey:@"updatedAt"];
-    [self didAccessValueForKey:@"updatedAt"];
-    return value;
-}
-
-- (void)setUpdatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"updatedAt"];
-    [self setPrimitiveValue:value_ forKey:@"updatedAt"];
-    [self didChangeValueForKey:@"updatedAt"];
-}
-
-- (NSNumber*)verifiedEmail {
-    [self willAccessValueForKey:@"verifiedEmail"];
-    id value = [self primitiveValueForKey:@"verifiedEmail"];
-    [self didAccessValueForKey:@"verifiedEmail"];
-    return value;
-}
-
-- (void)setVerifiedEmail:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"verifiedEmail"];
-    [self setPrimitiveValue:value_ forKey:@"verifiedEmail"];
-    [self didChangeValueForKey:@"verifiedEmail"];
-}
-
+@dynamic acceptsMarketing;
+@dynamic createdAt;
+@dynamic customerState;
+@dynamic email;
+@dynamic firstName;
+@dynamic identifier;
+@dynamic lastName;
+@dynamic lastOrderID;
+@dynamic lastOrderName;
+@dynamic multipassIdentifier;
+@dynamic note;
+@dynamic ordersCount;
+@dynamic tags;
+@dynamic taxExempt;
+@dynamic totalSpent;
+@dynamic updatedAt;
+@dynamic verifiedEmail;
 #endif
 
 - (BOOL)acceptsMarketingValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYImageLink.m

@@ -70,84 +70,12 @@ const struct BUYImageLinkUserInfo BUYImageLinkUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSDate*)createdAt {
-    [self willAccessValueForKey:@"createdAt"];
-    id value = [self primitiveValueForKey:@"createdAt"];
-    [self didAccessValueForKey:@"createdAt"];
-    return value;
-}
-
-- (void)setCreatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"createdAt"];
-    [self setPrimitiveValue:value_ forKey:@"createdAt"];
-    [self didChangeValueForKey:@"createdAt"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSNumber*)position {
-    [self willAccessValueForKey:@"position"];
-    id value = [self primitiveValueForKey:@"position"];
-    [self didAccessValueForKey:@"position"];
-    return value;
-}
-
-- (void)setPosition:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"position"];
-    [self setPrimitiveValue:value_ forKey:@"position"];
-    [self didChangeValueForKey:@"position"];
-}
-
-- (NSURL*)sourceURL {
-    [self willAccessValueForKey:@"sourceURL"];
-    id value = [self primitiveValueForKey:@"sourceURL"];
-    [self didAccessValueForKey:@"sourceURL"];
-    return value;
-}
-
-- (void)setSourceURL:(NSURL*)value_ {
-    [self willChangeValueForKey:@"sourceURL"];
-    [self setPrimitiveValue:value_ forKey:@"sourceURL"];
-    [self didChangeValueForKey:@"sourceURL"];
-}
-
-- (NSDate*)updatedAt {
-    [self willAccessValueForKey:@"updatedAt"];
-    id value = [self primitiveValueForKey:@"updatedAt"];
-    [self didAccessValueForKey:@"updatedAt"];
-    return value;
-}
-
-- (void)setUpdatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"updatedAt"];
-    [self setPrimitiveValue:value_ forKey:@"updatedAt"];
-    [self didChangeValueForKey:@"updatedAt"];
-}
-
-- (NSArray*)variantIds {
-    [self willAccessValueForKey:@"variantIds"];
-    id value = [self primitiveValueForKey:@"variantIds"];
-    [self didAccessValueForKey:@"variantIds"];
-    return value;
-}
-
-- (void)setVariantIds:(NSArray*)value_ {
-    [self willChangeValueForKey:@"variantIds"];
-    [self setPrimitiveValue:value_ forKey:@"variantIds"];
-    [self didChangeValueForKey:@"variantIds"];
-}
-
+@dynamic createdAt;
+@dynamic identifier;
+@dynamic position;
+@dynamic sourceURL;
+@dynamic updatedAt;
+@dynamic variantIds;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYLineItem.m

@@ -95,214 +95,22 @@ const struct BUYLineItemUserInfo BUYLineItemUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSDecimalNumber*)compareAtPrice {
-    [self willAccessValueForKey:@"compareAtPrice"];
-    id value = [self primitiveValueForKey:@"compareAtPrice"];
-    [self didAccessValueForKey:@"compareAtPrice"];
-    return value;
-}
-
-- (void)setCompareAtPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"compareAtPrice"];
-    [self setPrimitiveValue:value_ forKey:@"compareAtPrice"];
-    [self didChangeValueForKey:@"compareAtPrice"];
-}
-
-- (NSNumber*)fulfilled {
-    [self willAccessValueForKey:@"fulfilled"];
-    id value = [self primitiveValueForKey:@"fulfilled"];
-    [self didAccessValueForKey:@"fulfilled"];
-    return value;
-}
-
-- (void)setFulfilled:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"fulfilled"];
-    [self setPrimitiveValue:value_ forKey:@"fulfilled"];
-    [self didChangeValueForKey:@"fulfilled"];
-}
-
-- (NSString*)fulfillmentService {
-    [self willAccessValueForKey:@"fulfillmentService"];
-    id value = [self primitiveValueForKey:@"fulfillmentService"];
-    [self didAccessValueForKey:@"fulfillmentService"];
-    return value;
-}
-
-- (void)setFulfillmentService:(NSString*)value_ {
-    [self willChangeValueForKey:@"fulfillmentService"];
-    [self setPrimitiveValue:value_ forKey:@"fulfillmentService"];
-    [self didChangeValueForKey:@"fulfillmentService"];
-}
-
-- (NSDecimalNumber*)grams {
-    [self willAccessValueForKey:@"grams"];
-    id value = [self primitiveValueForKey:@"grams"];
-    [self didAccessValueForKey:@"grams"];
-    return value;
-}
-
-- (void)setGrams:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"grams"];
-    [self setPrimitiveValue:value_ forKey:@"grams"];
-    [self didChangeValueForKey:@"grams"];
-}
-
-- (NSString*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSString*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSDecimalNumber*)linePrice {
-    [self willAccessValueForKey:@"linePrice"];
-    id value = [self primitiveValueForKey:@"linePrice"];
-    [self didAccessValueForKey:@"linePrice"];
-    return value;
-}
-
-- (void)setLinePrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"linePrice"];
-    [self setPrimitiveValue:value_ forKey:@"linePrice"];
-    [self didChangeValueForKey:@"linePrice"];
-}
-
-- (NSDecimalNumber*)price {
-    [self willAccessValueForKey:@"price"];
-    id value = [self primitiveValueForKey:@"price"];
-    [self didAccessValueForKey:@"price"];
-    return value;
-}
-
-- (void)setPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"price"];
-    [self setPrimitiveValue:value_ forKey:@"price"];
-    [self didChangeValueForKey:@"price"];
-}
-
-- (NSNumber*)productId {
-    [self willAccessValueForKey:@"productId"];
-    id value = [self primitiveValueForKey:@"productId"];
-    [self didAccessValueForKey:@"productId"];
-    return value;
-}
-
-- (void)setProductId:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"productId"];
-    [self setPrimitiveValue:value_ forKey:@"productId"];
-    [self didChangeValueForKey:@"productId"];
-}
-
-- (NSDictionary*)properties {
-    [self willAccessValueForKey:@"properties"];
-    id value = [self primitiveValueForKey:@"properties"];
-    [self didAccessValueForKey:@"properties"];
-    return value;
-}
-
-- (void)setProperties:(NSDictionary*)value_ {
-    [self willChangeValueForKey:@"properties"];
-    [self setPrimitiveValue:value_ forKey:@"properties"];
-    [self didChangeValueForKey:@"properties"];
-}
-
-- (NSDecimalNumber*)quantity {
-    [self willAccessValueForKey:@"quantity"];
-    id value = [self primitiveValueForKey:@"quantity"];
-    [self didAccessValueForKey:@"quantity"];
-    return value;
-}
-
-- (void)setQuantity:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"quantity"];
-    [self setPrimitiveValue:value_ forKey:@"quantity"];
-    [self didChangeValueForKey:@"quantity"];
-}
-
-- (NSNumber*)requiresShipping {
-    [self willAccessValueForKey:@"requiresShipping"];
-    id value = [self primitiveValueForKey:@"requiresShipping"];
-    [self didAccessValueForKey:@"requiresShipping"];
-    return value;
-}
-
-- (void)setRequiresShipping:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"requiresShipping"];
-    [self setPrimitiveValue:value_ forKey:@"requiresShipping"];
-    [self didChangeValueForKey:@"requiresShipping"];
-}
-
-- (NSString*)sku {
-    [self willAccessValueForKey:@"sku"];
-    id value = [self primitiveValueForKey:@"sku"];
-    [self didAccessValueForKey:@"sku"];
-    return value;
-}
-
-- (void)setSku:(NSString*)value_ {
-    [self willChangeValueForKey:@"sku"];
-    [self setPrimitiveValue:value_ forKey:@"sku"];
-    [self didChangeValueForKey:@"sku"];
-}
-
-- (NSNumber*)taxable {
-    [self willAccessValueForKey:@"taxable"];
-    id value = [self primitiveValueForKey:@"taxable"];
-    [self didAccessValueForKey:@"taxable"];
-    return value;
-}
-
-- (void)setTaxable:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"taxable"];
-    [self setPrimitiveValue:value_ forKey:@"taxable"];
-    [self didChangeValueForKey:@"taxable"];
-}
-
-- (NSString*)title {
-    [self willAccessValueForKey:@"title"];
-    id value = [self primitiveValueForKey:@"title"];
-    [self didAccessValueForKey:@"title"];
-    return value;
-}
-
-- (void)setTitle:(NSString*)value_ {
-    [self willChangeValueForKey:@"title"];
-    [self setPrimitiveValue:value_ forKey:@"title"];
-    [self didChangeValueForKey:@"title"];
-}
-
-- (NSNumber*)variantId {
-    [self willAccessValueForKey:@"variantId"];
-    id value = [self primitiveValueForKey:@"variantId"];
-    [self didAccessValueForKey:@"variantId"];
-    return value;
-}
-
-- (void)setVariantId:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"variantId"];
-    [self setPrimitiveValue:value_ forKey:@"variantId"];
-    [self didChangeValueForKey:@"variantId"];
-}
-
-- (NSString*)variantTitle {
-    [self willAccessValueForKey:@"variantTitle"];
-    id value = [self primitiveValueForKey:@"variantTitle"];
-    [self didAccessValueForKey:@"variantTitle"];
-    return value;
-}
-
-- (void)setVariantTitle:(NSString*)value_ {
-    [self willChangeValueForKey:@"variantTitle"];
-    [self setPrimitiveValue:value_ forKey:@"variantTitle"];
-    [self didChangeValueForKey:@"variantTitle"];
-}
-
+@dynamic compareAtPrice;
+@dynamic fulfilled;
+@dynamic fulfillmentService;
+@dynamic grams;
+@dynamic identifier;
+@dynamic linePrice;
+@dynamic price;
+@dynamic productId;
+@dynamic properties;
+@dynamic quantity;
+@dynamic requiresShipping;
+@dynamic sku;
+@dynamic taxable;
+@dynamic title;
+@dynamic variantId;
+@dynamic variantTitle;
 #endif
 
 - (BOOL)fulfilledValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYOption.m

@@ -66,45 +66,9 @@ const struct BUYOptionUserInfo BUYOptionUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)name {
-    [self willAccessValueForKey:@"name"];
-    id value = [self primitiveValueForKey:@"name"];
-    [self didAccessValueForKey:@"name"];
-    return value;
-}
-
-- (void)setName:(NSString*)value_ {
-    [self willChangeValueForKey:@"name"];
-    [self setPrimitiveValue:value_ forKey:@"name"];
-    [self didChangeValueForKey:@"name"];
-}
-
-- (NSNumber*)position {
-    [self willAccessValueForKey:@"position"];
-    id value = [self primitiveValueForKey:@"position"];
-    [self didAccessValueForKey:@"position"];
-    return value;
-}
-
-- (void)setPosition:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"position"];
-    [self setPrimitiveValue:value_ forKey:@"position"];
-    [self didChangeValueForKey:@"position"];
-}
-
+@dynamic identifier;
+@dynamic name;
+@dynamic position;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYOptionValue.m

@@ -57,45 +57,9 @@ const struct BUYOptionValueRelationships BUYOptionValueRelationships = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSString*)name {
-    [self willAccessValueForKey:@"name"];
-    id value = [self primitiveValueForKey:@"name"];
-    [self didAccessValueForKey:@"name"];
-    return value;
-}
-
-- (void)setName:(NSString*)value_ {
-    [self willChangeValueForKey:@"name"];
-    [self setPrimitiveValue:value_ forKey:@"name"];
-    [self didChangeValueForKey:@"name"];
-}
-
-- (NSNumber*)optionId {
-    [self willAccessValueForKey:@"optionId"];
-    id value = [self primitiveValueForKey:@"optionId"];
-    [self didAccessValueForKey:@"optionId"];
-    return value;
-}
-
-- (void)setOptionId:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"optionId"];
-    [self setPrimitiveValue:value_ forKey:@"optionId"];
-    [self didChangeValueForKey:@"optionId"];
-}
-
-- (NSString*)value {
-    [self willAccessValueForKey:@"value"];
-    id value = [self primitiveValueForKey:@"value"];
-    [self didAccessValueForKey:@"value"];
-    return value;
-}
-
-- (void)setValue:(NSString*)value_ {
-    [self willChangeValueForKey:@"value"];
-    [self setPrimitiveValue:value_ forKey:@"value"];
-    [self didChangeValueForKey:@"value"];
-}
-
+@dynamic name;
+@dynamic optionId;
+@dynamic value;
 #endif
 
 - (int64_t)optionIdValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYOrder.m

@@ -67,97 +67,13 @@ const struct BUYOrderUserInfo BUYOrderUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)name {
-    [self willAccessValueForKey:@"name"];
-    id value = [self primitiveValueForKey:@"name"];
-    [self didAccessValueForKey:@"name"];
-    return value;
-}
-
-- (void)setName:(NSString*)value_ {
-    [self willChangeValueForKey:@"name"];
-    [self setPrimitiveValue:value_ forKey:@"name"];
-    [self didChangeValueForKey:@"name"];
-}
-
-- (NSURL*)orderStatusURL {
-    [self willAccessValueForKey:@"orderStatusURL"];
-    id value = [self primitiveValueForKey:@"orderStatusURL"];
-    [self didAccessValueForKey:@"orderStatusURL"];
-    return value;
-}
-
-- (void)setOrderStatusURL:(NSURL*)value_ {
-    [self willChangeValueForKey:@"orderStatusURL"];
-    [self setPrimitiveValue:value_ forKey:@"orderStatusURL"];
-    [self didChangeValueForKey:@"orderStatusURL"];
-}
-
-- (NSDate*)processedAt {
-    [self willAccessValueForKey:@"processedAt"];
-    id value = [self primitiveValueForKey:@"processedAt"];
-    [self didAccessValueForKey:@"processedAt"];
-    return value;
-}
-
-- (void)setProcessedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"processedAt"];
-    [self setPrimitiveValue:value_ forKey:@"processedAt"];
-    [self didChangeValueForKey:@"processedAt"];
-}
-
-- (NSURL*)statusURL {
-    [self willAccessValueForKey:@"statusURL"];
-    id value = [self primitiveValueForKey:@"statusURL"];
-    [self didAccessValueForKey:@"statusURL"];
-    return value;
-}
-
-- (void)setStatusURL:(NSURL*)value_ {
-    [self willChangeValueForKey:@"statusURL"];
-    [self setPrimitiveValue:value_ forKey:@"statusURL"];
-    [self didChangeValueForKey:@"statusURL"];
-}
-
-- (NSDecimalNumber*)subtotalPrice {
-    [self willAccessValueForKey:@"subtotalPrice"];
-    id value = [self primitiveValueForKey:@"subtotalPrice"];
-    [self didAccessValueForKey:@"subtotalPrice"];
-    return value;
-}
-
-- (void)setSubtotalPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"subtotalPrice"];
-    [self setPrimitiveValue:value_ forKey:@"subtotalPrice"];
-    [self didChangeValueForKey:@"subtotalPrice"];
-}
-
-- (NSDecimalNumber*)totalPrice {
-    [self willAccessValueForKey:@"totalPrice"];
-    id value = [self primitiveValueForKey:@"totalPrice"];
-    [self didAccessValueForKey:@"totalPrice"];
-    return value;
-}
-
-- (void)setTotalPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"totalPrice"];
-    [self setPrimitiveValue:value_ forKey:@"totalPrice"];
-    [self didChangeValueForKey:@"totalPrice"];
-}
-
+@dynamic identifier;
+@dynamic name;
+@dynamic orderStatusURL;
+@dynamic processedAt;
+@dynamic statusURL;
+@dynamic subtotalPrice;
+@dynamic totalPrice;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYProduct.m

@@ -83,162 +83,18 @@ const struct BUYProductUserInfo BUYProductUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSNumber*)available {
-    [self willAccessValueForKey:@"available"];
-    id value = [self primitiveValueForKey:@"available"];
-    [self didAccessValueForKey:@"available"];
-    return value;
-}
-
-- (void)setAvailable:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"available"];
-    [self setPrimitiveValue:value_ forKey:@"available"];
-    [self didChangeValueForKey:@"available"];
-}
-
-- (NSDate*)createdAt {
-    [self willAccessValueForKey:@"createdAt"];
-    id value = [self primitiveValueForKey:@"createdAt"];
-    [self didAccessValueForKey:@"createdAt"];
-    return value;
-}
-
-- (void)setCreatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"createdAt"];
-    [self setPrimitiveValue:value_ forKey:@"createdAt"];
-    [self didChangeValueForKey:@"createdAt"];
-}
-
-- (NSString*)handle {
-    [self willAccessValueForKey:@"handle"];
-    id value = [self primitiveValueForKey:@"handle"];
-    [self didAccessValueForKey:@"handle"];
-    return value;
-}
-
-- (void)setHandle:(NSString*)value_ {
-    [self willChangeValueForKey:@"handle"];
-    [self setPrimitiveValue:value_ forKey:@"handle"];
-    [self didChangeValueForKey:@"handle"];
-}
-
-- (NSString*)htmlDescription {
-    [self willAccessValueForKey:@"htmlDescription"];
-    id value = [self primitiveValueForKey:@"htmlDescription"];
-    [self didAccessValueForKey:@"htmlDescription"];
-    return value;
-}
-
-- (void)setHtmlDescription:(NSString*)value_ {
-    [self willChangeValueForKey:@"htmlDescription"];
-    [self setPrimitiveValue:value_ forKey:@"htmlDescription"];
-    [self didChangeValueForKey:@"htmlDescription"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)productType {
-    [self willAccessValueForKey:@"productType"];
-    id value = [self primitiveValueForKey:@"productType"];
-    [self didAccessValueForKey:@"productType"];
-    return value;
-}
-
-- (void)setProductType:(NSString*)value_ {
-    [self willChangeValueForKey:@"productType"];
-    [self setPrimitiveValue:value_ forKey:@"productType"];
-    [self didChangeValueForKey:@"productType"];
-}
-
-- (NSNumber*)published {
-    [self willAccessValueForKey:@"published"];
-    id value = [self primitiveValueForKey:@"published"];
-    [self didAccessValueForKey:@"published"];
-    return value;
-}
-
-- (void)setPublished:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"published"];
-    [self setPrimitiveValue:value_ forKey:@"published"];
-    [self didChangeValueForKey:@"published"];
-}
-
-- (NSDate*)publishedAt {
-    [self willAccessValueForKey:@"publishedAt"];
-    id value = [self primitiveValueForKey:@"publishedAt"];
-    [self didAccessValueForKey:@"publishedAt"];
-    return value;
-}
-
-- (void)setPublishedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"publishedAt"];
-    [self setPrimitiveValue:value_ forKey:@"publishedAt"];
-    [self didChangeValueForKey:@"publishedAt"];
-}
-
-- (NSSet*)tags {
-    [self willAccessValueForKey:@"tags"];
-    id value = [self primitiveValueForKey:@"tags"];
-    [self didAccessValueForKey:@"tags"];
-    return value;
-}
-
-- (void)setTags:(NSSet*)value_ {
-    [self willChangeValueForKey:@"tags"];
-    [self setPrimitiveValue:value_ forKey:@"tags"];
-    [self didChangeValueForKey:@"tags"];
-}
-
-- (NSString*)title {
-    [self willAccessValueForKey:@"title"];
-    id value = [self primitiveValueForKey:@"title"];
-    [self didAccessValueForKey:@"title"];
-    return value;
-}
-
-- (void)setTitle:(NSString*)value_ {
-    [self willChangeValueForKey:@"title"];
-    [self setPrimitiveValue:value_ forKey:@"title"];
-    [self didChangeValueForKey:@"title"];
-}
-
-- (NSDate*)updatedAt {
-    [self willAccessValueForKey:@"updatedAt"];
-    id value = [self primitiveValueForKey:@"updatedAt"];
-    [self didAccessValueForKey:@"updatedAt"];
-    return value;
-}
-
-- (void)setUpdatedAt:(NSDate*)value_ {
-    [self willChangeValueForKey:@"updatedAt"];
-    [self setPrimitiveValue:value_ forKey:@"updatedAt"];
-    [self didChangeValueForKey:@"updatedAt"];
-}
-
-- (NSString*)vendor {
-    [self willAccessValueForKey:@"vendor"];
-    id value = [self primitiveValueForKey:@"vendor"];
-    [self didAccessValueForKey:@"vendor"];
-    return value;
-}
-
-- (void)setVendor:(NSString*)value_ {
-    [self willChangeValueForKey:@"vendor"];
-    [self setPrimitiveValue:value_ forKey:@"vendor"];
-    [self didChangeValueForKey:@"vendor"];
-}
-
+@dynamic available;
+@dynamic createdAt;
+@dynamic handle;
+@dynamic htmlDescription;
+@dynamic identifier;
+@dynamic productType;
+@dynamic published;
+@dynamic publishedAt;
+@dynamic tags;
+@dynamic title;
+@dynamic updatedAt;
+@dynamic vendor;
 #endif
 
 - (BOOL)availableValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYProductVariant.m

@@ -90,136 +90,16 @@ const struct BUYProductVariantUserInfo BUYProductVariantUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSNumber*)available {
-    [self willAccessValueForKey:@"available"];
-    id value = [self primitiveValueForKey:@"available"];
-    [self didAccessValueForKey:@"available"];
-    return value;
-}
-
-- (void)setAvailable:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"available"];
-    [self setPrimitiveValue:value_ forKey:@"available"];
-    [self didChangeValueForKey:@"available"];
-}
-
-- (NSDecimalNumber*)compareAtPrice {
-    [self willAccessValueForKey:@"compareAtPrice"];
-    id value = [self primitiveValueForKey:@"compareAtPrice"];
-    [self didAccessValueForKey:@"compareAtPrice"];
-    return value;
-}
-
-- (void)setCompareAtPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"compareAtPrice"];
-    [self setPrimitiveValue:value_ forKey:@"compareAtPrice"];
-    [self didChangeValueForKey:@"compareAtPrice"];
-}
-
-- (NSDecimalNumber*)grams {
-    [self willAccessValueForKey:@"grams"];
-    id value = [self primitiveValueForKey:@"grams"];
-    [self didAccessValueForKey:@"grams"];
-    return value;
-}
-
-- (void)setGrams:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"grams"];
-    [self setPrimitiveValue:value_ forKey:@"grams"];
-    [self didChangeValueForKey:@"grams"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSNumber*)position {
-    [self willAccessValueForKey:@"position"];
-    id value = [self primitiveValueForKey:@"position"];
-    [self didAccessValueForKey:@"position"];
-    return value;
-}
-
-- (void)setPosition:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"position"];
-    [self setPrimitiveValue:value_ forKey:@"position"];
-    [self didChangeValueForKey:@"position"];
-}
-
-- (NSDecimalNumber*)price {
-    [self willAccessValueForKey:@"price"];
-    id value = [self primitiveValueForKey:@"price"];
-    [self didAccessValueForKey:@"price"];
-    return value;
-}
-
-- (void)setPrice:(NSDecimalNumber*)value_ {
-    [self willChangeValueForKey:@"price"];
-    [self setPrimitiveValue:value_ forKey:@"price"];
-    [self didChangeValueForKey:@"price"];
-}
-
-- (NSNumber*)requiresShipping {
-    [self willAccessValueForKey:@"requiresShipping"];
-    id value = [self primitiveValueForKey:@"requiresShipping"];
-    [self didAccessValueForKey:@"requiresShipping"];
-    return value;
-}
-
-- (void)setRequiresShipping:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"requiresShipping"];
-    [self setPrimitiveValue:value_ forKey:@"requiresShipping"];
-    [self didChangeValueForKey:@"requiresShipping"];
-}
-
-- (NSString*)sku {
-    [self willAccessValueForKey:@"sku"];
-    id value = [self primitiveValueForKey:@"sku"];
-    [self didAccessValueForKey:@"sku"];
-    return value;
-}
-
-- (void)setSku:(NSString*)value_ {
-    [self willChangeValueForKey:@"sku"];
-    [self setPrimitiveValue:value_ forKey:@"sku"];
-    [self didChangeValueForKey:@"sku"];
-}
-
-- (NSNumber*)taxable {
-    [self willAccessValueForKey:@"taxable"];
-    id value = [self primitiveValueForKey:@"taxable"];
-    [self didAccessValueForKey:@"taxable"];
-    return value;
-}
-
-- (void)setTaxable:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"taxable"];
-    [self setPrimitiveValue:value_ forKey:@"taxable"];
-    [self didChangeValueForKey:@"taxable"];
-}
-
-- (NSString*)title {
-    [self willAccessValueForKey:@"title"];
-    id value = [self primitiveValueForKey:@"title"];
-    [self didAccessValueForKey:@"title"];
-    return value;
-}
-
-- (void)setTitle:(NSString*)value_ {
-    [self willChangeValueForKey:@"title"];
-    [self setPrimitiveValue:value_ forKey:@"title"];
-    [self didChangeValueForKey:@"title"];
-}
-
+@dynamic available;
+@dynamic compareAtPrice;
+@dynamic grams;
+@dynamic identifier;
+@dynamic position;
+@dynamic price;
+@dynamic requiresShipping;
+@dynamic sku;
+@dynamic taxable;
+@dynamic title;
 #endif
 
 - (BOOL)availableValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Persistent/_BUYShop.m

@@ -78,188 +78,20 @@ const struct BUYShopUserInfo BUYShopUserInfo = {
 }
 
 #if defined CORE_DATA_PERSISTENCE
-- (NSString*)city {
-    [self willAccessValueForKey:@"city"];
-    id value = [self primitiveValueForKey:@"city"];
-    [self didAccessValueForKey:@"city"];
-    return value;
-}
-
-- (void)setCity:(NSString*)value_ {
-    [self willChangeValueForKey:@"city"];
-    [self setPrimitiveValue:value_ forKey:@"city"];
-    [self didChangeValueForKey:@"city"];
-}
-
-- (NSString*)country {
-    [self willAccessValueForKey:@"country"];
-    id value = [self primitiveValueForKey:@"country"];
-    [self didAccessValueForKey:@"country"];
-    return value;
-}
-
-- (void)setCountry:(NSString*)value_ {
-    [self willChangeValueForKey:@"country"];
-    [self setPrimitiveValue:value_ forKey:@"country"];
-    [self didChangeValueForKey:@"country"];
-}
-
-- (NSString*)currency {
-    [self willAccessValueForKey:@"currency"];
-    id value = [self primitiveValueForKey:@"currency"];
-    [self didAccessValueForKey:@"currency"];
-    return value;
-}
-
-- (void)setCurrency:(NSString*)value_ {
-    [self willChangeValueForKey:@"currency"];
-    [self setPrimitiveValue:value_ forKey:@"currency"];
-    [self didChangeValueForKey:@"currency"];
-}
-
-- (NSString*)domain {
-    [self willAccessValueForKey:@"domain"];
-    id value = [self primitiveValueForKey:@"domain"];
-    [self didAccessValueForKey:@"domain"];
-    return value;
-}
-
-- (void)setDomain:(NSString*)value_ {
-    [self willChangeValueForKey:@"domain"];
-    [self setPrimitiveValue:value_ forKey:@"domain"];
-    [self didChangeValueForKey:@"domain"];
-}
-
-- (NSNumber*)identifier {
-    [self willAccessValueForKey:@"identifier"];
-    id value = [self primitiveValueForKey:@"identifier"];
-    [self didAccessValueForKey:@"identifier"];
-    return value;
-}
-
-- (void)setIdentifier:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"identifier"];
-    [self setPrimitiveValue:value_ forKey:@"identifier"];
-    [self didChangeValueForKey:@"identifier"];
-}
-
-- (NSString*)moneyFormat {
-    [self willAccessValueForKey:@"moneyFormat"];
-    id value = [self primitiveValueForKey:@"moneyFormat"];
-    [self didAccessValueForKey:@"moneyFormat"];
-    return value;
-}
-
-- (void)setMoneyFormat:(NSString*)value_ {
-    [self willChangeValueForKey:@"moneyFormat"];
-    [self setPrimitiveValue:value_ forKey:@"moneyFormat"];
-    [self didChangeValueForKey:@"moneyFormat"];
-}
-
-- (NSURL*)myShopifyURL {
-    [self willAccessValueForKey:@"myShopifyURL"];
-    id value = [self primitiveValueForKey:@"myShopifyURL"];
-    [self didAccessValueForKey:@"myShopifyURL"];
-    return value;
-}
-
-- (void)setMyShopifyURL:(NSURL*)value_ {
-    [self willChangeValueForKey:@"myShopifyURL"];
-    [self setPrimitiveValue:value_ forKey:@"myShopifyURL"];
-    [self didChangeValueForKey:@"myShopifyURL"];
-}
-
-- (NSString*)name {
-    [self willAccessValueForKey:@"name"];
-    id value = [self primitiveValueForKey:@"name"];
-    [self didAccessValueForKey:@"name"];
-    return value;
-}
-
-- (void)setName:(NSString*)value_ {
-    [self willChangeValueForKey:@"name"];
-    [self setPrimitiveValue:value_ forKey:@"name"];
-    [self didChangeValueForKey:@"name"];
-}
-
-- (NSString*)province {
-    [self willAccessValueForKey:@"province"];
-    id value = [self primitiveValueForKey:@"province"];
-    [self didAccessValueForKey:@"province"];
-    return value;
-}
-
-- (void)setProvince:(NSString*)value_ {
-    [self willChangeValueForKey:@"province"];
-    [self setPrimitiveValue:value_ forKey:@"province"];
-    [self didChangeValueForKey:@"province"];
-}
-
-- (NSNumber*)publishedCollectionsCount {
-    [self willAccessValueForKey:@"publishedCollectionsCount"];
-    id value = [self primitiveValueForKey:@"publishedCollectionsCount"];
-    [self didAccessValueForKey:@"publishedCollectionsCount"];
-    return value;
-}
-
-- (void)setPublishedCollectionsCount:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"publishedCollectionsCount"];
-    [self setPrimitiveValue:value_ forKey:@"publishedCollectionsCount"];
-    [self didChangeValueForKey:@"publishedCollectionsCount"];
-}
-
-- (NSNumber*)publishedProductsCount {
-    [self willAccessValueForKey:@"publishedProductsCount"];
-    id value = [self primitiveValueForKey:@"publishedProductsCount"];
-    [self didAccessValueForKey:@"publishedProductsCount"];
-    return value;
-}
-
-- (void)setPublishedProductsCount:(NSNumber*)value_ {
-    [self willChangeValueForKey:@"publishedProductsCount"];
-    [self setPrimitiveValue:value_ forKey:@"publishedProductsCount"];
-    [self didChangeValueForKey:@"publishedProductsCount"];
-}
-
-- (NSArray*)shipsToCountries {
-    [self willAccessValueForKey:@"shipsToCountries"];
-    id value = [self primitiveValueForKey:@"shipsToCountries"];
-    [self didAccessValueForKey:@"shipsToCountries"];
-    return value;
-}
-
-- (void)setShipsToCountries:(NSArray*)value_ {
-    [self willChangeValueForKey:@"shipsToCountries"];
-    [self setPrimitiveValue:value_ forKey:@"shipsToCountries"];
-    [self didChangeValueForKey:@"shipsToCountries"];
-}
-
-- (NSString*)shopDescription {
-    [self willAccessValueForKey:@"shopDescription"];
-    id value = [self primitiveValueForKey:@"shopDescription"];
-    [self didAccessValueForKey:@"shopDescription"];
-    return value;
-}
-
-- (void)setShopDescription:(NSString*)value_ {
-    [self willChangeValueForKey:@"shopDescription"];
-    [self setPrimitiveValue:value_ forKey:@"shopDescription"];
-    [self didChangeValueForKey:@"shopDescription"];
-}
-
-- (NSURL*)shopURL {
-    [self willAccessValueForKey:@"shopURL"];
-    id value = [self primitiveValueForKey:@"shopURL"];
-    [self didAccessValueForKey:@"shopURL"];
-    return value;
-}
-
-- (void)setShopURL:(NSURL*)value_ {
-    [self willChangeValueForKey:@"shopURL"];
-    [self setPrimitiveValue:value_ forKey:@"shopURL"];
-    [self didChangeValueForKey:@"shopURL"];
-}
-
+@dynamic city;
+@dynamic country;
+@dynamic currency;
+@dynamic domain;
+@dynamic identifier;
+@dynamic moneyFormat;
+@dynamic myShopifyURL;
+@dynamic name;
+@dynamic province;
+@dynamic publishedCollectionsCount;
+@dynamic publishedProductsCount;
+@dynamic shipsToCountries;
+@dynamic shopDescription;
+@dynamic shopURL;
 #endif
 
 - (int64_t)identifierValue {

Mobile Buy SDK/Mobile Buy SDK/Models/Templates/Persistent/machine.m.motemplate

@@ -71,20 +71,9 @@ const struct <$managedObjectClassName$>UserInfo <$managedObjectClassName$>UserIn
 }
 
 #if defined CORE_DATA_PERSISTENCE<$foreach Attribute noninheritedAttributes do$><$if Attribute.hasDefinedAttributeType$>
-- (<$Attribute.objectAttributeType$>)<$Attribute.name$> {
-    [self willAccessValueForKey:@"<$Attribute.name$>"];
-    id value = [self primitiveValueForKey:@"<$Attribute.name$>"];
-    [self didAccessValueForKey:@"<$Attribute.name$>"];
-    return value;
-}
-<$if ! Attribute.isReadonly$>
-- (void)set<$Attribute.name.initialCapitalString$>:(<$Attribute.objectAttributeType$>)value_ {
-    [self willChangeValueForKey:@"<$Attribute.name$>"];
-    [self setPrimitiveValue:value_ forKey:@"<$Attribute.name$>"];
-    [self didChangeValueForKey:@"<$Attribute.name$>"];
-}
-<$endif$><$endif$><$endforeach do$>
+@dynamic <$Attribute.name$>;<$endif$><$endforeach$>
 #endif
+
 <$foreach Attribute noninheritedAttributes do$>
 <$if Attribute.hasDefinedAttributeType$>
 <$if Attribute.hasScalarAttributeType$>