jsonapi-resources 0.2.0 → 0.3.0.pre1

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.2.0"
+    VERSION = "0.3.0.pre1"
   end
 end

data/lib/jsonapi/routing_ext.rb

@@ -102,7 +102,7 @@ module ActionDispatch
 
           if methods.include?(:update)
             match "links/#{formatted_association_name}", controller: res._type.to_s,
-                  action: 'update_association', association: link_type.to_s, via: [:put]
+                  action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
@@ -132,7 +132,7 @@ module ActionDispatch
 
           if methods.include?(:update) && res._association(link_type).acts_as_set
             match "links/#{formatted_association_name}", controller: res._type.to_s,
-                  action: 'update_association', association: link_type.to_s, via: [:put]
+                  action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
@@ -148,7 +148,7 @@ module ActionDispatch
           association = source._associations[association_name]
 
           formatted_association_name = format_route(association.name)
-          related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.name.pluralize))
+          related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore.pluralize))
 
           match "#{formatted_association_name}", controller: related_resource._type.to_s,
                 association: association.name, source: resource_type_with_module_prefix(source._type),
@@ -162,7 +162,7 @@ module ActionDispatch
           association = source._associations[association_name]
 
           formatted_association_name = format_route(association.name)
-          related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.name))
+          related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore))
 
           match "#{formatted_association_name}", controller: related_resource._type.to_s,
                 association: association.name, source: resource_type_with_module_prefix(source._type),

data/test/config/database.yml

@@ -1,5 +1,6 @@
 test:
   adapter: sqlite3
-  database: ":memory:"
+  database: "test_db"
+#  database: ":memory:"
   pool: 5
   timeout: 5000

data/test/controllers/controller_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../../test_helper', __FILE__)
-require File.expand_path('../../fixtures/active_record', __FILE__)
 
 def set_content_type_header!
   @request.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
@@ -44,18 +43,18 @@ class PostsControllerTest < ActionController::TestCase
     get :index, {filter: {id: '2'}, include: 'comments'}
     assert_response :success
     assert_equal 1, json_response['data'].size
-    assert_equal 1, json_response['linked'].size
+    assert_equal 1, json_response['included'].size
   end
 
   def test_index_filter_by_ids_and_include_related_different_type
     get :index, {filter: {id: '1,2'}, include: 'author'}
     assert_response :success
     assert_equal 2, json_response['data'].size
-    assert_equal 1, json_response['linked'].size
+    assert_equal 1, json_response['included'].size
   end
 
   def test_index_filter_by_ids_and_fields
-    get :index, {filter: {id: '1,2'}, 'fields' => 'id,title,author'}
+    get :index, {filter: {id: '1,2'}, fields: {posts: 'id,title,author'}}
     assert_response :success
     assert_equal 2, json_response['data'].size
 
@@ -87,7 +86,7 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   def test_index_filter_by_ids_and_fields_2
-    get :index, {filter: {id: '1,2'}, 'fields' => 'author'}
+    get :index, {filter: {id: '1,2'}, fields: {posts: 'author'}}
     assert_response :success
     assert_equal 2, json_response['data'].size
 
@@ -150,12 +149,6 @@ class PostsControllerTest < ActionController::TestCase
     assert_match /5412333 could not be found/, json_response['errors'][0]['detail']
   end
 
-  def test_index_malformed_fields
-    get :index, {filter: {id: '1,2'}, 'fields' => 'posts'}
-    assert_response :bad_request
-    assert_match /posts is not a valid field for posts./, json_response['errors'][0]['detail']
-  end
-
   def test_field_not_supported
     get :index, {filter: {id: '1,2'}, 'fields' => {'posts' => 'id,title,rank,author'}}
     assert_response :bad_request
@@ -178,7 +171,7 @@ class PostsControllerTest < ActionController::TestCase
     get :index, {sort: '+title'}
 
     assert_response :success
-    assert_equal "Delete This Later - Multiple2-1", json_response['data'][0]['title']
+    assert_equal "A First Post", json_response['data'][0]['title']
   end
 
   def test_sorting_desc
