moving method to more appropriate category

vincentsong · Mar 25, 2012 · 9f35eee · 9f35eee
1 parent 94cf4b8
commit 9f35eee
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.h b/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.h
@@ -11,5 +11,6 @@
 @interface NSAttributeDescription (MagicalRecord_DataImport)
 
 - (NSString *) MR_primaryKey;
+- (id) MR_valueForKeyPath:(NSString *)keyPath fromObjectData:(id)objectData;
 
 @end
diff --git a/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m b/MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
@@ -15,4 +15,32 @@ - (NSString *) MR_primaryKey;
  return nil;
 }
 
+- (id) MR_valueForKeyPath:(NSString *)keyPath fromObjectData:(id)objectData;
+{
+ id value = [objectData valueForKeyPath:keyPath];
+
+ NSAttributeType attributeType = [self attributeType];
+ NSString *desiredAttributeType = [[self userInfo] valueForKey:kMagicalRecordImportAttributeValueClassNameKey];
+ if (desiredAttributeType) 
+ {
+ if ([desiredAttributeType hasSuffix:@"Color"])
+ {
+ value = colorFromString(value);
+ }
+ }
+ else 
+ {
+ if (attributeType == NSDateAttributeType)
+ {
+ if (![value isKindOfClass:[NSDate class]]) 
+ {
+ NSString *dateFormat = [[self userInfo] valueForKey:kMagicalRecordImportCustomDateFormatKey];
+ value = dateFromString([value description], dateFormat ?: kMagicalRecordImportDefaultDateFormatString);
+ }
+ value = adjustDateForDST(value);
+ }
+ }
+
+ return value == [NSNull null] ? nil : value; 
+}
 @end
diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
@@ -26,35 +26,6 @@
 
 @implementation NSManagedObject (MagicalRecord_DataImport)
 
-- (id) MR_valueForAttribute:(NSAttributeDescription *)attributeInfo fromObjectData:(NSDictionary *)objectData forKeyPath:(NSString *)keyPath
-{
- id value = [objectData valueForKeyPath:keyPath];
-
- NSAttributeType attributeType = [attributeInfo attributeType];
- NSString *desiredAttributeType = [[attributeInfo userInfo] valueForKey:kMagicalRecordImportAttributeValueClassNameKey];
- if (desiredAttributeType) 
- {
- if ([desiredAttributeType hasSuffix:@"Color"])
- {
- value = colorFromString(value);
- }
- }
- else 
- {
- if (attributeType == NSDateAttributeType)
- {
- if (![value isKindOfClass:[NSDate class]]) 
- {
- NSString *dateFormat = [[attributeInfo userInfo] valueForKey:kMagicalRecordImportCustomDateFormatKey];
- value = dateFromString([value description], dateFormat ?: kMagicalRecordImportDefaultDateFormatString);
- }
- value = adjustDateForDST(value);
- }
- }
-
- return value == [NSNull null] ? nil : value;
-}
-
 - (BOOL) MR_importValue:(id)value forKey:(NSString *)key
 {
  NSString *selectorString = [NSString stringWithFormat:@"import%@:", [key MR_capitalizedFirstCharaterString]];
@@ -79,7 +50,7 @@ - (void) MR_setAttributes:(NSDictionary *)attributes forKeysWithDictionary:(id)o
 
  if (lookupKeyPath) 
  {
- id value = [self MR_valueForAttribute:attributeInfo fromObjectData:objectData forKeyPath:lookupKeyPath];
+ id value = [attributeInfo MR_valueForKeyPath:lookupKeyPath fromObjectData:objectData];
  if (![self MR_importValue:value forKey:attributeName])
  {
  [self setValue:value forKey:attributeName];