Merge pull request #154 from cerebris/pr/150

Pr/150

Author: dgeb

lib/jsonapi/resource_serializer.rb

@@ -110,6 +110,8 @@ def process_primary(source, requested_associations)
           add_included_object(@primary_class_name, id, object_hash(resource,  requested_associations), true)
         end
       else
+        return {} if source.nil?
+
         resource = source
         id = resource.id
         # ToDo: See if this is actually needed

test/controllers/controller_test.rb

@@ -1335,6 +1335,19 @@ def test_show_has_many_relationship_invalid_id
     assert_response :bad_request
     assert_match /2,1 is not a valid value for id/, response.body
   end
+
+  def test_show_has_one_relationship_nil
+    get :show_association, {post_id: '17', association: 'author'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: nil,
+                         links: {
+                           self: 'http://test.host/posts/17/links/author',
+                           related: 'http://test.host/posts/17/author'
+                         }
+                       }
+  end
 end
 
 class TagsControllerTest < ActionController::TestCase
@@ -1678,6 +1691,50 @@ def test_valid_filter_value
     assert_equal json_response['data'][0]['id'], '1'
     assert_equal json_response['data'][0]['name'], 'Joe Author'
   end
+
+  def test_get_related_resource
+    get :get_related_resource, {post_id: '2', association: 'author', :source=>'posts'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: {
+                           id: '1',
+                           type: 'people',
+                           name: 'Joe Author',
+                           email: 'joe@xyz.fake',
+                           dateJoined: '2013-08-07 16:25:00 -0400',
+                           links: {
+                             self: 'http://test.host/people/1',
+                             comments: {
+                               self: 'http://test.host/people/1/links/comments',
+                               related: 'http://test.host/people/1/comments'
+                             },
+                             posts: {
+                               self: 'http://test.host/people/1/links/posts',
+                               related: 'http://test.host/people/1/posts'
+                             },
+                             preferences: {
+                               self: 'http://test.host/people/1/links/preferences',
+                               related: 'http://test.host/people/1/preferences',
+                               linkage: {
+                                 type: 'preferences',
+                                 id: '1'
+                               }
+                             }
+                           }
+                         }
+                       }
+  end
+
+  def test_get_related_resource_nil
+    get :get_related_resource, {post_id: '17', association: 'author', :source=>'posts'}
+    assert_response :success
+    assert_hash_equals json_response,
+                       {
+                         data: nil
+                       }
+
+  end
 end
 
 class Api::V5::AuthorsControllerTest < ActionController::TestCase

test/fixtures/posts.yml

@@ -93,4 +93,10 @@ post_16:
   id: 16
   title: SDFGH
   body: Not First!!!!
-  author_id: 3
+  author_id: 3
+
+post_17:
+  id: 17
+  title: No Author!!!!!!
+  body: This post has no Author
+  author_id:

test/test_helper.rb

@@ -27,6 +27,7 @@
 puts "Testing With RAILS VERSION #{Rails.version}"
 
 class TestApp < Rails::Application
+  config.eager_load = false
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'session'
   config.secret_key_base = 'secret'

test/unit/serializer/serializer_test.rb

@@ -57,6 +57,15 @@ def test_serializer
     )
   end
 
+  def test_serializer_nil_handling
+    assert_hash_equals(
+      {
+        data: nil
+      },
+      JSONAPI::ResourceSerializer.new(PostResource).serialize_to_hash(nil)
+    )
+  end
+
   def test_serializer_namespaced_resource
     assert_hash_equals(
       {