upgrade to jsonapi beta5, improve tests to be valid resource requests

Author: NullVoxPopuli

Gemfile

@@ -7,9 +7,6 @@ eval_gemfile local_gemfile if File.readable?(local_gemfile)
 # Specify your gem's dependencies in active_model_serializers.gemspec
 gemspec
 
-# TODO: remove when @beauby re-publishes this gem
-gem 'jsonapi', github: 'beauby/jsonapi'
-
 version = ENV['RAILS_VERSION'] || '4.2'
 
 if version == 'master'

active_model_serializers.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   # 'minitest'
   # 'thread_safe'
 
-  spec.add_runtime_dependency 'jsonapi', '~> 0.1.1.beta2'
+  spec.add_runtime_dependency 'jsonapi', '~> 0.1.1.beta5'
   spec.add_runtime_dependency 'case_transform', '>= 0.2'
 
   spec.add_development_dependency 'activerecord', rails_versions

lib/active_model_serializers/adapter/json_api/deserialization.rb

@@ -81,9 +81,8 @@ def parse!(document, options = {})
         # Same as parse!, but returns an empty hash instead of raising InvalidDocument
         # on invalid payloads.
         def parse(document, options = {})
-          document = JSONAPI.parse(document, options)
-          document = document.to_hash
-
+          JSONAPI.parse_response!(document)
+          document = document.to_h
           primary_data = document['data']
 
           # null data is allowed, as per the JSON API Schema
@@ -102,7 +101,8 @@ def parse(document, options = {})
 
           hash
 
-        rescue JSONAPI::Parser::InvalidDocument
+        rescue JSONAPI::Parser::InvalidDocument => e
+          puts e.message
           return {} unless block_given?
           yield
         end

test/action_controller/json_api/deserialization_test.rb

@@ -6,13 +6,13 @@ class JsonApi
       class DeserializationTest < ActionController::TestCase
         class DeserializationTestController < ActionController::Base
           def render_parsed_payload
-            parsed_hash = ActiveModelSerializers::Deserialization.jsonapi_parse(params)
+            parsed_hash = ActiveModelSerializers::Deserialization.jsonapi_parse(params['resource'])
             render json: parsed_hash
           end
 
           def render_polymorphic_parsed_payload
             parsed_hash = ActiveModelSerializers::Deserialization.jsonapi_parse(
-              params,
+              params['resource'],
               polymorphic: [:restriction_for, :restricted_to]
             )
             render json: parsed_hash
@@ -23,17 +23,19 @@ def render_polymorphic_parsed_payload
 
         def test_deserialization_of_relationship_only_object
           hash = {
-            'data' => {
-              'type' => 'restraints',
-              'relationships' => {
-                'restriction_for' => {
-                  'data' => {
-                    'type' => 'discounts',
-                    'id' => '67'
+            'resource' => {
+              'data' => {
+                'type' => 'restraints',
+                'relationships' => {
+                  'restriction_for' => {
+                    'data' => {
+                      'type' => 'discounts',
+                      'id' => '67'
+                    }
+                  },
+                  'restricted_to' => {
+                    'data' => nil
                   }
-                },
-                'restricted_to' => {
-                  'data' => nil
                 }
               }
             },
@@ -55,34 +57,36 @@ def test_deserialization_of_relationship_only_object
 
         def test_deserialization
           hash = {
-            'data' => {
-              'type' => 'photos',
-              'id' => 'zorglub',
-              'attributes' => {
-                'title' => 'Ember Hamster',
-                'src' => 'http://example.com/images/productivity.png',
-                'image-width' => '200',
-                'imageHeight' => '200',
-                'ImageSize' => '1024'
-              },
-              'relationships' => {
-                'author' => {
-                  'data' => nil
-                },
-                'photographer' => {
-                  'data' => { 'type' => 'people', 'id' => '9' }
+            'resource' => {
+              'data' => {
+                'type' => 'photos',
+                'id' => 'zorglub',
+                'attributes' => {
+                  'title' => 'Ember Hamster',
+                  'src' => 'http://example.com/images/productivity.png',
+                  'image-width' => '200',
+                  'imageHeight' => '200',
+                  'ImageSize' => '1024'
                 },
-                'comments' => {
-                  'data' => [
-                    { 'type' => 'comments', 'id' => '1' },
-                    { 'type' => 'comments', 'id' => '2' }
-                  ]
-                },
-                'related-images' => {
-                  'data' => [
-                    { 'type' => 'image', 'id' => '7' },
-                    { 'type' => 'image', 'id' => '8' }
-                  ]
+                'relationships' => {
+                  'author' => {
+                    'data' => nil
+                  },
+                  'photographer' => {
+                    'data' => { 'type' => 'people', 'id' => '9' }
+                  },
+                  'comments' => {
+                    'data' => [
+                      { 'type' => 'comments', 'id' => '1' },
+                      { 'type' => 'comments', 'id' => '2' }
+                    ]
+                  },
+                  'related-images' => {
+                    'data' => [
+                      { 'type' => 'image', 'id' => '7' },
+                      { 'type' => 'image', 'id' => '8' }
+                    ]
+                  }
                 }
               }
             }