jsonapi-resources 0.3.3 → 0.4.0

data/lib/jsonapi/resource_serializer.rb

@@ -18,6 +18,7 @@ module JSONAPI
 
       @fields =  options.fetch(:fields, {})
       @include = options.fetch(:include, [])
+      @include_directives = options[:include_directives]
       @key_formatter = options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
       @route_formatter = options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
       @base_url = options.fetch(:base_url, '')
@@ -28,10 +29,9 @@ module JSONAPI
       is_resource_collection = source.respond_to?(:to_ary)
 
       @included_objects = {}
+      @include_directives ||= JSONAPI::IncludeDirectives.new(@include)
 
-      requested_associations = parse_includes(@include)
-
-      process_primary(source, requested_associations)
+      process_primary(source, @include_directives.include_directives)
 
       included_objects = []
       primary_objects = []
@@ -47,11 +47,7 @@ module JSONAPI
 
       primary_hash = {data: is_resource_collection ? primary_objects : primary_objects[0]}
 
-      if included_objects.size > 0
-        primary_hash[:included] = included_objects
-      else
-        primary_hash
-      end
+      primary_hash[:included] = included_objects if included_objects.size > 0
       primary_hash
     end
 
@@ -72,34 +68,11 @@ module JSONAPI
     end
 
     private
-    # Convert an array of associated objects to include along with the primary document in the form of
-    # ['comments','author','comments.tags','author.posts'] into a structure that tells what we need to include
-    # from each association.
-    def parse_includes(includes)
-      requested_associations = {}
-      includes.each do |include|
-        include = include.to_s.underscore
-
-        pos = include.index('.')
-        if pos
-          association_name = include[0, pos].to_sym
-          requested_associations[association_name] ||= {}
-          requested_associations[association_name].store(:include_children, true)
-          requested_associations[association_name].store(:include_related, parse_includes([include[pos+1, include.length]]))
-        else
-          association_name = include.to_sym
-          requested_associations[association_name] ||= {}
-          requested_associations[association_name].store(:include, true)
-        end
-      end if includes.is_a?(Array)
-      return requested_associations
-    end
-
     # Process the primary source object(s). This will then serialize associated object recursively based on the
     # requested includes. Fields are controlled fields option for each resource type, such
     # as fields: { people: [:id, :email, :comments], posts: [:id, :title, :author], comments: [:id, :body, :post]}
     # The fields options controls both fields and included links references.
-    def process_primary(source, requested_associations)
+    def process_primary(source, include_directives)
       if source.respond_to?(:to_ary)
         source.each do |resource|
           id = resource.id
@@ -107,25 +80,37 @@ module JSONAPI
             set_primary(@primary_class_name, id)
           end
 
-          add_included_object(@primary_class_name, id, object_hash(resource,  requested_associations), true)
+          add_included_object(@primary_class_name, id, object_hash(resource,  include_directives), true)
         end
       else
         return {} if source.nil?
 
         resource = source
         id = resource.id
-        add_included_object(@primary_class_name, id, object_hash(source,  requested_associations), true)
+        add_included_object(@primary_class_name, id, object_hash(source,  include_directives), true)
       end
     end
 
     # Returns a serialized hash for the source model
-    def object_hash(source, requested_associations)
-      obj_hash = attribute_hash(source)
-      links = links_hash(source, requested_associations)
+    def object_hash(source, include_directives)
+      obj_hash = {}
+
+      id_format = source.class._attribute_options(:id)[:format]
+      #protect against ids that were declared as an attribute, but did not have a format set.
+      id_format = 'id' if id_format == :default
+      obj_hash['id'] = format_value(source.id, id_format)
 
       obj_hash['type'] = format_key(source.class._type.to_s)
-      obj_hash['id'] ||= format_value(source.id, :id, source)
-      obj_hash.merge!({links: links}) unless links.empty?
+
+      links = relationship_links(source)
+      obj_hash['links'] = links unless links.empty?
+
+      attributes = attribute_hash(source)
+      obj_hash['attributes'] = attributes unless attributes.empty?
+
+      relationships = relationship_data(source, include_directives)
+      obj_hash['relationships'] = relationships unless relationships.nil? || relationships.empty?
+
       return obj_hash
     end
 
@@ -142,20 +127,13 @@ module JSONAPI
 
       fields.each_with_object({}) do |name, hash|
         format = source.class._attribute_options(name)[:format]
-        if format == :default && name == :id
-          format = 'id'
+        unless name == :id
+          hash[format_key(name)] = format_value(source.send(name), format)
         end
-        hash[format_key(name)] = format_value(
-          source.send(name),
-          format,
-          source
-        )
       end
     end
 
-    # Returns a hash of links for the requested associations for a resource, filtered by the resource
-    # class's fetchable method
-    def links_hash(source, requested_associations)
+    def relationship_data(source, include_directives)
       associations = source.class._associations
       requested = requested_fields(source.class._type)
       fields = associations.keys
@@ -167,15 +145,14 @@ module JSONAPI
 
       included_associations = source.fetchable_fields & associations.keys
 
-      links = {}
-      links[:self] = self_href(source)
+      data = {}
 
-      associations.each_with_object(links) do |(name, association), hash|
+      associations.each_with_object(data) do |(name, association), hash|
         if included_associations.include? name
-          ia = requested_associations.is_a?(Hash) ? requested_associations[name] : nil
+          ia = include_directives[:include_related][name]
 
           include_linkage = ia && ia[:include]
-          include_linked_children = ia && ia[:include_children]
+          include_linked_children = ia && !ia[:include_related].empty?
 
           if field_set.include?(name)
             hash[format_key(name)] = link_object(source, association, include_linkage)
@@ -193,9 +170,9 @@ module JSONAPI
                 id = resource.id
                 associations_only = already_serialized?(type, id)
                 if include_linkage && !associations_only
-                  add_included_object(type, id, object_hash(resource, ia[:include_related]))
+                  add_included_object(type, id, object_hash(resource, ia))
                 elsif include_linked_children || associations_only
-                  links_hash(resource, ia[:include_related])
+                  relationship_data(resource, ia)
                 end
               end
             elsif association.is_a?(JSONAPI::Association::HasMany)
@@ -204,9 +181,9 @@ module JSONAPI
                 id = resource.id
                 associations_only = already_serialized?(type, id)
                 if include_linkage && !associations_only
-                  add_included_object(type, id, object_hash(resource, ia[:include_related]))
+                  add_included_object(type, id, object_hash(resource, ia))
                 elsif include_linked_children || associations_only
-                  links_hash(resource, ia[:include_related])
+                  relationship_data(resource, ia)
                 end
               end
             end
@@ -215,6 +192,13 @@ module JSONAPI
       end
     end
 