@@ -192,7 +185,7 @@ class PostsControllerTest < ActionController::TestCase
     get :index, {sort: '+title,+body'}
 
     assert_response :success
-    assert_equal '8', json_response['data'][0]['id']
+    assert_equal '14', json_response['data'][0]['id']
   end
 
   def test_invalid_sort_param
@@ -216,19 +209,13 @@ class PostsControllerTest < ActionController::TestCase
     assert_match /id is not a valid sort criteria for post/, response.body
   end
 
-  # ToDo: test validating the parameter values
-  # def test_index_invalid_filter_value
-  #   get :index, {ids: [1,'asdfg1']}
-  #   assert_response :bad_request
-  # end
-
   def test_show_single
     get :show, {id: '1'}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
     assert_equal 'New post', json_response['data']['title']
     assert_equal 'A body!!!', json_response['data']['body']
-    assert_nil json_response['linked']
+    assert_nil json_response['included']
   end
 
   def test_show_single_with_includes
@@ -237,18 +224,25 @@ class PostsControllerTest < ActionController::TestCase
     assert json_response['data'].is_a?(Hash)
     assert_equal 'New post', json_response['data']['title']
     assert_equal 'A body!!!', json_response['data']['body']
-    assert_nil json_response['data']['links']['tags']['ids']
-    assert_equal ['1', '2'], json_response['data']['links']['comments']['ids']
-    assert_equal 2, json_response['linked'].size
+    assert_nil json_response['data']['links']['tags']['linkage']
+    assert matches_array?([{'type' => 'comments', 'id' => '1'}, {'type' => 'comments', 'id' => '2'}],
+                          json_response['data']['links']['comments']['linkage'])
+    assert_equal 2, json_response['included'].size
   end
 
   def test_show_single_with_fields
-    get :show, {id: '1', fields: 'author'}
+    get :show, {id: '1', fields: {posts: 'author'}}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
     assert_nil json_response['data']['title']
     assert_nil json_response['data']['body']
-    assert_equal '1', json_response['data']['links']['author']['id']
+    assert_equal '1', json_response['data']['links']['author']['linkage']['id']
+  end
+
+  def test_show_single_with_fields_string
+    get :show, {id: '1', fields: 'author'}
+    assert_response :bad_request
+    assert_match /Fields must specify a type./, json_response['errors'][0]['detail']
   end
 
   def test_show_single_invalid_id_format
@@ -266,7 +260,7 @@ class PostsControllerTest < ActionController::TestCase
   def test_show_malformed_fields_not_list
     get :show, {id: '1', 'fields' => ''}
     assert_response :bad_request
-    assert_match /nil is not a valid field for posts./, json_response['errors'][0]['detail']
+    assert_match /Fields must specify a type./, json_response['errors'][0]['detail']
   end
 
   def test_show_malformed_fields_type_not_list
@@ -291,7 +285,7 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
     assert_equal 'JR is Great', json_response['data']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['body']
   end
@@ -386,7 +380,7 @@ class PostsControllerTest < ActionController::TestCase
     assert_response :created
     assert json_response['data'].is_a?(Array)
     assert_equal json_response['data'].size, 2
-    assert_equal json_response['data'][0]['links']['author']['id'], '3'
+    assert_equal json_response['data'][0]['links']['author']['linkage']['id'], '3'
     assert_match /JR is Great/, response.body
     assert_match /Ember is Great/, response.body
   end
@@ -500,14 +494,14 @@ class PostsControllerTest < ActionController::TestCase
              body: 'JSONAPIResources is the greatest thing since unsliced bread.',
              links: {
                author: {type: 'people', id: '3'},
-               tags: {type: 'tags', ids: [3, 4]}
+               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
              }
            }
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
     assert_equal 'JR is Great', json_response['data']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['body']
   end
@@ -529,7 +523,7 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
     assert_equal 'JR is Great', json_response['data']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['body']
   end
