Merge remote-tracking branch 'joshdholtz/master'

Author: Julian Krumow

Classes/JSONAPIResourceParser.m

@@ -121,8 +121,8 @@ + (NSDictionary*)dictionaryFor:(NSObject <JSONAPIResource>*)resource {
                             [dictionaryArray addObject:[self link:valueElement from:resource withKey:[property jsonName]]];
                         }
 
-                        [linkage setValue:dictionaryArray forKey:[property jsonName]];
-                        
+                        NSDictionary *dataDictionary = @{@"data" : dictionaryArray};
+                        [linkage setValue:dataDictionary forKey:[property jsonName]];
                     } else {
                         NSFormatter *format = [property formatter];
 
@@ -372,10 +372,15 @@ + (NSDictionary*)link:(NSObject <JSONAPIResource>*)resource from:(NSObject <JSON
     }
 
     if (resource.ID) {
-        [reference setValue:@{
-                              @"type" : descriptor.type,
-                              @"id"   : resource.ID
-                              } forKey:@"data"];
+        NSDictionary *referenceObject = @{
+                                          @"type" : descriptor.type,
+                                          @"id"   : resource.ID
+                                          };
+        if ([[owner valueForKey:key] isKindOfClass:[NSArray class]]) {
+            reference = referenceObject.mutableCopy;
+        } else {
+            [reference setValue:referenceObject forKey:@"data"];
+        }
     }
 
     return reference;

JSONAPI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JSONAPI"
-  s.version      = "1.0.4"
+  s.version      = "1.0.5"
   s.summary      = "A library for loading data from a JSON API datasource."
   s.description  = <<-DESC
                     A library for loading data from a JSON API datasource. Parses JSON API data into models with support for auto-linking of resources and custom model classes.

Project/JSONAPITests/JSONAPITests.m

@@ -152,16 +152,21 @@ - (void)testSerializeComplex {
     newAuthor.firstName = @"Karl";
     newAuthor.lastName = @"Armstrong";
 
-    CommentResource *newComment = [[CommentResource alloc] init];
-    newComment.ID = [NSUUID UUID];
-    newComment.author = newAuthor;
-    newComment.text = @"First!";
+    CommentResource *firstComment = [[CommentResource alloc] init];
+    firstComment.ID = [NSUUID UUID];
+    firstComment.author = newAuthor;
+    firstComment.text = @"First!";
+    
+    CommentResource *secondComment = [[CommentResource alloc] init];
+    secondComment.ID = [NSUUID UUID];
+    secondComment.author = newAuthor;
+    secondComment.text = @"Second!";
 
     ArticleResource *newArticle = [[ArticleResource alloc] init];
     newArticle.title = @"Title";
     newArticle.author = newAuthor;
     newArticle.date = [NSDate date];
-    newArticle.comments = [[NSArray alloc] initWithObjects:newComment, nil];
+    newArticle.comments = [[NSArray alloc] initWithObjects:firstComment, secondComment, nil];
 
     NSDictionary *json = [JSONAPIResourceParser dictionaryFor:newArticle];
     XCTAssertEqualObjects(json[@"type"], @"articles", @"Did not create Article!");
@@ -172,8 +177,8 @@ - (void)testSerializeComplex {
     XCTAssertNil(json[@"relationships"][@"author"][@"first-name"], @"Bad link!");
 
     XCTAssertNotNil(json[@"relationships"][@"comments"], @"Did not create links!");
-    XCTAssertTrue([json[@"relationships"][@"comments"] isKindOfClass:[NSArray class]], @"Comments should be array!.");
-    XCTAssertEqual([json[@"relationships"][@"comments"] count], 1, @"Comments should have 1 element!.");
+    XCTAssertTrue([json[@"relationships"][@"comments"][@"data"] isKindOfClass:[NSArray class]], @"Comments data should be array!.");
+    XCTAssertEqual([json[@"relationships"][@"comments"][@"data"] count], 2, @"Comments should have 2 elements!.");
 }
 
 - (void)testCreate {
@@ -227,11 +232,11 @@ - (void)testGenericSerialization {
     NSDictionary *serializedFirstPost = [JSONAPIResourceParser dictionaryFor:posts.firstObject];
     NSDictionary *serializedSecondPost = [JSONAPIResourceParser dictionaryFor:posts.lastObject];
 
-    XCTAssertNotNil(serializedFirstPost[@"relationships"][@"attachments"][0], @"Media attachment should not be nil");
-    XCTAssertNotNil(serializedFirstPost[@"relationships"][@"attachments"][1], @"Web page url attachment should not be nil");
+    XCTAssertNotNil(serializedFirstPost[@"relationships"][@"attachments"][@"data"][0], @"Media attachment should not be nil");
+    XCTAssertNotNil(serializedFirstPost[@"relationships"][@"attachments"][@"data"][1], @"Web page url attachment should not be nil");
 
-    XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"attachments"][0][@"data"][@"id"], @15, @"Media id should be '15'");
-    XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"attachments"][0][@"data"][@"type"], @"Media", @"Media type should be 'Media'");
+    XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"attachments"][@"data"][0][@"id"], @15, @"Media id should be '15'");
+    XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"attachments"][@"data"][0][@"type"], @"Media", @"Media type should be 'Media'");
 
     XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"publisher"][@"data"][@"id"], @45, @"User id should be '45'");
     XCTAssertEqualObjects(serializedFirstPost[@"relationships"][@"publisher"][@"data"][@"type"], @"User", @"User type should be 'User'");

README.md

@@ -6,10 +6,22 @@
 
 A library for loading data from a [JSON API](http://jsonapi.org) datasource. Parses JSON API data into models with support for linking of properties and other resources.
 
+### Quick Usage
+```objc
+NSDictionary *json = [self responseFromAPIRequest];
+JSONAPI *jsonAPI = [JSONAPI jsonAPIWithDictionary:json];
+
+ArticleResource *article = jsonAPI.resource;
+NSLog(@"Title: %@", article.title);
+```
+
+For some full examples on how to use everything, please see the tests - https://github.com/joshdholtz/jsonapi-ios/blob/master/Project/JSONAPITests/JSONAPITests.m
+
 ### Updates
 
 Version | Changes
 --- | ---
+ **1.0.5** | Fix 1-to-many relationships serialization according to JSON API v1.0 (https://github.com/joshdholtz/jsonapi-ios/pull/34). Thanks to [RafaelKayumov](https://github.com/RafaelKayumov) for helping!
  **1.0.4** | Add support for empty to-one relationship according to JSON API v1.0 (https://github.com/joshdholtz/jsonapi-ios/pull/33). Thanks to [RafaelKayumov](https://github.com/RafaelKayumov) for helping!
 **1.0.3** | Add ability to map different types of objects (https://github.com/joshdholtz/jsonapi-ios/pull/32). Thanks to [ealeksandrov](https://github.com/ealeksandrov) for helping!
 **1.0.2** | Just some bug fixes. Thanks to [christianklotz](https://github.com/christianklotz) for helping again!
@@ -38,6 +50,7 @@ it simply add the following line to your Podfile:
     pod 'JSONAPI', '~> 1.0.0'
 
 ## Usage
+For some full examples on how to use everything, please see the tests - https://github.com/joshdholtz/jsonapi-ios/blob/master/Project/JSONAPITests/JSONAPITests.m
 
 ### JSONAPI
 `JSONAPI` parses and validates a JSON API document into a usable object. This object holds the response as an NSDictionary but provides methods to accomdate the JSON API format such as `meta`, `errors`, `linked`, `resources`, and `includedResources`.