jsonapi-resources 0.3.3 → 0.4.0

data/test/fixtures/active_record.rb

@@ -3,6 +3,7 @@ require 'jsonapi-resources'
 
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.uncountable 'preferences'
+  inflect.irregular 'numero_telefone', 'numeros_telefone'
 end
 
 ### DATABASE
@@ -156,6 +157,16 @@ ActiveRecord::Schema.define do
   create_table :hair_cuts, force: true do |t|
     t.string :style
   end
+
+  create_table :numeros_telefone, force: true do |t|
+    t.string   :numero_telefone
+    t.timestamps null: false
+  end
+
+  create_table :categories, force: true do |t|
+    t.string :name
+    t.string :status, limit: 10
+  end
 end
 
 ### MODELS
@@ -211,6 +222,16 @@ class Planet < ActiveRecord::Base
   belongs_to :planet_type
 
   has_and_belongs_to_many :tags, join_table: :planets_tags
+
+  # Test model callback cancelling save
+  before_save :check_not_pluto
+
+  def check_not_pluto
+    # Pluto can't be a planet, so cancel the save
+    if name.downcase == 'pluto'
+      return false
+    end
+  end
 end
 
 class PlanetType < ActiveRecord::Base
@@ -242,6 +263,7 @@ class Breed
       @id = id
     end
     @name = name
+    @errors = ActiveModel::Errors.new(self)
   end
 
   attr_accessor :id, :name
@@ -250,7 +272,18 @@ class Breed
     $breed_data.remove(@id)
   end
 
-  def save!
+  def valid?
+    @errors.clear
+    if name.is_a?(String) && name.length > 0
+      return true
+    else
+      @errors.set(:name, ["can't be blank"])
+      return false
+    end
+  end
+
+  def errors
+    @errors
   end
 end
 
@@ -304,6 +337,12 @@ class LineItem < ActiveRecord::Base
   belongs_to :purchase_order
 end
 
+class NumeroTelefone < ActiveRecord::Base
+end
+
+class Category < ActiveRecord::Base
+end
+
 ### PORO Data - don't do this in a production app
 $breed_data = BreedData.new
 $breed_data.add(Breed.new(0, 'persian'))
@@ -311,6 +350,19 @@ $breed_data.add(Breed.new(1, 'siamese'))
 $breed_data.add(Breed.new(2, 'sphinx'))
 $breed_data.add(Breed.new(3, 'to_delete'))
 
+### OperationsProcessor
+class CountingActiveRecordOperationsProcessor < ActiveRecordOperationsProcessor
+  after_find_operation do
+
+    count = @operation.resource_klass.find_count(@operation.resource_klass.verify_filters(@operation.filters, @context),
+                                 context: @context,
+                                 include_directives: @operation.include_directives,
+                                 sort_criteria: @operation.sort_criteria)
+
+    @operation_meta[:total_records] = count
+  end
+end
+
 ### CONTROLLERS
 class AuthorsController < JSONAPI::ResourceController
 end
@@ -318,7 +370,8 @@ end
 class PeopleController < JSONAPI::ResourceController
 end
 
-class PostsController < JSONAPI::ResourceController
+class PostsController < ActionController::Base
+  include JSONAPI::ActsAsResourceController
 end
 
 class CommentsController < JSONAPI::ResourceController
@@ -342,6 +395,9 @@ end
 class FactsController < JSONAPI::ResourceController
 end
 
+class CategoriesController < JSONAPI::ResourceController
+end
+
 ### CONTROLLERS
 module Api
   module V1
@@ -351,7 +407,8 @@ module Api
     class PeopleController < JSONAPI::ResourceController
     end
 
-    class PostsController < JSONAPI::ResourceController
+    class PostsController < ActionController::Base
+      include JSONAPI::ActsAsResourceController
     end
 
     class TagsController < JSONAPI::ResourceController
@@ -459,6 +516,11 @@ module Api
     class OrderFlagsController < JSONAPI::ResourceController
     end
   end