@@ -544,18 +538,18 @@ class PostsControllerTest < ActionController::TestCase
              body: 'JSONAPIResources is the greatest thing since unsliced bread!',
              links: {
                author: {type: 'people', id: '3'},
-               tags: {type: 'tags', ids: [3, 4]}
+               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
              }
            },
            include: 'author,author.posts',
-           fields: 'id,title,author'
+           fields: {posts: 'id,title,author'}
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
     assert_equal 'JR is Great!', json_response['data']['title']
-    assert_not_nil json_response['linked'].size
+    assert_not_nil json_response['included'].size
   end
 
   def test_update_with_links
@@ -571,7 +565,7 @@ class PostsControllerTest < ActionController::TestCase
             title: 'A great new Post',
             links: {
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           },
           include: 'tags'
@@ -579,11 +573,12 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
-    assert_equal javascript.id.to_s, json_response['data']['links']['section']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
+    assert_equal javascript.id.to_s, json_response['data']['links']['section']['linkage']['id']
     assert_equal 'A great new Post', json_response['data']['title']
     assert_equal 'AAAA', json_response['data']['body']
-    assert matches_array?(['3', '4'], json_response['data']['links']['tags']['ids'])
+    assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
+                          json_response['data']['links']['tags']['linkage'])
   end
 
   def test_update_remove_links
@@ -605,29 +600,30 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['id']
-    assert_equal nil, json_response['data']['links']['section']['id']
+    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
+    assert_equal nil, json_response['data']['links']['section']['linkage']['id']
     assert_equal 'A great new Post', json_response['data']['title']
     assert_equal 'AAAA', json_response['data']['body']
-    assert matches_array?([], json_response['data']['links']['tags']['ids'])
+    assert matches_array?([],
+                          json_response['data']['links']['tags']['linkage'])
   end
 
   def test_update_relationship_has_one
     set_content_type_header!
     ruby = Section.find_by(name: 'ruby')
-    post_object = Post.find(3)
+    post_object = Post.find(4)
     assert_not_equal ruby.id, post_object.section_id
 
-    put :update_association, {post_id: 3, association: 'section', data: {type: 'sections', id: "#{ruby.id}"}}
+    put :update_association, {post_id: 4, association: 'section', data: {type: 'sections', id: "#{ruby.id}"}}
 
     assert_response :no_content
-    post_object = Post.find(3)
+    post_object = Post.find(4)
     assert_equal ruby.id, post_object.section_id
   end
 
   def test_update_relationship_has_one_invalid_links_hash_keys_ids
     set_content_type_header!
-    put :update_association, {post_id: 3, association: 'section', data: {types: 'sections', ids: 'foo'}}
+    put :update_association, {post_id: 3, association: 'section', data: {type: 'sections', ids: 'foo'}}
 
     assert_response :bad_request
     assert_match /Invalid Links Object/, response.body
@@ -635,7 +631,15 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_update_relationship_has_one_invalid_links_hash_count
     set_content_type_header!
-    put :update_association, {post_id: 3, association: 'section', data: {types: 'sections'}}
+    put :update_association, {post_id: 3, association: 'section', data: {type: 'sections'}}
+
+    assert_response :bad_request
+    assert_match /Invalid Links Object/, response.body
+  end
+
+  def test_update_relationship_has_many_not_array
+    set_content_type_header!
+    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', id: 2}}
 
     assert_response :bad_request
     assert_match /Invalid Links Object/, response.body
@@ -707,14 +711,26 @@ class PostsControllerTest < ActionController::TestCase
     set_content_type_header!
     ruby = Section.find_by(name: 'ruby')
     post_object = Post.find(3)
-    post_object.section_id = ruby.id
+    post_object.section = ruby
     post_object.save!
 
     put :update_association, {post_id: 3, association: 'section', data: {type: 'sections', id: nil}}
 
     assert_response :no_content
+    assert_equal nil, post_object.reload.section_id
+  end
+
+  def test_update_relationship_has_one_data_nil
+    set_content_type_header!
+    ruby = Section.find_by(name: 'ruby')
     post_object = Post.find(3)
