Skip to content

Commit 8ab3ced

Browse files
authored
Merge branch 'master' into pagination
2 parents c763af2 + 1b3af0a commit 8ab3ced

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.2
1+
0.2.1

jsonapi-rails.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
1515
spec.require_path = 'lib'
1616

1717
spec.add_dependency 'jsonapi-rb', '~> 0.3.0'
18+
spec.add_dependency 'jsonapi-parser', '~> 0.1.0'
1819

1920
spec.add_development_dependency 'rails', '~> 5.0'
2021
spec.add_development_dependency 'sqlite3'

lib/jsonapi/rails/action_controller.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def deserializable_resource(key, options = {}, &block)
3232
Class.new(JSONAPI::Rails::Deserializable::Resource, &block)
3333

3434
before_action(options) do |controller|
35-
resource = klass.new(controller.params[:_jsonapi].to_unsafe_hash)
35+
hash = controller.params[:_jsonapi].to_unsafe_hash
36+
JSONAPI::Parser::Resource.parse!(hash)
37+
resource = klass.new(hash[:data])
3638
controller.request.env[JSONAPI_POINTERS_KEY] =
3739
resource.reverse_mapping
3840
controller.params[key.to_sym] = resource.to_hash

spec/spec_helper.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require 'jsonapi/parser'
2-
31
# This file was generated by the `rails generate rspec:install` command. Conventionally, all
42
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
53
# The generated `.rspec` file contains `--require spec_helper` which will cause

0 commit comments

Comments
 (0)