+
+  module V8
+    class NumerosTelefoneController < JSONAPI::ResourceController
+    end
+  end
 end
 
 ### RESOURCES
@@ -492,6 +554,8 @@ class CommentResource < JSONAPI::Resource
   has_one :post
   has_one :author, class_name: 'Person'
   has_many :tags
+
+  filters :body
 end
 
 class TagResource < JSONAPI::Resource
@@ -555,11 +619,11 @@ class PostResource < JSONAPI::Resource
   filters :title, :author, :tags, :comments
   filters :id, :ids
 
-  def self.updateable_fields(context)
+  def self.updatable_fields(context)
     super(context) - [:author, :subject]
   end
 
-  def self.createable_fields(context)
+  def self.creatable_fields(context)
     super(context) - [:subject]
   end
 
@@ -643,6 +707,11 @@ class BreedResource < JSONAPI::Resource
   def self.find_by_key(id, options = {})
     BreedResource.new($breed_data.breeds[id.to_i], options[:context])
   end
+
+  def _save
+    super
+    return :accepted
+  end
 end
 
 class PlanetResource < JSONAPI::Resource
@@ -696,6 +765,10 @@ class FactResource < JSONAPI::Resource
   attribute :cool
 end
 
+class CategoryResource < JSONAPI::Resource
+  filter :status, default: 'active'
+end
+
 module Api
   module V1
     class WriterResource < JSONAPI::Resource
@@ -782,6 +855,10 @@ module Api
     class BookResource < Api::V2::BookResource
       paginator :paged
     end
+
+    class BookCommentResource < Api::V2::BookCommentResource
+      paginator :paged
+    end
   end
 end
 
@@ -866,6 +943,12 @@ module Api
     OrderFlagResource = V6::OrderFlagResource.dup
     LineItemResource = V6::LineItemResource.dup
   end
+
+  module V8
+    class NumeroTelefoneResource < JSONAPI::Resource
+      attribute :numero_telefone
+    end
+  end
 end
 
 warn 'start testing Name Collisions'
@@ -896,10 +979,17 @@ saturn = Planet.create(name: 'Satern',
                        description: 'Saturn is the sixth planet from the Sun and the second largest planet in the Solar System, after Jupiter.',
                        planet_type_id: planetoid.id)
 titan = Moon.create(name:'Titan', description: 'Best known of the Saturn moons.', planet_id: saturn.id)
-pluto = Planet.create(name: 'Pluto', description: 'Pluto is the smallest planet.', planet_type_id: planetoid.id)
+makemake = Planet.create(name: 'Makemake', description: 'A small planetoid in the Kuiperbelt.', planet_type_id: planetoid.id)
 uranus = Planet.create(name: 'Uranus', description: 'Insert adolescent jokes here.', planet_type_id: gas_giant.id)
 jupiter = Planet.create(name: 'Jupiter', description: 'A gas giant.', planet_type_id: gas_giant.id)
 betax = Planet.create(name: 'Beta X', description: 'Newly discovered Planet X', planet_type_id: unknown.id)
 betay = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Y', planet_type_id: unknown.id)
 betaz = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Z', planet_type_id: unknown.id)
 betaw = Planet.create(name: 'Beta W', description: 'Newly discovered Planet W')
+Category.create(name: 'Category A', status: 'active')
+Category.create(name: 'Category B', status: 'active')
+Category.create(name: 'Category C', status: 'active')
+Category.create(name: 'Category D', status: 'inactive')
+Category.create(name: 'Category E', status: 'inactive')
+Category.create(name: 'Category F', status: 'inactive')
+Category.create(name: 'Category G', status: 'inactive')

data/test/fixtures/line_items.yml

@@ -22,4 +22,10 @@ li_4:
   id: 4
   part_number: 5678
   quantity: 2
-  item_cost: 199.99
+  item_cost: 199.99
+
+li_5:
+  id: 5
+  part_number: 5WERT
+  quantity: 1
+  item_cost: 299.98

data/test/fixtures/numeros_telefone.yml