-    assert_equal nil, post_object.section_id
+    post_object.section = ruby
+    post_object.save!
+
+    put :update_association, {post_id: 3, association: 'section', data: nil}
+
+    assert_response :no_content
+    assert_equal nil, post_object.reload.section_id
   end
 
   def test_remove_relationship_has_one
@@ -747,19 +763,19 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_update_relationship_has_many_join_table_single
     set_content_type_header!
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: []}}
+    put :update_association, {post_id: 3, association: 'tags', data: []}
     assert_response :no_content
 
     post_object = Post.find(3)
     assert_equal 0, post_object.tags.length
 
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [2]}}
+    put :update_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 2}]}
 
     assert_response :no_content
     post_object = Post.find(3)
     assert_equal 1, post_object.tags.length
 
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [5]}}
+    put :update_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 5}]}
 
     assert_response :no_content
     post_object = Post.find(3)
@@ -768,17 +784,7 @@ class PostsControllerTest < ActionController::TestCase
     assert matches_array? [5], tags
   end
 
-  def test_update_relationship_has_many_join_table_homogenous
-    set_content_type_header!
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [2, 3]}}
-
-    assert_response :no_content
-    post_object = Post.find(3)
-    assert_equal 2, post_object.tags.collect { |tag| tag.id }.length
-    assert matches_array? [2, 3], post_object.tags.collect { |tag| tag.id }
-  end
-
-  def test_update_relationship_has_many_join_table_heterogenous
+  def test_update_relationship_has_many
     set_content_type_header!
     put :update_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
 
@@ -790,14 +796,14 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_create_relationship_has_many_join_table
     set_content_type_header!
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [2, 3]}}
+    put :update_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
 
     assert_response :no_content
     post_object = Post.find(3)
     assert_equal 2, post_object.tags.collect { |tag| tag.id }.length
     assert matches_array? [2, 3], post_object.tags.collect { |tag| tag.id }
 
-    post :create_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [5]}}
+    post :create_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 5}]}
 
     assert_response :no_content
     post_object = Post.find(3)
@@ -807,7 +813,7 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_create_relationship_has_many_mismatched_type
     set_content_type_header!
-    post :create_association, {post_id: 3, association: 'tags', data: {type: 'comments', ids: [5]}}
+    post :create_association, {post_id: 3, association: 'tags', data: [{type: 'comments', id: 5}]}
 
     assert_response :bad_request
     assert_match /Type Mismatch/, response.body
@@ -815,10 +821,18 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_create_relationship_has_many_missing_id
     set_content_type_header!
-    post :create_association, {post_id: 3, association: 'tags', data: {type: 'tags', idds: [5]}}
+    post :create_association, {post_id: 3, association: 'tags', data: [{type: 'tags', idd: 5}]}
 
     assert_response :bad_request
-    assert_match /The required parameter, ids, is missing/, response.body
+    assert_match /Data is not a valid Links Object./, response.body
+  end
+
+  def test_create_relationship_has_many_not_array
+    set_content_type_header!
+    post :create_association, {post_id: 3, association: 'tags', data: {type: 'tags', id: 5}}
+
+    assert_response :bad_request
+    assert_match /Data is not a valid Links Object./, response.body
   end
 
   def test_create_relationship_has_many_missing_data
@@ -831,20 +845,20 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_create_relationship_has_many_join
     set_content_type_header!
-    post :create_association, {post_id: 4, association: 'tags', data: {type: 'tags', ids: [1, 2, 3]}}
+    post :create_association, {post_id: 4, association: 'tags', data: [{type: 'tags', id: 1}, {type: 'tags', id: 2}, {type: 'tags', id: 3}]}
     assert_response :no_content
   end
 
   def test_create_relationship_has_many_join_table_record_exists
     set_content_type_header!
-    put :update_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [2, 3]}}
+    put :update_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
 
     assert_response :no_content
     post_object = Post.find(3)
     assert_equal 2, post_object.tags.collect { |tag| tag.id }.length
     assert matches_array? [2, 3], post_object.tags.collect { |tag| tag.id }
 
