Merge pull request #13 from edopelawi/master

Fix circular reference bug on JSONAPIResource

Author: Josh Holtz

Classes/JSONAPI.m

@@ -120,7 +120,6 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
     _includedResources = includedResources;
 
     // Link included with included
-    // TODO: Need to look into / stop circular references
     for (NSDictionary *typeIncluded in _includedResources.allValues) {
         for (JSONAPIResource *resource in typeIncluded.allValues) {
             [resource linkWithIncluded:self];

Classes/JSONAPIResource.m

@@ -172,7 +172,7 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {
 
                         JSONAPIResource *linkedResource = included[linkType][linksToId];
                         if (linkedResource != nil) {
-                            [linkedResources addObject:linkedResources];
+                            [linkedResources addObject:linkedResource];
                         }
                     }
                 }
@@ -226,6 +226,15 @@ - (id)copyWithZone:(NSZone *)zone {
 
     }
 
+    BOOL isEmptyDictionary = !self.__dictionary || self.__dictionary.count == 0;
+    
+    if (isEmptyDictionary) {
+        for (NSString *key in self.propertyKeys) {
+            id selfValue = [self valueForKey:key];
+            [copy setValue:selfValue forKey:key];
+        }
+    }
+    
     return copy;
 }
 
@@ -302,4 +311,32 @@ - (void)encodeWithCoder:(NSCoder *)aCoder
     }
 }
 
+#pragma mark - NSObject -
+
+- (BOOL)isEqual:(id)object
+{
+    if (self == object) return YES;
+    if (![object isMemberOfClass:[self class]]) return NO;
+    
+    for (NSString *key in self.propertyKeys) {
+        id selfValue = [self valueForKey:key];
+        id objectValue = [object valueForKey:key];
+        
+        BOOL valuesEqual = ((selfValue == nil && objectValue == nil) || [selfValue isEqual:objectValue]);
+        if (!valuesEqual) return NO;
+    }
+    
+    return YES;
+}
+
+- (NSUInteger)hash {
+    NSUInteger value = 0;
+    
+    for (NSString *key in self.propertyKeys) {
+        value ^= [[self valueForKey:key] hash];
+    }
+    
+    return value;
+}
+
 @end