@@ -0,0 +1,3 @@
+info:
+  id: 1
+  numero_telefone: 1-800-555-1212

data/test/fixtures/purchase_orders.yml

@@ -9,3 +9,9 @@ po_2:
   requested_delivery_date:
   delivery_date: nil
   customer_id: 1
+
+po_3:
+  id: 3
+  requested_delivery_date:
+  delivery_date: nil
+  customer_id: 1

data/test/integration/requests/request_test.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
-require File.expand_path('../../../fixtures/active_record', __FILE__)
 
 class RequestTest < ActionDispatch::IntegrationTest
-
   def setup
     JSONAPI.configuration.json_key_format = :underscored_key
     JSONAPI.configuration.route_format = :underscored_route
@@ -18,6 +16,11 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
   end
 
+  def test_get_inflected_resource
+    get '/api/v8/numeros_telefone'
+    assert_equal 200, status
+  end
+
   def test_get_nested_has_one
     get '/posts/1/author'
     assert_equal 200, status
@@ -45,7 +48,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/iso_currencies?filter[country_name]=Canada'
     assert_equal 200, status
     assert_equal 1, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['country_name']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['country_name']
   end
 
   def test_get_camelized_key_filtered
@@ -53,7 +56,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/iso_currencies?filter[countryName]=Canada'
     assert_equal 200, status
     assert_equal 1, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['countryName']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['countryName']
   end
 
   def test_get_camelized_route_and_key_filtered
@@ -61,16 +64,16 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v4/isoCurrencies?filter[countryName]=Canada'
     assert_equal 200, status
     assert_equal 1, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['countryName']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['countryName']
   end
 
   def test_get_camelized_route_and_links
     JSONAPI.configuration.json_key_format = :camelized_key
     JSONAPI.configuration.route_format = :camelized_route