-    post :create_association, {post_id: 3, association: 'tags', data: {type: 'tags', ids: [5, 2]}}
+    post :create_association, {post_id: 3, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 5}]}
 
     assert_response :bad_request
     assert_match /The relation to 2 already exists./, response.body
@@ -860,12 +874,12 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_delete_relationship_has_many
     set_content_type_header!
-    put :update_association, {post_id: 9, association: 'tags', data: {type: 'tags', ids: [2, 3]}}
+    put :update_association, {post_id: 14, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
     assert_response :no_content
-    p = Post.find(9)
+    p = Post.find(14)
     assert_equal [2, 3], p.tag_ids
 
-    delete :destroy_association, {post_id: 9, association: 'tags', keys: '3'}
+    delete :destroy_association, {post_id: 14, association: 'tags', keys: '3'}
 
     p.reload
     assert_response :no_content
@@ -874,18 +888,32 @@ class PostsControllerTest < ActionController::TestCase
 
   def test_delete_relationship_has_many_does_not_exist
     set_content_type_header!
-    put :update_association, {post_id: 9, association: 'tags', data: {type: 'tags', ids: [2, 3]}}
+    put :update_association, {post_id: 14, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
     assert_response :no_content
-    p = Post.find(9)
+    p = Post.find(14)
     assert_equal [2, 3], p.tag_ids
 
-    delete :destroy_association, {post_id: 9, association: 'tags', keys: '4'}
+    delete :destroy_association, {post_id: 14, association: 'tags', keys: '4'}
 
     p.reload
     assert_response :not_found
     assert_equal [2, 3], p.tag_ids
   end
 
+  def test_delete_relationship_has_many_with_empty_data
+    set_content_type_header!
+    put :update_association, {post_id: 14, association: 'tags', data: [{type: 'tags', id: 2}, {type: 'tags', id: 3}]}
+    assert_response :no_content
+    p = Post.find(14)
+    assert_equal [2, 3], p.tag_ids
+
+    put :update_association, {post_id: 14, association: 'tags', data: [] }
+
+    p.reload
+    assert_response :no_content
+    assert_equal [], p.tag_ids
+  end
+
   def test_update_mismatched_keys
     set_content_type_header!
     javascript = Section.find_by(name: 'javascript')
@@ -899,7 +927,7 @@ class PostsControllerTest < ActionController::TestCase
             title: 'A great new Post',
             links: {
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -922,7 +950,7 @@ class PostsControllerTest < ActionController::TestCase
             title: 'A great new Post',
             links: {
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -945,7 +973,7 @@ class PostsControllerTest < ActionController::TestCase
             links: {
               asdfg: 'aaaa',
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -966,7 +994,7 @@ class PostsControllerTest < ActionController::TestCase
             title: 'A great new Post',
             links: {
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -1004,7 +1032,7 @@ class PostsControllerTest < ActionController::TestCase
             title: 'A great new Post',
             links: {
               section: {type: 'sections', id: "#{javascript.id}"},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -1019,7 +1047,7 @@ class PostsControllerTest < ActionController::TestCase
 
     put :update,
         {
-          id: [3, 9],
+          id: [3, 16],
           data: [
             {
               type: 'posts',
@@ -1027,16 +1055,16 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post QWERTY',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             },
             {
               type: 'posts',
-              id: 9,
+              id: 16,
               title: 'A great new Post ASDFG',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             }
           ],
@@ -1045,17 +1073,19 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_equal json_response['data'].size, 2
-    assert_equal json_response['data'][0]['links']['author']['id'], '3'
-    assert_equal json_response['data'][0]['links']['section']['id'], javascript.id.to_s
+    assert_equal json_response['data'][0]['links']['author']['linkage']['id'], '3'
+    assert_equal json_response['data'][0]['links']['section']['linkage']['id'], javascript.id.to_s
     assert_equal json_response['data'][0]['title'], 'A great new Post QWERTY'
     assert_equal json_response['data'][0]['body'], 'AAAA'
-    assert_equal json_response['data'][0]['links']['tags']['ids'], ['3', '4']
+    assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
+                          json_response['data'][0]['links']['tags']['linkage'])
 
-    assert_equal json_response['data'][1]['links']['author']['id'], '3'
-    assert_equal json_response['data'][1]['links']['section']['id'], javascript.id.to_s
+    assert_equal json_response['data'][1]['links']['author']['linkage']['id'], '3'
+    assert_equal json_response['data'][1]['links']['section']['linkage']['id'], javascript.id.to_s
     assert_equal json_response['data'][1]['title'], 'A great new Post ASDFG'
-    assert_equal json_response['data'][1]['body'], 'AAAA'
-    assert_equal json_response['data'][1]['links']['tags']['ids'], ['3', '4']
+    assert_equal json_response['data'][1]['body'], 'Not First!!!!'
+    assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
+                          json_response['data'][1]['links']['tags']['linkage'])
   end
 
   def test_update_multiple_missing_keys
@@ -1071,7 +1101,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post ASDFG',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             },
             {
@@ -1079,7 +1109,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post QWERTY',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             }
           ]}
@@ -1102,7 +1132,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post ASDFG',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             },
             {
@@ -1111,7 +1141,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post QWERTY',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             }
           ]}
@@ -1134,7 +1164,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post QWERTY',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             },
             {
@@ -1143,7 +1173,7 @@ class PostsControllerTest < ActionController::TestCase
               title: 'A great new Post ASDFG',
               links: {
                 section: {type: 'sections', id: "#{javascript.id}"},
-                tags: {type: 'tags', ids: [3, 4]}
+                tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             }
           ]}
@@ -1163,7 +1193,7 @@ class PostsControllerTest < ActionController::TestCase
             subject: 'A great new Post',
             links: {
               author: {type: 'people', id: '1'},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -1183,7 +1213,7 @@ class PostsControllerTest < ActionController::TestCase
             subject: 'A great new Post',
             linked_objects: {
               author: {type: 'people', id: '1'},
-              tags: {type: 'tags', ids: [3, 4]}
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
           }
         }
@@ -1224,26 +1254,36 @@ class PostsControllerTest < ActionController::TestCase
     assert_response :success
     assert_hash_equals json_response,
                        {data: {
-                           type: 'people',
-                           id: '1',
-                           self: 'http://test.host/posts/1/links/author',
-                           resource: 'http://test.host/posts/1/author'
-                         }
+                          type: 'people',
+                          id: '1'
+                        },
+                        links: {
+                          self: 'http://test.host/posts/1/links/author',
+                          related: 'http://test.host/posts/1/author'
+                        }
                        }
   end
 
   def test_show_has_many_relationship
-    get :show_association, {post_id: '1', association: 'tags'}
+    get :show_association, {post_id: '2', association: 'tags'}
     assert_response :success
     assert_hash_equals json_response,
-                       {data: {
-                           type: 'tags',
-                           ids: ['1', '2', '3'],
-                           self: 'http://test.host/posts/1/links/tags',
-                           resource: 'http://test.host/posts/1/tags'
+                       {
+                         data: [
+                           {type: 'tags', id: '5'}
+                         ],
+                         links: {
+                           self: 'http://test.host/posts/2/links/tags',
+                           related: 'http://test.host/posts/2/tags'
                          }
                        }
   end
+
+  def test_show_has_many_relationship_invalid_id
+    get :show_association, {post_id: '2,1', association: 'tags'}
+    assert_response :bad_request
+    assert_match /2,1 is not a valid value for id/, response.body
+  end
 end
 
 class TagsControllerTest < ActionController::TestCase
@@ -1251,33 +1291,36 @@ class TagsControllerTest < ActionController::TestCase
     get :index, {filter: {id: '6,7,8,9'}, include: 'posts,posts.tags,posts.author.posts'}
     assert_response :success
     assert_equal 4, json_response['data'].size
-    assert_equal 2, json_response['linked'].size
+    assert_equal 2, json_response['included'].size
   end
 
   def test_tags_show_multiple
     get :show, {id: '6,7,8,9'}
-    assert_response :success
-    assert json_response['data'].is_a?(Array)
-    assert_equal 4, json_response['data'].size
+    assert_response :bad_request
+    assert_match /6,7,8,9 is not a valid value for id/, response.body
   end
 
   def test_tags_show_multiple_with_include
     get :show, {id: '6,7,8,9', include: 'posts,posts.tags,posts.author.posts'}
-    assert_response :success
-    assert json_response['data'].is_a?(Array)
-    assert_equal 4, json_response['data'].size
-    assert_equal 2, json_response['linked'].size
+    assert_response :bad_request
+    assert_match /6,7,8,9 is not a valid value for id/, response.body
   end
 
   def test_tags_show_multiple_with_nonexistent_ids
     get :show, {id: '6,99,9,100'}
-    assert_response :not_found
-    assert_match /The record identified by 99 could not be found./, json_response['errors'][0]['detail']
+    assert_response :bad_request
+    assert_match /6,99,9,100 is not a valid value for id/, response.body
+  end
+
+  def test_tags_show_multiple_with_nonexistent_ids_at_the_beginning
+    get :show, {id: '99,9,100'}
+    assert_response :bad_request
+    assert_match /99,9,100 is not a valid value for id/, response.body
   end
 end
 
 class ExpenseEntriesControllerTest < ActionController::TestCase
-  def after_teardown
+  def setup
     JSONAPI.configuration.json_key_format = :camelized_key
   end
 
@@ -1298,7 +1341,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
     get :show, {id: 1, include: 'isoCurrency,employee'}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert_equal 2, json_response['linked'].size
+    assert_equal 2, json_response['included'].size
   end
 
   def test_expense_entries_show_bad_include_missing_association
@@ -1315,18 +1358,11 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
   end
 
   def test_expense_entries_show_fields
-    get :show, {id: 1, include: 'isoCurrency,employee', 'fields' => 'transactionDate'}
-    assert_response :success
-    assert json_response['data'].is_a?(Hash)
-    assert json_response['data'].has_key?('transactionDate')
-  end
-
-  def test_expense_entries_show_fields_type
     get :show, {id: 1, include: 'isoCurrency,employee', 'fields' => {'expenseEntries' => 'transactionDate'}}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
     assert json_response['data'].has_key?('transactionDate')
-    assert_equal 2, json_response['linked'].size
+    assert_equal 2, json_response['included'].size
   end
 
   def test_expense_entries_show_fields_type_many
@@ -1335,7 +1371,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
     assert_response :success
     assert json_response['data'].is_a?(Hash)
     assert json_response['data'].has_key?('transactionDate')
-    assert_equal 2, json_response['linked'].size
+    assert_equal 2, json_response['included'].size
   end
 
   def test_create_expense_entries_underscored
@@ -1354,14 +1390,14 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
              }
            },
            include: 'iso_currency',
-           fields: 'id,transaction_date,iso_currency,cost,employee'
+           fields: {expense_entries: 'id,transaction_date,iso_currency,cost,employee'}
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['employee']['id']
-    assert_equal 'USD', json_response['data']['links']['iso_currency']['id']
-    assert_equal 50.58, json_response['data']['cost']
+    assert_equal '3', json_response['data']['links']['employee']['linkage']['id']
+    assert_equal 'USD', json_response['data']['links']['iso_currency']['linkage']['id']
+    assert_equal '50.58', json_response['data']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1383,14 +1419,14 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
              }
            },
            include: 'isoCurrency',
-           fields: 'id,transactionDate,isoCurrency,cost,employee'
+           fields: {expenseEntries: 'id,transactionDate,isoCurrency,cost,employee'}
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['employee']['id']
-    assert_equal 'USD', json_response['data']['links']['isoCurrency']['id']
-    assert_equal 50.58, json_response['data']['cost']
+    assert_equal '3', json_response['data']['links']['employee']['linkage']['id']
+    assert_equal 'USD', json_response['data']['links']['isoCurrency']['linkage']['id']
+    assert_equal '50.58', json_response['data']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1412,14 +1448,14 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
              }
            },
            include: 'iso-currency',