+    def relationship_links(source)
+      links = {}
+      links[:self] = self_href(source)
+
+      links
+    end
+
     def formatted_module_path(source)
       source.class.name =~ /::[^:]+\Z/ ? (@route_formatter.format($`).freeze.gsub('::', '/') + '/').downcase : ''
     end
@@ -233,7 +217,7 @@ module JSONAPI
     end
 
     def self_link(source, association)
-      "#{self_href(source)}/links/#{format_route(association.name)}"
+      "#{self_href(source)}/relationships/#{format_route(association.name)}"
     end
 
     def related_link(source, association)
@@ -263,17 +247,19 @@ module JSONAPI
 
     def link_object_has_one(source, association)
       link_object_hash = {}
-      link_object_hash[:self] = self_link(source, association)
-      link_object_hash[:related] = related_link(source, association)
-      link_object_hash[:linkage] = has_one_linkage(source, association)
+      link_object_hash[:links] = {}
+      link_object_hash[:links][:self] = self_link(source, association)
+      link_object_hash[:links][:related] = related_link(source, association)
+      link_object_hash[:data] = has_one_linkage(source, association)
       link_object_hash
     end
 
     def link_object_has_many(source, association, include_linkage)
       link_object_hash = {}
-      link_object_hash[:self] = self_link(source, association)
-      link_object_hash[:related] = related_link(source, association)
-      link_object_hash[:linkage] = has_many_linkage(source, association) if include_linkage
+      link_object_hash[:links] = {}
+      link_object_hash[:links][:self] = self_link(source, association)
+      link_object_hash[:links][:related] = related_link(source, association)
+      link_object_hash[:data] = has_many_linkage(source, association) if include_linkage
       link_object_hash
     end
 
@@ -291,9 +277,9 @@ module JSONAPI
       value = source.send(foreign_key)
 
       if association.is_a?(JSONAPI::Association::HasMany)
-        value.map { |value| IdValueFormatter.format(value, {}) }
+        value.map { |value| IdValueFormatter.format(value) }
       elsif association.is_a?(JSONAPI::Association::HasOne)
-        IdValueFormatter.format(value, {})
+        IdValueFormatter.format(value)
       end
     end
 
@@ -324,9 +310,9 @@ module JSONAPI
       @key_formatter.format(key)
     end
 
-    def format_value(value, format, source)
+    def format_value(value, format)
       value_formatter = JSONAPI::ValueFormatter.value_formatter_for(format)
-      value_formatter.format(value, source)
+      value_formatter.format(value)
     end
   end
 end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/lib/jsonapi/response_document.rb

@@ -0,0 +1,87 @@
+module JSONAPI
+  class ResponseDocument
+    def initialize(operation_results, options = {})
+      @operation_results = operation_results
+      @options = options
+
+      @key_formatter = @options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
+    end
+
+    def contents
+      hash = results_to_hash
+
+      meta = top_level_meta
+      hash.merge!(meta: meta) unless meta.empty?
+
+      hash
+    end
+
+    def status
+      if @operation_results.has_errors?
+        @operation_results.all_errors[0].status
+      else
+        @operation_results.results[0].code
+      end
+    end
+
+    private
+
+    def serializer
+      @serializer ||= @options.fetch(:resource_serializer_klass, JSONAPI::ResourceSerializer).new(
+        @options.fetch(:primary_resource_klass),
+        include_directives: @options[:include_directives],
+        fields: @options[:fields],
+        base_url: @options.fetch(:base_url, ''),
+        key_formatter: @key_formatter,
+        route_formatter: @options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
+      )
+    end
+
+    def top_level_meta
+      meta = @options.fetch(:base_meta, {})
+
+      meta.merge!(@operation_results.meta)
+
+      @operation_results.results.each do |result|
+        meta.merge!(result.meta)
+      end
+
+      meta.deep_transform_keys { |key| @key_formatter.format(key) }
+    end
+
+    def results_to_hash
+      if @operation_results.has_errors?
+        {errors: @operation_results.all_errors}
+      else
+        if @operation_results.results.length == 1
+          result = @operation_results.results[0]
+
+          case result
+          when JSONAPI::ResourceOperationResult
+            serializer.serialize_to_hash(result.resource)
+          when JSONAPI::ResourcesOperationResult
+            serializer.serialize_to_hash(result.resources)
+          when JSONAPI::LinksObjectOperationResult
+            serializer.serialize_to_links_hash(result.parent_resource,
+                                               result.association)
+          when JSONAPI::OperationResult
+            {}
+          end
+
+        elsif @operation_results.results.length > 1
+          resources = []
+          @operation_results.results.each do |result|
+            case result
+            when JSONAPI::ResourceOperationResult
+              resources.push(result.resource)
+            when JSONAPI::ResourcesOperationResult
+              resources.concat(result.resources)
+            end
+          end
+
+          serializer.serialize_to_hash(resources)
+        end
+      end
+    end
+  end
+end

data/lib/jsonapi/routing_ext.rb

@@ -58,8 +58,7 @@ module ActionDispatch
           options[:controller] ||= @resource_type
           options.merge!(res.routing_resource_options)
 
-          # Route using the primary_key. Can be overridden using routing_resource_options
-          options[:param] ||= res._primary_key
+          options[:param] = :id
 
           options[:path] = format_route(@resource_type)
 
@@ -91,21 +90,22 @@ module ActionDispatch
           options = links.extract_options!.dup
 
           res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix)
+          options[:controller] ||= res._type.to_s
 
           methods = links_methods(options)
 
           if methods.include?(:show)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                   action: 'show_association', association: link_type.to_s, via: [:get]
           end
 
           if methods.include?(:update)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                   action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                   action: 'destroy_association', association: link_type.to_s, via: [:delete]
           end
         end
@@ -116,54 +116,60 @@ module ActionDispatch
           options = links.extract_options!.dup
 
           res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix)
+          options[:controller] ||= res._type.to_s
 
           methods = links_methods(options)
 
           if methods.include?(:show)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                    action: 'show_association', association: link_type.to_s, via: [:get]
           end
 
           if methods.include?(:create)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                   action: 'create_association', association: link_type.to_s, via: [:post]
           end
 
           if methods.include?(:update)
-            match "links/#{formatted_association_name}", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}", controller: options[:controller],
                   action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
-            match "links/#{formatted_association_name}/:keys", controller: res._type.to_s,
+            match "relationships/#{formatted_association_name}/:keys", controller: options[:controller],
                   action: 'destroy_association', association: link_type.to_s, via: [:delete]
           end
         end
 
         def jsonapi_related_resource(*association)
           source = JSONAPI::Resource.resource_for(resource_type_with_module_prefix)
+          options = association.extract_options!.dup
 
           association_name = association.first
           association = source._associations[association_name]
 
           formatted_association_name = format_route(association.name)
           related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore.pluralize))
+          options[:controller] ||= related_resource._type.to_s
 
-          match "#{formatted_association_name}", controller: related_resource._type.to_s,
+
+          match "#{formatted_association_name}", controller: options[:controller],
                 association: association.name, source: resource_type_with_module_prefix(source._type),
                 action: 'get_related_resource', via: [:get]
         end
 
         def jsonapi_related_resources(*association)
           source = JSONAPI::Resource.resource_for(resource_type_with_module_prefix)
+          options = association.extract_options!.dup
 
           association_name = association.first
           association = source._associations[association_name]
 
           formatted_association_name = format_route(association.name)
           related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore))
+          options[:controller] ||= related_resource._type.to_s
 
-          match "#{formatted_association_name}", controller: related_resource._type.to_s,
+          match "#{formatted_association_name}", controller: options[:controller],
                 association: association.name, source: resource_type_with_module_prefix(source._type),
                 action: 'get_related_resources', via: [:get]
         end

data/test/controllers/controller_test.rb

@@ -4,10 +4,6 @@ def set_content_type_header!
   @request.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
 end
 
-class ConfigControllerTest < ActionController::TestCase
-
-end
-
 class PostsControllerTest < ActionController::TestCase
   def test_index
     get :index
@@ -57,16 +53,32 @@ class PostsControllerTest < ActionController::TestCase
     assert_equal 1, json_response['included'].size
   end
 
+  def test_index_include_one_level_query_count
+    query_count = count_queries do
+      get :index, {include: 'author'}
+    end
+    assert_response :success
+    assert_equal 2, query_count
+  end
+
+  def test_index_include_two_levels_query_count
+    query_count = count_queries do
+      get :index, {include: 'author,author.comments'}
+    end
+    assert_response :success
+    assert_equal 3, query_count
+  end
+
   def test_index_filter_by_ids_and_fields
     get :index, {filter: {id: '1,2'}, fields: {posts: 'id,title,author'}}
     assert_response :success
     assert_equal 2, json_response['data'].size
 
-    # type, id, title, links
-    assert_equal 4, json_response['data'][0].size
+    # type, id, links, attributes, relationships
+    assert_equal 5, json_response['data'][0].size
     assert json_response['data'][0].has_key?('type')
     assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0].has_key?('title')
+    assert json_response['data'][0]['attributes'].has_key?('title')
     assert json_response['data'][0].has_key?('links')
   end
 
@@ -75,11 +87,11 @@ class PostsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal 2, json_response['data'].size
 
-    # type, id, title, links
-    assert_equal 4, json_response['data'][0].size
+    # type, id, links, attributes, relationships
+    assert_equal 5, json_response['data'][0].size
     assert json_response['data'][0].has_key?('type')
     assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0].has_key?('title')
+    assert json_response['data'][0]['attributes'].has_key?('title')
     assert json_response['data'][0].has_key?('links')
   end
 
@@ -94,11 +106,11 @@ class PostsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal 2, json_response['data'].size
 
-    # links, id, type
-    assert_equal 3, json_response['data'][0].size
+    # type, id, links, relationships
+    assert_equal 4, json_response['data'][0].size
     assert json_response['data'][0].has_key?('type')
     assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0]['links'].has_key?('author')
+    assert json_response['data'][0]['relationships'].has_key?('author')
   end
 
   def test_filter_association_single
@@ -172,58 +184,35 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   def test_sorting_asc
-    get :index, {sort: '+title'}
-
-    assert_response :success
-    assert_equal "A First Post", json_response['data'][0]['title']
-  end
-
-  # Plus symbol may be replaced by a space
-  def test_sorting_asc_with_space
-    get :index, {sort: ' title'}
-
-    assert_response :success
-    assert_equal "A First Post", json_response['data'][0]['title']
-  end
-
-  # Plus symbol may be sent uriencoded ('%2b')
-  def test_sorting_asc_with_encoded_plus
-    get :index, {sort: '%2btitle'}
+    get :index, {sort: 'title'}
 
     assert_response :success
-    assert_equal "A First Post", json_response['data'][0]['title']
+    assert_equal "A First Post", json_response['data'][0]['attributes']['title']
   end
 
   def test_sorting_desc
     get :index, {sort: '-title'}
 
     assert_response :success
-    assert_equal "Update This Later - Multiple", json_response['data'][0]['title']
+    assert_equal "Update This Later - Multiple", json_response['data'][0]['attributes']['title']
   end
 
   def test_sorting_by_multiple_fields
-    get :index, {sort: '+title,+body'}
+    get :index, {sort: 'title,body'}
 
     assert_response :success
     assert_equal '14', json_response['data'][0]['id']
   end
 
   def test_invalid_sort_param
-    get :index, {sort: '+asdfg'}
+    get :index, {sort: 'asdfg'}
 
     assert_response :bad_request
     assert_match /asdfg is not a valid sort criteria for post/, response.body
   end
 
-  def test_invalid_sort_param_missing_direction
-    get :index, {sort: 'title'}
-
-    assert_response :bad_request
-    assert_match /title must start with a direction/, response.body
-  end
-
   def test_excluded_sort_param
-    get :index, {sort: '+id'}
+    get :index, {sort: 'id'}
 
     assert_response :bad_request
     assert_match /id is not a valid sort criteria for post/, response.body
@@ -233,8 +222,8 @@ class PostsControllerTest < ActionController::TestCase
     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_equal 'New post', json_response['data']['attributes']['title']
+    assert_equal 'A body!!!', json_response['data']['attributes']['body']
     assert_nil json_response['included']
   end
 
@@ -242,11 +231,11 @@ class PostsControllerTest < ActionController::TestCase
     get :show, {id: '1', include: 'comments'}
     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['data']['links']['tags']['linkage']
+    assert_equal 'New post', json_response['data']['attributes']['title']
+    assert_equal 'A body!!!', json_response['data']['attributes']['body']
+    assert_nil json_response['data']['relationships']['tags']['data']
     assert matches_array?([{'type' => 'comments', 'id' => '1'}, {'type' => 'comments', 'id' => '2'}],
-                          json_response['data']['links']['comments']['linkage'])
+                          json_response['data']['relationships']['comments']['data'])
     assert_equal 2, json_response['included'].size
   end
 
@@ -254,9 +243,8 @@ class PostsControllerTest < ActionController::TestCase
     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']['linkage']['id']
+    assert_nil json_response['data']['attributes']
+    assert_equal '1', json_response['data']['relationships']['author']['data']['id']
   end
 
   def test_show_single_with_fields_string
@@ -295,19 +283,21 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    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']
+    assert_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal 'JR is Great', json_response['data']['attributes']['title']
+    assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
   end
 
   def test_create_link_to_missing_object
@@ -316,10 +306,12 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '304567'}}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '304567'}}
              }
            }
          }
@@ -335,11 +327,13 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             asdfg: 'aaaa',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               asdfg: 'aaaa',
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
@@ -354,9 +348,11 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JSONAPIResources is the greatest thing...',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
+             attributes: {
+               title: 'JSONAPIResources is the greatest thing...',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
                author: nil
              }
            }
@@ -380,18 +376,22 @@ class PostsControllerTest < ActionController::TestCase
            data: [
              {
                type: 'posts',
-               title: 'JR is Great',
-               body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-               links: {
-                 author: {linkage: {type: 'people', id: '3'}}
+               attributes: {
+                 title: 'JR is Great',
+                 body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+               },
+               relationships: {
+                 author: {data: {type: 'people', id: '3'}}
                }
              },
              {
                type: 'posts',
-               title: 'Ember is Great',
-               body: 'Ember is the greatest thing since unsliced bread.',
-               links: {
-                 author: {linkage: {type: 'people', id: '3'}}
+               attributes: {
+                 title: 'Ember is Great',
+                 body: 'Ember is the greatest thing since unsliced bread.'
+               },
+               relationships: {
+                 author: {data: {type: 'people', id: '3'}}
                }
              }
            ]
@@ -400,7 +400,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']['linkage']['id'], '3'
+    assert_equal json_response['data'][0]['relationships']['author']['data']['id'], '3'
     assert_match /JR is Great/, response.body
     assert_match /Ember is Great/, response.body
   end
@@ -412,18 +412,22 @@ class PostsControllerTest < ActionController::TestCase
            data: [
              {
                type: 'posts',
-               Title: 'JR is Great',
-               body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-               links: {
-                 author: {linkage: {type: 'people', id: '3'}}
+               attributes: {
+                 Title: 'JR is Great',
+                 body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+               },
+               relationships: {
+                 author: {data: {type: 'people', id: '3'}}
                }
              },
              {
                type: 'posts',
-               title: 'Ember is Great',
-               BODY: 'Ember is the greatest thing since unsliced bread.',
-               links: {
-                 author: {linkage: {type: 'people', id: '3'}}
+               attributes: {
+                 title: 'Ember is Great',
+                 BODY: 'Ember is the greatest thing since unsliced bread.'
+               },
+               relationships: {
+                 author: {data: {type: 'people', id: '3'}}
                }
              }
            ]
@@ -439,10 +443,12 @@ class PostsControllerTest < ActionController::TestCase
          {
            data_spelled_wrong: {
              type: 'posts',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
@@ -457,10 +463,12 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts_spelled_wrong',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
@@ -474,10 +482,12 @@ class PostsControllerTest < ActionController::TestCase
     post :create,
          {
            data: {
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
@@ -492,10 +502,12 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             subject: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}}
+             attributes: {
+               subject: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}}
              }
            }
          }
@@ -510,20 +522,22 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}},
-               tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}},
+               tags: {data: [{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']['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']
+    assert_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal 'JR is Great', json_response['data']['attributes']['title']
+    assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
   end
 
   def test_create_with_links_has_many_array
@@ -532,20 +546,22 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR is Great',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread.',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}},
-               tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+             attributes: {
+               title: 'JR is Great',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread.'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}},
+               tags: {data: [{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']['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']
+    assert_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal 'JR is Great', json_response['data']['attributes']['title']
+    assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
   end
 
   def test_create_with_links_include_and_fields
@@ -554,11 +570,13 @@ class PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR is Great!',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread!',
-             links: {
-               author: {linkage: {type: 'people', id: '3'}},
-               tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+             attributes: {
+               title: 'JR is Great!',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread!'
+             },
+             relationships: {
+               author: {data: {type: 'people', id: '3'}},
+               tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
              }
            },
            include: 'author,author.posts',
@@ -567,8 +585,8 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
-    assert_equal 'JR is Great!', json_response['data']['title']
+    assert_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal 'JR is Great!', json_response['data']['attributes']['title']
     assert_not_nil json_response['included'].size
   end
 
@@ -582,10 +600,12 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             id: '3',
             type: 'posts',
-            title: 'A great new Post',
-            links: {
-              section: {linkage: {type: 'sections', id: "#{javascript.id}"}},
-              tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
+              section: {data: {type: 'sections', id: "#{javascript.id}"}},
+              tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
             }
           },
           include: 'tags'
@@ -593,12 +613,12 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    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_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal javascript.id.to_s, json_response['data']['relationships']['section']['data']['id']
+    assert_equal 'A great new Post', json_response['data']['attributes']['title']
+    assert_equal 'AAAA', json_response['data']['attributes']['body']
     assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
-                          json_response['data']['links']['tags']['linkage'])
+                          json_response['data']['relationships']['tags']['data'])
   end
 
   def test_update_remove_links
@@ -609,10 +629,12 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             id: '3',
             type: 'posts',
-            title: 'A great new Post',
-            links: {
-              section: {linkage: {type: 'sections', id: 1}},
-              tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
+              section: {data: {type: 'sections', id: 1}},
+              tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
             }
           },
           include: 'tags'
@@ -626,8 +648,10 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 3,
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
               section: nil,
               tags: []
             }
@@ -637,12 +661,12 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['author']['linkage']['id']
-    assert_equal nil, json_response['data']['links']['section']['linkage']
-    assert_equal 'A great new Post', json_response['data']['title']
-    assert_equal 'AAAA', json_response['data']['body']
+    assert_equal '3', json_response['data']['relationships']['author']['data']['id']
+    assert_equal nil, json_response['data']['relationships']['section']['data']
+    assert_equal 'A great new Post', json_response['data']['attributes']['title']
+    assert_equal 'AAAA', json_response['data']['attributes']['body']
     assert matches_array?([],
-                          json_response['data']['links']['tags']['linkage'])
+                          json_response['data']['relationships']['tags']['data'])
   end
 
   def test_update_relationship_has_one
@@ -698,7 +722,7 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 3,
-            links: {
+            relationships: {
               tags: nil
             }
           }
@@ -716,8 +740,8 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 3,
-            links: {
-              tags: {linkage: {typ: 'bad link', idd: 'as'}}
+            relationships: {
+              tags: {data: {typ: 'bad link', idd: 'as'}}
             }
           }
         }
@@ -734,7 +758,7 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 3,
-            links: {
+            relationships: {
               tags: 'bad link'
             }
           }
@@ -744,7 +768,7 @@ class PostsControllerTest < ActionController::TestCase
     assert_match /Invalid Links Object/, response.body
   end
 
-  def test_update_other_has_many_links_linkage_nil
+  def test_update_other_has_many_links_data_nil
     set_content_type_header!
     put :update,
         {
@@ -752,8 +776,8 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 3,
-            links: {
-              tags: {linkage: nil}
+            relationships: {
+              tags: {data: nil}
             }
           }
         }
@@ -979,8 +1003,10 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: 2,
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
               section: {type: 'sections', id: "#{javascript.id}"},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
@@ -1001,9 +1027,11 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: '3',
-            asdfg: 'aaaa',
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              asdfg: 'aaaa',
+              title: 'A great new Post'
+            },
+            relationships: {
               section: {type: 'sections', id: "#{javascript.id}"},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
@@ -1024,8 +1052,10 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: '3',
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
               asdfg: 'aaaa',
               section: {type: 'sections', id: "#{javascript.id}"},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
@@ -1046,8 +1076,10 @@ class PostsControllerTest < ActionController::TestCase
           id: 3,
           data_spelled_wrong: {
             type: 'posts',
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
               section: {type: 'sections', id: "#{javascript.id}"},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
@@ -1066,7 +1098,9 @@ class PostsControllerTest < ActionController::TestCase
           id: 3,
           data: {
             type: 'posts',
-            title: 'A great new Post'
+            attributes: {
+              title: 'A great new Post'
+            }
           }
         }
 
@@ -1084,8 +1118,10 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             id: '3',
             type_spelled_wrong: 'posts',
-            title: 'A great new Post',
-            links: {
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
               section: {type: 'sections', id: "#{javascript.id}"},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
@@ -1096,6 +1132,31 @@ class PostsControllerTest < ActionController::TestCase
     assert_match /The required parameter, type, is missing./, response.body
   end
 
+  def test_update_unknown_key
+    set_content_type_header!
+    javascript = Section.find_by(name: 'javascript')
+
+    put :update,
+        {
+          id: 3,
+          data: {
+            id: '3',
+            type: 'posts',
+            body: 'asdfg',
+            attributes: {
+              title: 'A great new Post'
+            },
+            relationships: {
+              section: {type: 'sections', id: "#{javascript.id}"},
+              tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
+            }
+          }
+        }
+
+    assert_response :bad_request
+    assert_match /body is not allowed/, response.body
+  end
+
   def test_update_multiple
     set_content_type_header!
     javascript = Section.find_by(name: 'javascript')
@@ -1107,19 +1168,23 @@ class PostsControllerTest < ActionController::TestCase
             {
               type: 'posts',
               id: 3,
-              title: 'A great new Post QWERTY',
-              links: {
-                section: {linkage: {type: 'sections', id: "#{javascript.id}"}},
-                tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+              attributes: {
+                title: 'A great new Post QWERTY'
+              },
+              relationships: {
+                section: {data: {type: 'sections', id: "#{javascript.id}"}},
+                tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
               }
             },
             {
               type: 'posts',
               id: 16,
-              title: 'A great new Post ASDFG',
-              links: {
-                section: {linkage: {type: 'sections', id: "#{javascript.id}"}},
-                tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+              attributes: {
+                title: 'A great new Post ASDFG'
+              },
+              relationships: {
+                section: {data: {type: 'sections', id: "#{javascript.id}"}},
+                tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
               }
             }
           ],
@@ -1128,19 +1193,19 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_equal json_response['data'].size, 2
-    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]['relationships']['author']['data']['id'], '3'
+    assert_equal json_response['data'][0]['relationships']['section']['data']['id'], javascript.id.to_s
+    assert_equal json_response['data'][0]['attributes']['title'], 'A great new Post QWERTY'
+    assert_equal json_response['data'][0]['attributes']['body'], 'AAAA'
     assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
-                          json_response['data'][0]['links']['tags']['linkage'])
+                          json_response['data'][0]['relationships']['tags']['data'])
 
-    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'], 'Not First!!!!'
+    assert_equal json_response['data'][1]['relationships']['author']['data']['id'], '3'
+    assert_equal json_response['data'][1]['relationships']['section']['data']['id'], javascript.id.to_s
+    assert_equal json_response['data'][1]['attributes']['title'], 'A great new Post ASDFG'
+    assert_equal json_response['data'][1]['attributes']['body'], 'Not First!!!!'
     assert matches_array?([{'type' => 'tags', 'id' => '3'}, {'type' => 'tags', 'id' => '4'}],
-                          json_response['data'][1]['links']['tags']['linkage'])
+                          json_response['data'][1]['relationships']['tags']['data'])
   end
 
   def test_update_multiple_missing_keys
@@ -1153,16 +1218,20 @@ class PostsControllerTest < ActionController::TestCase
           data: [
             {
               type: 'posts',
-              title: 'A great new Post ASDFG',
-              links: {
+              attributes: {
+                title: 'A great new Post ASDFG'
+              },
+              relationships: {
                 section: {type: 'sections', id: "#{javascript.id}"},
                 tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
             },
             {
               type: 'posts',
-              title: 'A great new Post QWERTY',
-              links: {
+              attributes: {
+                title: 'A great new Post QWERTY'
+              },
+              relationships: {
                 section: {type: 'sections', id: "#{javascript.id}"},
                 tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
@@ -1184,19 +1253,23 @@ class PostsControllerTest < ActionController::TestCase
             {
               type: 'posts',
               id: 3,
-              title: 'A great new Post ASDFG',
-              links: {
-                section: {linkage: {type: 'sections', id: "#{javascript.id}"}},
-                tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+              attributes: {
+                title: 'A great new Post ASDFG'
+              },
+              relationships: {
+                section: {data: {type: 'sections', id: "#{javascript.id}"}},
+                tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
               }
             },
             {
               type: 'posts',
               id: 8,
-              title: 'A great new Post QWERTY',
-              links: {
-                section: {linkage: {type: 'sections', id: "#{javascript.id}"}},
-                tags: {linkage: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
+              attributes: {
+                title: 'A great new Post QWERTY'
+              },
+              relationships: {
+                section: {data: {type: 'sections', id: "#{javascript.id}"}},
+                tags: {data: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]}
               }
             }
           ]}
@@ -1216,8 +1289,10 @@ class PostsControllerTest < ActionController::TestCase
             {
               type: 'posts',
               id: 3,
-              title: 'A great new Post QWERTY',
-              links: {
+              attributes: {
+                title: 'A great new Post QWERTY'
+              },
+              relationships: {
                 section: {type: 'sections', id: "#{javascript.id}"},
                 tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
@@ -1225,8 +1300,10 @@ class PostsControllerTest < ActionController::TestCase
             {
               type: 'posts',
               id: 9,
-              title: 'A great new Post ASDFG',
-              links: {
+              attributes: {
+                title: 'A great new Post ASDFG'
+              },
+              relationships: {
                 section: {type: 'sections', id: "#{javascript.id}"},
                 tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
               }
@@ -1245,8 +1322,10 @@ class PostsControllerTest < ActionController::TestCase
           data: {
             type: 'posts',
             id: '3',
-            subject: 'A great new Post',
-            links: {
+            attributes: {
+              subject: 'A great new Post'
+            },
+            relationships: {
               author: {type: 'people', id: '1'},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
             }
@@ -1265,7 +1344,9 @@ class PostsControllerTest < ActionController::TestCase
           id: 3,
           data: {
             type: 'posts',
-            subject: 'A great new Post',
+            attributes: {
+              subject: 'A great new Post'
+            },
             linked_objects: {
               author: {type: 'people', id: '1'},
               tags: [{type: 'tags', id: 3}, {type: 'tags', id: 4}]
@@ -1313,7 +1394,7 @@ class PostsControllerTest < ActionController::TestCase
                           id: '1'
                         },
                         links: {
-                          self: 'http://test.host/posts/1/links/author',
+                          self: 'http://test.host/posts/1/relationships/author',
                           related: 'http://test.host/posts/1/author'
                         }
                        }
@@ -1328,7 +1409,7 @@ class PostsControllerTest < ActionController::TestCase
                            {type: 'tags', id: '5'}
                          ],
                          links: {
-                           self: 'http://test.host/posts/2/links/tags',
+                           self: 'http://test.host/posts/2/relationships/tags',
                            related: 'http://test.host/posts/2/tags'
                          }
                        }
@@ -1347,7 +1428,7 @@ class PostsControllerTest < ActionController::TestCase
                        {
                          data: nil,
                          links: {
-                           self: 'http://test.host/posts/17/links/author',
+                           self: 'http://test.host/posts/17/relationships/author',
                            related: 'http://test.host/posts/17/author'
                          }
                        }
@@ -1356,10 +1437,10 @@ end
 
 class TagsControllerTest < ActionController::TestCase
   def test_tags_index
-    get :index, {filter: {id: '6,7,8,9'}, include: 'posts,posts.tags,posts.author.posts'}
+    get :index, {filter: {id: '6,7,8,9'}, include: 'posts.tags,posts.author.posts'}
     assert_response :success
     assert_equal 4, json_response['data'].size
-    assert_equal 2, json_response['included'].size
+    assert_equal 3, json_response['included'].size
   end
 
   def test_tags_show_multiple
@@ -1369,7 +1450,7 @@ class TagsControllerTest < ActionController::TestCase
   end
 
   def test_tags_show_multiple_with_include
-    get :show, {id: '6,7,8,9', include: 'posts,posts.tags,posts.author.posts'}
+    get :show, {id: '6,7,8,9', include: 'posts.tags,posts.author.posts'}
     assert_response :bad_request
     assert_match /6,7,8,9 is not a valid value for id/, response.body
   end
@@ -1396,7 +1477,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
     JSONAPI.configuration.use_text_errors = true
     get :index, {sort: 'not_in_record'}
     assert_response 400
-    assert_equal 'INVALID_SORT_FORMAT', json_response['errors'][0]['code']
+    assert_equal 'INVALID_SORT_CRITERIA', json_response['errors'][0]['code']
     JSONAPI.configuration.use_text_errors = false
   end
 
@@ -1437,7 +1518,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
     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 json_response['data']['attributes'].has_key?('transactionDate')
     assert_equal 2, json_response['included'].size
   end
 
@@ -1446,7 +1527,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
                                                                      'isoCurrencies' => 'id,name'}}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert json_response['data'].has_key?('transactionDate')
+    assert json_response['data']['attributes'].has_key?('transactionDate')
     assert_equal 2, json_response['included'].size
   end
 
@@ -1458,11 +1539,13 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
          {
            data: {
              type: 'expense_entries',
-             transaction_date: '2014/04/15',
-             cost: 50.58,
-             links: {
-               employee: {linkage: {type: 'people', id: '3'}},
-               iso_currency: {linkage: {type: 'iso_currencies', id: 'USD'}}
+             attributes: {
+               transaction_date: '2014/04/15',
+               cost: 50.58
+             },
+             relationships: {
+               employee: {data: {type: 'people', id: '3'}},
+               iso_currency: {data: {type: 'iso_currencies', id: 'USD'}}
              }
            },
            include: 'iso_currency',
@@ -1471,9 +1554,9 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    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']
+    assert_equal '3', json_response['data']['relationships']['employee']['data']['id']
+    assert_equal 'USD', json_response['data']['relationships']['iso_currency']['data']['id']
+    assert_equal '50.58', json_response['data']['attributes']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1487,11 +1570,13 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
          {
            data: {
              type: 'expense_entries',
-             transactionDate: '2014/04/15',
-             cost: 50.58,
-             links: {
-               employee: {linkage: {type: 'people', id: '3'}},
-               isoCurrency: {linkage: {type: 'iso_currencies', id: 'USD'}}
+             attributes: {
+               transactionDate: '2014/04/15',
+               cost: 50.58
+             },
+             relationships: {
+               employee: {data: {type: 'people', id: '3'}},
+               isoCurrency: {data: {type: 'iso_currencies', id: 'USD'}}
              }
            },
            include: 'isoCurrency',
@@ -1500,9 +1585,9 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    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']
+    assert_equal '3', json_response['data']['relationships']['employee']['data']['id']
+    assert_equal 'USD', json_response['data']['relationships']['isoCurrency']['data']['id']
+    assert_equal '50.58', json_response['data']['attributes']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1516,11 +1601,13 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
          {
            data: {
              type: 'expense_entries',
-             'transaction-date' => '2014/04/15',
-             cost: 50.58,
-             links: {
-               employee: {linkage: {type: 'people', id: '3'}},
-               'iso-currency' => {linkage: {type: 'iso_currencies', id: 'USD'}}
+             attributes: {
+               'transaction-date' => '2014/04/15',
+               cost: 50.58
+             },
+             relationships: {
+               employee: {data: {type: 'people', id: '3'}},
+               'iso-currency' => {data: {type: 'iso_currencies', id: 'USD'}}
              }
            },
            include: 'iso-currency',
@@ -1529,9 +1616,9 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    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']
+    assert_equal '3', json_response['data']['relationships']['employee']['data']['id']
+    assert_equal 'USD', json_response['data']['relationships']['iso-currency']['data']['id']
+    assert_equal '50.58', json_response['data']['attributes']['cost']
 
     delete :destroy, {id: json_response['data']['id']}
     assert_response :no_content
@@ -1544,63 +1631,104 @@ class IsoCurrenciesControllerTest < ActionController::TestCase
   end
 
   def test_currencies_show
-    get :show, {code: 'USD'}
+    get :show, {id: 'USD'}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
   end
 
+  def test_create_currencies_client_generated_id
+    set_content_type_header!
+    JSONAPI.configuration.json_key_format = :underscored_route
+
+    post :create,
+         {
+           data: {
+             type: 'iso_currencies',
+             id: 'BTC',
+             attributes: {
+               name: 'Bit Coin',
+               'country_name' => 'global',
+               'minor_unit' => 'satoshi'
+             }
+           }
+         }
+
+    assert_response :created
+    assert_equal 'BTC', json_response['data']['id']
+    assert_equal 'Bit Coin', json_response['data']['attributes']['name']
+    assert_equal 'global', json_response['data']['attributes']['country_name']
+    assert_equal 'satoshi', json_response['data']['attributes']['minor_unit']
+
+    delete :destroy, {id: json_response['data']['id']}
+    assert_response :no_content
+  end
+
+  def test_currencies_primary_key_sort
+    get :index, {sort: 'id'}
+    assert_response :success
+    assert_equal 3, json_response['data'].size
+    assert_equal 'CAD', json_response['data'][0]['id']
+    assert_equal 'EUR', json_response['data'][1]['id']
+    assert_equal 'USD', json_response['data'][2]['id']
+  end
+
+  def test_currencies_code_sort
+    get :index, {sort: 'code'}
+    assert_response :bad_request
+  end
+
   def test_currencies_json_key_underscored_sort
     JSONAPI.configuration.json_key_format = :underscored_key
-    get :index, {sort: '+country_name'}
+    get :index, {sort: 'country_name'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['country_name']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['country_name']
-    assert_equal 'United States', json_response['data'][2]['country_name']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['country_name']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['country_name']
+    assert_equal 'United States', json_response['data'][2]['attributes']['country_name']
 
     # reverse sort
     get :index, {sort: '-country_name'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'United States', json_response['data'][0]['country_name']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['country_name']
-    assert_equal 'Canada', json_response['data'][2]['country_name']
+    assert_equal 'United States', json_response['data'][0]['attributes']['country_name']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['country_name']
+    assert_equal 'Canada', json_response['data'][2]['attributes']['country_name']
   end
 
   def test_currencies_json_key_dasherized_sort
     JSONAPI.configuration.json_key_format = :dasherized_key
-    get :index, {sort: '+country-name'}
+    get :index, {sort: 'country-name'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['country-name']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['country-name']
-    assert_equal 'United States', json_response['data'][2]['country-name']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['country-name']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['country-name']
+    assert_equal 'United States', json_response['data'][2]['attributes']['country-name']
 
     # reverse sort
     get :index, {sort: '-country-name'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'United States', json_response['data'][0]['country-name']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['country-name']
-    assert_equal 'Canada', json_response['data'][2]['country-name']
+    assert_equal 'United States', json_response['data'][0]['attributes']['country-name']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['country-name']
+    assert_equal 'Canada', json_response['data'][2]['attributes']['country-name']
   end
 
   def test_currencies_json_key_custom_json_key_sort
     JSONAPI.configuration.json_key_format = :upper_camelized_key
-    get :index, {sort: '+CountryName'}
+    get :index, {sort: 'CountryName'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'Canada', json_response['data'][0]['CountryName']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['CountryName']
-    assert_equal 'United States', json_response['data'][2]['CountryName']
+    assert_equal 'Canada', json_response['data'][0]['attributes']['CountryName']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['CountryName']
+    assert_equal 'United States', json_response['data'][2]['attributes']['CountryName']
 
     # reverse sort
     get :index, {sort: '-CountryName'}
     assert_response :success
     assert_equal 3, json_response['data'].size
-    assert_equal 'United States', json_response['data'][0]['CountryName']
-    assert_equal 'Euro Member Countries', json_response['data'][1]['CountryName']
-    assert_equal 'Canada', json_response['data'][2]['CountryName']
+    assert_equal 'United States', json_response['data'][0]['attributes']['CountryName']
+    assert_equal 'Euro Member Countries', json_response['data'][1]['attributes']['CountryName']
+    assert_equal 'Canada', json_response['data'][2]['attributes']['CountryName']
   end
 
   def test_currencies_json_key_underscored_filter
@@ -1608,7 +1736,7 @@ class IsoCurrenciesControllerTest < ActionController::TestCase
     get :index, {filter: {country_name: 'Canada'}}
     assert_response :success
     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_currencies_json_key_camelized_key_filter
@@ -1616,7 +1744,7 @@ class IsoCurrenciesControllerTest < ActionController::TestCase
     get :index, {filter: {'countryName' => 'Canada'}}
     assert_response :success
     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_currencies_json_key_custom_json_key_filter
@@ -1624,7 +1752,7 @@ class IsoCurrenciesControllerTest < ActionController::TestCase
     get :index, {filter: {'CountryName' => 'Canada'}}
     assert_response :success
     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
 end
 
@@ -1639,9 +1767,11 @@ class PeopleControllerTest < ActionController::TestCase
          {
            data: {
              type: 'people',
-             name: 'Steve Jobs',
-             email: 'sj@email.zzz',
-             dateJoined: DateTime.parse('2014-1-30 4:20:00 UTC +00:00')
+             attributes: {
+               name: 'Steve Jobs',
+               email: 'sj@email.zzz',
+               dateJoined: DateTime.parse('2014-1-30 4:20:00 UTC +00:00')
+             }
            }
          }
 
@@ -1657,9 +1787,9 @@ class PeopleControllerTest < ActionController::TestCase
           data: {
             id: '3',
             type: 'people',
-            links: {
+            relationships: {
               'hair-cut' => {
-                linkage: {
+                data: {
                   type: 'hair-cuts',
                   id: '1'
                 }
@@ -1676,7 +1806,9 @@ class PeopleControllerTest < ActionController::TestCase
          {
            data: {
              type: 'people',
-             email: 'sj@email.zzz'
+             attributes: {
+               email: 'sj@email.zzz'
+             }
            }
          }
 
@@ -1696,7 +1828,9 @@ class PeopleControllerTest < ActionController::TestCase
           data: {
             id: '3',
             type: 'people',
-            name: ''
+            attributes: {
+              name: ''
+            }
           }
         }
 
@@ -1723,7 +1857,7 @@ class PeopleControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal json_response['data'].size, 1
     assert_equal json_response['data'][0]['id'], '1'
-    assert_equal json_response['data'][0]['name'], 'Joe Author'
+    assert_equal json_response['data'][0]['attributes']['name'], 'Joe Author'
   end
 
   def test_get_related_resource
@@ -1736,31 +1870,43 @@ class PeopleControllerTest < ActionController::TestCase
         data: {
          id: '1',
          type: 'people',
-         name: 'Joe Author',
-         email: 'joe@xyz.fake',
-         "date-joined" => '2013-08-07 16:25:00 -0400',
+         attributes: {
+           name: 'Joe Author',
+           email: 'joe@xyz.fake',
+           "date-joined" => '2013-08-07 16:25:00 -0400'
+         },
          links: {
-           self: 'http://test.host/people/1',
+           self: 'http://test.host/people/1'
+         },
+         relationships: {
            comments: {
-             self: 'http://test.host/people/1/links/comments',
-             related: 'http://test.host/people/1/comments'
+             links: {
+               self: 'http://test.host/people/1/relationships/comments',
+               related: 'http://test.host/people/1/comments'
+             }
            },
            posts: {
-             self: 'http://test.host/people/1/links/posts',
-             related: 'http://test.host/people/1/posts'
+             links: {
+               self: 'http://test.host/people/1/relationships/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: {
+             links: {
+               self: 'http://test.host/people/1/relationships/preferences',
+               related: 'http://test.host/people/1/preferences'
+             },
+             data: {
                type: 'preferences',
                id: '1'
              }
            },
            "hair-cut" => {
-             "self" => "http://test.host/people/1/links/hair_cut",
-             "related" => "http://test.host/people/1/hair_cut",
-             "linkage" => nil
+             "links" => {
+               "self" => "http://test.host/people/1/relationships/hair_cut",
+               "related" => "http://test.host/people/1/hair_cut"
+             },
+             "data" => nil
             }
          }
         }
@@ -1787,8 +1933,8 @@ class Api::V5::AuthorsControllerTest < ActionController::TestCase
     assert_equal 1, json_response['data'].size
     assert_equal '1', json_response['data'][0]['id']
     assert_equal 'authors', json_response['data'][0]['type']
-    assert_equal 'Joe Author', json_response['data'][0]['name']
-    assert_equal nil, json_response['data'][0]['email']
+    assert_equal 'Joe Author', json_response['data'][0]['attributes']['name']
+    assert_equal nil, json_response['data'][0]['attributes']['email']
   end
 
   def test_get_person_as_author_by_name_filter
@@ -1796,7 +1942,7 @@ class Api::V5::AuthorsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal 3, json_response['data'].size
     assert_equal '1', json_response['data'][0]['id']
-    assert_equal 'Joe Author', json_response['data'][0]['name']
+    assert_equal 'Joe Author', json_response['data'][0]['attributes']['name']
   end
 end
 
@@ -1807,7 +1953,7 @@ class BreedsControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_equal '0', json_response['data'][0]['id']
-    assert_equal 'Persian', json_response['data'][0]['name']
+    assert_equal 'Persian', json_response['data'][0]['attributes']['name']
   end
 
   def test_poro_show
@@ -1815,7 +1961,7 @@ class BreedsControllerTest < ActionController::TestCase
     assert_response :success
     assert json_response['data'].is_a?(Hash)
     assert_equal '0', json_response['data']['id']
-    assert_equal 'Persian', json_response['data']['name']
+    assert_equal 'Persian', json_response['data']['attributes']['name']
   end
 
   def test_poro_show_multiple
@@ -1831,13 +1977,32 @@ class BreedsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'breeds',
-             name: 'tabby'
+             attributes: {
+               name: 'tabby'
+             }
            }
          }
 
-    assert_response :created
+    assert_response :accepted
     assert json_response['data'].is_a?(Hash)
-    assert_equal 'Tabby', json_response['data']['name']
+    assert_equal 'Tabby', json_response['data']['attributes']['name']
+  end
+
+  def test_poro_create_validation_error
+    set_content_type_header!
+    post :create,
+         {
+           data: {
+             type: 'breeds',
+             attributes: {
+               name: ''
+             }
+           }
+         }
+
+    assert_equal 1, json_response['errors'].size
+    assert_equal JSONAPI::VALIDATION_ERROR, json_response['errors'][0]['code']
+    assert_match /name - can't be blank/, response.body
   end
 
   def test_poro_create_update
@@ -1846,13 +2011,15 @@ class BreedsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'breeds',
-             name: 'CALIC'
+             attributes: {
+               name: 'CALIC'
+             }
            }
          }
 
-    assert_response :created
+    assert_response :accepted
     assert json_response['data'].is_a?(Hash)
-    assert_equal 'Calic', json_response['data']['name']
+    assert_equal 'Calic', json_response['data']['attributes']['name']
 
     put :update,
         {
@@ -1860,12 +2027,14 @@ class BreedsControllerTest < ActionController::TestCase
           data: {
             id: json_response['data']['id'],
             type: 'breeds',
-            name: 'calico'
+            attributes: {
+              name: 'calico'
+            }
           }
         }
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert_equal 'Calico', json_response['data']['name']
+    assert_equal 'Calico', json_response['data']['attributes']['name']
   end
 
   def test_poro_delete
@@ -1888,17 +2057,17 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
   def test_show_post_namespaced
     get :show, {id: '1'}
     assert_response :success
-    assert_equal 'http://test.host/api/v1/posts/1/links/writer', json_response['data']['links']['writer']['self']
+    assert_equal 'http://test.host/api/v1/posts/1/relationships/writer', json_response['data']['relationships']['writer']['links']['self']
   end
 
   def test_show_post_namespaced_include
     get :show, {id: '1', include: 'writer'}
     assert_response :success
-    assert_equal '1', json_response['data']['links']['writer']['linkage']['id']
-    assert_nil json_response['data']['links']['tags']
+    assert_equal '1', json_response['data']['relationships']['writer']['data']['id']
+    assert_nil json_response['data']['relationships']['tags']
     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']
+    assert_equal 'joe@xyz.fake', json_response['included'][0]['attributes']['email']
   end
 
   def test_index_filter_on_association_namespaced
@@ -1911,7 +2080,7 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
     get :index, {sort: '-title'}
 
     assert_response :success
-    assert_equal "Update This Later - Multiple", json_response['data'][0]['title']
+    assert_equal "Update This Later - Multiple", json_response['data'][0]['attributes']['title']
   end
 
   def test_create_simple_namespaced
@@ -1920,20 +2089,22 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
          {
            data: {
              type: 'posts',
-             title: 'JR - now with Namespacing',
-             body: 'JSONAPIResources is the greatest thing since unsliced bread now that it has namespaced resources.',
-             links: {
-               writer: { linkage: {type: 'writers', id: '3'}}
+             attributes: {
+               title: 'JR - now with Namespacing',
+               body: 'JSONAPIResources is the greatest thing since unsliced bread now that it has namespaced resources.'
+             },
+             relationships: {
+               writer: { data: {type: 'writers', id: '3'}}
              }
            }
          }
 
     assert_response :created
     assert json_response['data'].is_a?(Hash)
-    assert_equal '3', json_response['data']['links']['writer']['linkage']['id']
-    assert_equal 'JR - now with Namespacing', json_response['data']['title']
+    assert_equal '3', json_response['data']['relationships']['writer']['data']['id']
+    assert_equal 'JR - now with Namespacing', json_response['data']['attributes']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread now that it has namespaced resources.',
-                 json_response['data']['body']
+                 json_response['data']['attributes']['body']
   end
 
 end
@@ -1947,19 +2118,23 @@ class FactsControllerTest < ActionController::TestCase
     get :show, {id: '1'}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    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: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']
-    assert_equal false, json_response['data']['cool']
+    assert_equal 'Jane Author', json_response['data']['attributes']['spouseName']
+    assert_equal 'First man to run across Antartica.', json_response['data']['attributes']['bio']
+    assert_equal 23.89/45.6, json_response['data']['attributes']['qualityRating']
+    assert_equal '47000.56', json_response['data']['attributes']['salary']
+    assert_equal '2013-08-07T20:25:00Z', json_response['data']['attributes']['dateTimeJoined']
+    assert_equal '1965-06-30', json_response['data']['attributes']['birthday']
+    assert_equal '2000-01-01T20:00:00Z', json_response['data']['attributes']['bedtime']
+    assert_equal 'abc', json_response['data']['attributes']['photo']
+    assert_equal false, json_response['data']['attributes']['cool']
   end
 end
 
 class Api::V2::BooksControllerTest < ActionController::TestCase
+  def setup
+    JSONAPI.configuration.json_key_format = :dasherized_key
+  end
+
   def after_teardown
     Api::V2::BookResource.paginator :offset
   end
@@ -1970,7 +2145,31 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_equal 10, 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_books_offset_pagination_no_params_includes_query_count_one_level
+    Api::V2::BookResource.paginator :offset
+
+    query_count = count_queries do
+      get :index, {include: 'book-comments'}
+    end
+    assert_response :success
+    assert_equal 10, json_response['data'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 2, query_count
+  end
+
+  def test_books_offset_pagination_no_params_includes_query_count_two_levels
+    Api::V2::BookResource.paginator :offset
+
+    query_count = count_queries do
+      get :index, {include: 'book-comments,book-comments.author'}
+    end
+    assert_response :success
+    assert_equal 10, json_response['data'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 3, query_count
   end
 
   def test_books_offset_pagination
@@ -1979,7 +2178,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index, {page: {offset: 50, limit: 12}}
     assert_response :success
     assert_equal 12, 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_books_offset_pagination_bad_page_param
@@ -2006,6 +2205,14 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     assert_match /-1 is not a valid value for limit page parameter./, json_response['errors'][0]['detail']
   end
 
+  def test_books_offset_pagination_bad_param_offset_less_than_zero
+    Api::V2::BookResource.paginator :offset
+
+    get :index, {page: {offset: -1, limit: 20}}
+    assert_response :bad_request
+    assert_match /-1 is not a valid value for offset page parameter./, json_response['errors'][0]['detail']
+  end
+
   def test_books_offset_pagination_invalid_page_format
     Api::V2::BookResource.paginator :offset
 
@@ -2020,7 +2227,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_equal 10, 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_books_paged_pagination_no_page
@@ -2029,7 +2236,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index, {page: {size: 12}}
     assert_response :success
     assert_equal 12, 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_books_paged_pagination
@@ -2038,7 +2245,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index, {page: {number: 3, size: 12}}
     assert_response :success
     assert_equal 12, json_response['data'].size
-    assert_equal 'Book 24', json_response['data'][0]['title']
+    assert_equal 'Book 24', json_response['data'][0]['attributes']['title']
   end
 
   def test_books_paged_pagination_bad_page_param
@@ -2065,13 +2272,12 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     assert_match /-1 is not a valid value for size page parameter./, json_response['errors'][0]['detail']
   end
 
-  def test_books_paged_pagination_invalid_page_format_interpret_int_text
+  def test_books_paged_pagination_invalid_page_format_incorrect
     Api::V2::BookResource.paginator :paged
 
     get :index, {page: 'qwerty'}
-    assert_response :success
-    assert_equal 10, json_response['data'].size
-    assert_equal 'Book 0', json_response['data'][0]['title']
+    assert_response :bad_request
+    assert_match /0 is not a valid value for number page parameter./, json_response['errors'][0]['detail']
   end
 
   def test_books_paged_pagination_invalid_page_format_interpret_int
@@ -2080,6 +2286,76 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     get :index, {page: 3}
     assert_response :success
     assert_equal 10, json_response['data'].size
-    assert_equal 'Book 20', json_response['data'][0]['title']
+    assert_equal 'Book 20', json_response['data'][0]['attributes']['title']
+  end
+end
+
+class Api::V4::BooksControllerTest < ActionController::TestCase
+  def setup
+    JSONAPI.configuration.json_key_format = :camelized_key
+  end
+
+  def test_books_offset_pagination_meta
+    JSONAPI.configuration.operations_processor = :counting_active_record
+    Api::V4::BookResource.paginator :offset
+    get :index, {page: {offset: 50, limit: 12}}
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
+    assert_equal 1000, json_response['meta']['totalRecords']
+    JSONAPI.configuration.operations_processor = :active_record
+  end
+end
+
+class CategoriesControllerTest < ActionController::TestCase
+  def test_index_default_filter
+    get :index
+    assert_response :success
+    assert json_response['data'].is_a?(Array)
+    assert_equal 3, json_response['data'].size
+  end
+
+  def test_index_default_filter_override
+    get :index, { filter: { status: 'inactive' } }
+    assert_response :success
+    assert json_response['data'].is_a?(Array)
+    assert_equal 4, json_response['data'].size
   end
 end
+
+class Api::V1::PlanetsControllerTest < ActionController::TestCase
+  def test_save_model_callbacks
+    set_content_type_header!
+    post :create,
+         {
+           data: {
+             type: 'planets',
+             attributes: {
+               name: 'Zeus',
+               description: 'The largest planet in the solar system. Discovered in 2015.'
+             }
+           }
+         }
+
+    assert_response :created
+    assert json_response['data'].is_a?(Hash)
+    assert_equal 'Zeus', json_response['data']['attributes']['name']
+  end
+
+  def test_save_model_callbacks_fail
+    set_content_type_header!
+    post :create,
+         {
+           data: {
+             type: 'planets',
+             attributes: {
+               name: 'Pluto',
+               description: 'Yes, it is a planet.'
+             }
+           }
+         }
+
+    assert_response :unprocessable_entity
+    assert_match /Save failed or was cancelled/, json_response['errors'][0]['detail']
+  end
+end