-    get '/api/v4/expenseEntries/1/links/isoCurrency'
+    get '/api/v4/expenseEntries/1/relationships/isoCurrency'
     assert_equal 200, status
     assert_hash_equals({'links' => {
-                         'self' => 'http://www.example.com/api/v4/expenseEntries/1/links/isoCurrency',
+                         'self' => 'http://www.example.com/api/v4/expenseEntries/1/relationships/isoCurrency',
                          'related' => 'http://www.example.com/api/v4/expenseEntries/1/isoCurrency'
                        },
                        'data' => {
@@ -88,7 +91,9 @@ class RequestTest < ActionDispatch::IntegrationTest
               'type' => 'posts',
               'id' => '3',
             },
-            'title' => 'A great new Post',
+            'attributes' => {
+              'title' => 'A great new Post'
+            },
             'links' => {
               'tags' => [
                 {type: 'tags', id: 3},
@@ -107,10 +112,12 @@ class RequestTest < ActionDispatch::IntegrationTest
           'data' => {
             'type' => 'posts',
             'id' => '3',
-            'title' => 'A great new Post',
-            'links' => {
+            'attributes' => {
+              'title' => 'A great new Post'
+            },
+            'relationships' => {
               'tags' => {
-                'linkage' => [
+                'data' => [
                   {type: 'tags', id: 3},
                   {type: 'tags', id: 4}
                 ]
@@ -126,10 +133,12 @@ class RequestTest < ActionDispatch::IntegrationTest
     post '/posts',
       {
         'posts' => {
-          'title' => 'A great new Post',
-          'links' => {
+          'attributes' => {
+            'title' => 'A great new Post'
+          },
+          'relationships' => {
             'tags' => {
-              'linkage' => [
+              'data' => [
                   {type: 'tags', id: 3},
                   {type: 'tags', id: 4}
                 ]
@@ -146,10 +155,12 @@ class RequestTest < ActionDispatch::IntegrationTest
       {
         'data' => {
           'type' => 'posts',
-          'title' => 'A great new Post',
-          'body' => 'JSONAPIResources is the greatest thing since unsliced bread.',
-          'links' => {
-            'author' => {'linkage' => {type: 'people', id: '3'}}
+          'attributes' => {
+            'title' => 'A great new Post',
+            'body' => 'JSONAPIResources is the greatest thing since unsliced bread.'
+          },
+          'relationships' => {
+            'author' => {'data' => {type: 'people', id: '3'}}
           }
         }
       }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -176,9 +187,9 @@ class RequestTest < ActionDispatch::IntegrationTest
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 201, status
-    assert_nil json_response['data']['body']
-    assert_nil json_response['data']['links']['post']['linkage']
-    assert_nil json_response['data']['links']['author']['linkage']
+    assert_nil json_response['data']['attributes']['body']
+    assert_nil json_response['data']['relationships']['post']['data']
+    assert_nil json_response['data']['relationships']['author']['data']
   end
 
   def test_post_single_minimal_invalid
@@ -194,21 +205,21 @@ class RequestTest < ActionDispatch::IntegrationTest
 
   def test_update_association_without_content_type
     ruby = Section.find_by(name: 'ruby')
-    patch '/posts/3/links/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json
+    patch '/posts/3/relationships/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json
 
     assert_equal 415, status
   end
 
   def test_patch_update_association_has_one
     ruby = Section.find_by(name: 'ruby')
-    patch '/posts/3/links/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+    patch '/posts/3/relationships/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 204, status
   end
 
   def test_put_update_association_has_one
     ruby = Section.find_by(name: 'ruby')
-    put '/posts/3/links/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+    put '/posts/3/relationships/section', { 'data' => {type: 'sections', id: ruby.id.to_s }}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 204, status
   end
@@ -217,14 +228,14 @@ class RequestTest < ActionDispatch::IntegrationTest
     # Comments are acts_as_set=false so PUT/PATCH should respond with 403
 
     rogue = Comment.find_by(body: 'Rogue Comment Here')
-    patch '/posts/5/links/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+    patch '/posts/5/relationships/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 403, status
   end
 
   def test_post_update_association_has_many
     rogue = Comment.find_by(body: 'Rogue Comment Here')
-    post '/posts/5/links/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+    post '/posts/5/relationships/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 204, status
   end
@@ -233,7 +244,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     # Comments are acts_as_set=false so PUT/PATCH should respond with 403. Note: JR currently treats PUT and PATCH as equivalent
 
     rogue = Comment.find_by(body: 'Rogue Comment Here')
-    put '/posts/5/links/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+    put '/posts/5/relationships/comments', { 'data' => [{type: 'comments', id: rogue.id.to_s }]}.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 403, status
   end
@@ -254,10 +265,12 @@ class RequestTest < ActionDispatch::IntegrationTest
           'data' => {
             'type' => 'posts',
             'id' => '3',
-            'title' => 'A great new Post',
-            'links' => {
+            'attributes' => {
+              'title' => 'A great new Post'
+            },
+            'relationships' => {
               'tags' => {
-                'linkage' => [
+                'data' => [
                   {type: 'tags', id: 3},
                   {type: 'tags', id: 4}
                 ]
@@ -275,10 +288,12 @@ class RequestTest < ActionDispatch::IntegrationTest
           'data' => {
             'type' => 'posts',
             'id' => '3',
-            'title' => 'A great new Post',
-            'links' => {
+            'attributes' => {
+              'title' => 'A great new Post'
+            },
+            'relationships' => {
               'tags' => {
-                'linkage' => [
+                'data' => [
                   {type: 'tags', id: 3},
                   {type: 'tags', id: 4}
                 ]
@@ -295,9 +310,11 @@ class RequestTest < ActionDispatch::IntegrationTest
       {
        'data' => {
          'type' => 'posts',
-         'title' => 'A great new Post',
-         'links' => {
-           'author' => {'linkage' => {type: 'people', id: '3'}}
+         'attributes' => {
+           'title' => 'A great new Post'
+         },
+         'relationships' => {
+           'author' => {'data' => {type: 'people', id: '3'}}
          }
        }
      }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -328,7 +345,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books'
     assert_equal 200, status
     assert_equal JSONAPI.configuration.default_page_size, json_response['data'].size
-    assert_equal 'Book 0', json_response['data'][0]['title']
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
   end
 
   def test_pagination_offset_style_offset
@@ -336,7 +353,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books?page[offset]=50'
     assert_equal 200, status
     assert_equal JSONAPI.configuration.default_page_size, json_response['data'].size
-    assert_equal 'Book 50', json_response['data'][0]['title']
+    assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
   end
 
   def test_pagination_offset_style_offset_limit
@@ -344,7 +361,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books?page[offset]=50&page[limit]=20'
     assert_equal 200, status
     assert_equal 20, json_response['data'].size
-    assert_equal 'Book 50', json_response['data'][0]['title']
+    assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
   end
 
   def test_pagination_offset_bad_param
@@ -359,7 +376,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
     assert_equal 2, json_response['data'].size
     assert_equal 'http://www.example.com/api/v2/books/1/book_comments',
-                 json_response['data'][1]['links']['book_comments']['related']
+                 json_response['data'][1]['relationships']['book_comments']['links']['related']
   end
 
   def test_pagination_related_resources_data
@@ -368,7 +385,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books/1/book_comments?page[limit]=10'
     assert_equal 200, status
     assert_equal 10, json_response['data'].size
-    assert_equal 'This is comment 9 on book 1.', json_response['data'][9]['body']
+    assert_equal 'This is comment 9 on book 1.', json_response['data'][9]['attributes']['body']
   end
 
   def test_pagination_related_resources_data_includes
@@ -377,7 +394,7 @@ class RequestTest < ActionDispatch::IntegrationTest
     get '/api/v2/books/1/book_comments?page[limit]=10&include=author,book'
     assert_equal 200, status
     assert_equal 10, json_response['data'].size
-    assert_equal 'This is comment 9 on book 1.', json_response['data'][9]['body']
+    assert_equal 'This is comment 9 on book 1.', json_response['data'][9]['attributes']['body']
   end
 
   def test_flow_self
@@ -395,11 +412,11 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
     post_1 = json_response['data'][0]
 
-    get post_1['links']['author']['self']
+    get post_1['relationships']['author']['links']['self']
     assert_equal 200, status
     assert_hash_equals(json_response, {
                                       'links' => {
-                                        'self' => 'http://www.example.com/posts/1/links/author',
+                                        'self' => 'http://www.example.com/posts/1/relationships/author',
                                         'related' => 'http://www.example.com/posts/1/author'
                                       },
                                       'data' => {type: 'people', id: '1'}
@@ -411,12 +428,12 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
     post_1 = json_response['data'][0]
 
-    get post_1['links']['tags']['self']
+    get post_1['relationships']['tags']['links']['self']
     assert_equal 200, status
     assert_hash_equals(json_response,
                        {
                          'links' => {
-                           'self' => 'http://www.example.com/posts/1/links/tags',
+                           'self' => 'http://www.example.com/posts/1/relationships/tags',
                            'related' => 'http://www.example.com/posts/1/tags'
                           },
                           'data' => [
@@ -432,18 +449,18 @@ class RequestTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
     post_1 = json_response['data'][4]
 
-    post post_1['links']['tags']['self'],
+    post post_1['relationships']['tags']['links']['self'],
          {'data' => [{'type' => 'tags', 'id' => '10'}]}.to_json,
          "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
 
     assert_equal 204, status
 
-    get post_1['links']['tags']['self']
+    get post_1['relationships']['tags']['links']['self']
     assert_equal 200, status
     assert_hash_equals(json_response,
                        {
                          'links' => {
-                           'self' => 'http://www.example.com/posts/5/links/tags',
+                           'self' => 'http://www.example.com/posts/5/relationships/tags',
                            'related' => 'http://www.example.com/posts/5/tags'
                          },
                          'data' => [
@@ -499,7 +516,9 @@ class RequestTest < ActionDispatch::IntegrationTest
     post '/api/v6/purchase-orders',
          {
            'data' => {
-             'delivery-name' => 'ASDFG Corp',
+             'attributes' => {
+               'delivery-name' => 'ASDFG Corp'
+             },
              'type' => 'purchase-orders'
            }
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -513,7 +532,9 @@ class RequestTest < ActionDispatch::IntegrationTest
     post '/api/v6/purchase-orders',
          {
            'data' => {
-             'delivery_name' => 'ASDFG Corp',
+             'attributes' => {
+               'delivery_name' => 'ASDFG Corp'
+             },
              'type' => 'purchase_orders'
            }
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -527,7 +548,9 @@ class RequestTest < ActionDispatch::IntegrationTest
     post '/api/v7/purchase_orders',
          {
            'data' => {
-             'delivery-name' => 'ASDFG Corp',
+             'attributes' => {
+               'delivery-name' => 'ASDFG Corp'
+             },
              'type' => 'purchase-orders'
            }
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -541,7 +564,9 @@ class RequestTest < ActionDispatch::IntegrationTest
     post '/api/v6/purchase-orders',
          {
            'data' => {
-             'delivery_name' => 'ASDFG Corp',
+             'attributes' => {
+               'delivery_name' => 'ASDFG Corp'
+             },
              'type' => 'purchase-orders'
            }
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -556,7 +581,9 @@ class RequestTest < ActionDispatch::IntegrationTest
          {
            'data' => {
              'id' => '1',
-             'delivery-name' => 'ASDFG Corp',
+             'attributes' => {
+               'delivery-name' => 'ASDFG Corp'
+             },
              'type' => 'purchase-orders'
            }
          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
@@ -572,10 +599,12 @@ class RequestTest < ActionDispatch::IntegrationTest
             'data' => {
               'id' => '1',
               'type' => 'line-items',
-              'item-cost' => '23.57',
-              'links' => {
+              'attributes' => {
+                'item-cost' => '23.57'
+              },
+              'relationships' => {
                 'purchase-order' => {
-                  'linkage' => {'type' => 'purchase-orders', 'id' => '2'}
+                  'data' => {'type' => 'purchase-orders', 'id' => '2'}
                 }
               }
             }
@@ -592,15 +621,15 @@ class RequestTest < ActionDispatch::IntegrationTest
             'data' => {
               'id' => '2',
               'type' => 'purchase-orders',
-              'links' => {
+              'relationships' => {
                 'line-items' => {
-                  'linkage' => [
+                  'data' => [
                     {'type' => 'line-items', 'id' => '3'},
                     {'type' => 'line-items', 'id' => '4'}
                   ]
                 },
                 'order-flags' => {
-                  'linkage' => [
+                  'data' => [
                     {'type' => 'order-flags', 'id' => '1'},
                     {'type' => 'order-flags', 'id' => '2'}
                   ]
@@ -611,4 +640,44 @@ class RequestTest < ActionDispatch::IntegrationTest
 
     assert_equal 200, status
   end
+
+  def test_post_has_many_link
+    JSONAPI.configuration.route_format = :dasherized_route
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    post '/api/v6/purchase-orders/3/relationships/line-items',
+          {
+            'data' => [
+              {'type' => 'line-items', 'id' => '3'},
+              {'type' => 'line-items', 'id' => '4'}
+            ]
+          }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 204, status
+  end
+
+  def test_patch_has_many_link
+    JSONAPI.configuration.route_format = :dasherized_route
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    patch '/api/v6/purchase-orders/3/relationships/order-flags',
+         {
+           'data' => [
+             {'type' => 'order-flags', 'id' => '1'},
+             {'type' => 'order-flags', 'id' => '2'}
+           ]
+         }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 204, status
+  end
+
+  def test_patch_has_one
+    JSONAPI.configuration.route_format = :dasherized_route
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    patch '/api/v6/line-items/5/relationships/purchase-order',
+         {
+           'data' => {'type' => 'purchase-orders', 'id' => '3'}
+         }.to_json, "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE
+
+    assert_equal 204, status
+  end
+
 end