-           fields: 'id,transaction-date,iso-currency,cost,employee'
+           fields: {'expense-entries' => 'id,transaction-date,iso-currency,cost,employee'}
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['employee']['id']
-    assert_equal 'USD', json_response['data']['links']['iso-currency']['id']
-    assert_equal 50.58, json_response['data']['cost']
+    assert_equal '3', json_response['data']['links']['employee']['linkage']['id']
+    assert_equal 'USD', json_response['data']['links']['iso-currency']['linkage']['id']
+    assert_equal '50.58', json_response['data']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1517,6 +1553,10 @@ class IsoCurrenciesControllerTest < ActionController::TestCase
 end
 
 class PeopleControllerTest < ActionController::TestCase
+  def setup
+    JSONAPI.configuration.json_key_format = :camelized_key
+  end
+
   def test_create_validations
     set_content_type_header!
     post :create,
@@ -1589,7 +1629,7 @@ class PeopleControllerTest < ActionController::TestCase
   end
 end
 
-class AuthorsControllerTest < ActionController::TestCase
+class Api::V5::AuthorsControllerTest < ActionController::TestCase
   def test_get_person_as_author
     get :index, {filter: {id: '1'}}
     assert_response :success
@@ -1629,13 +1669,9 @@ class BreedsControllerTest < ActionController::TestCase
 
   def test_poro_show_multiple
     get :show, {id: '0,2'}
-    assert_response :success
-    assert json_response['data'].is_a?(Array)
-    assert_equal 2, json_response['data'].size
-    assert_equal '0', json_response['data'][0]['id']
-    assert_equal 'Persian', json_response['data'][0]['name']
-    assert_equal '2', json_response['data'][1]['id']
-    assert_equal 'Sphinx', json_response['data'][1]['name']
+
+    assert_response :bad_request
+    assert_match /0,2 is not a valid value for id/, response.body
   end
 
   def test_poro_create_simple
@@ -1707,11 +1743,11 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
   def test_show_post_namespaced_include
     get :show, {id: '1', include: 'writer'}
     assert_response :success
-    assert_equal '1', json_response['data']['links']['writer']['id']
+    assert_equal '1', json_response['data']['links']['writer']['linkage']['id']
     assert_nil json_response['data']['links']['tags']
-    assert_equal '1', json_response['linked'][0]['id']
-    assert_equal 'writers', json_response['linked'][0]['type']
-    assert_equal 'joe@xyz.fake', json_response['linked'][0]['email']
+    assert_equal '1', json_response['included'][0]['id']
+    assert_equal 'writers', json_response['included'][0]['type']
+    assert_equal 'joe@xyz.fake', json_response['included'][0]['email']
   end
 
   def test_index_filter_on_association_namespaced
@@ -1743,7 +1779,7 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['writer']['id']
+    assert_equal '3', json_response['data']['links']['writer']['linkage']['id']
     assert_equal 'JR - now with Namespacing', json_response['data']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread now that it has namespaced resources.',
                  json_response['data']['body']
@@ -1752,6 +1788,10 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
 end
 
 class FactsControllerTest < ActionController::TestCase
+  def setup
+    JSONAPI.configuration.json_key_format = :camelized_key
+  end
+
   def test_type_formatting
     get :show, {id: '1'}
     assert_response :success
@@ -1759,8 +1799,8 @@ class FactsControllerTest < ActionController::TestCase
     assert_equal 'Jane Author', json_response['data']['spouseName']
     assert_equal 'First man to run across Antartica.', json_response['data']['bio']
     assert_equal 23.89/45.6, json_response['data']['qualityRating']
-    assert_equal 47000.56, json_response['data']['salary']
-    assert_equal '2013-08-07T20:25:00.000Z', json_response['data']['dateTimeJoined']
+    assert_equal '47000.56', json_response['data']['salary']
+    assert_equal '2013-08-07T20:25:00Z', json_response['data']['dateTimeJoined']
     assert_equal '1965-06-30', json_response['data']['birthday']
     assert_equal '2000-01-01T20:00:00Z', json_response['data']['bedtime']
     assert_equal 'abc', json_response['data']['photo']