Skip to content

Commit 9ef6d9b

Browse files
authored
Merge pull request #98 from simplepractice/resources-0.9.5
Compatibility with [email protected]
2 parents a2c2b0e + f94b485 commit 9ef6d9b

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

jsonapi-utils.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
1919
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2020
spec.require_paths = ['lib']
2121

22-
spec.add_runtime_dependency 'jsonapi-resources', '0.9.0'
22+
spec.add_runtime_dependency 'jsonapi-resources', '0.9.8'
2323

2424
spec.add_development_dependency 'bundler', '~> 1.10'
2525
spec.add_development_dependency 'rake', '~> 10.0'
2626
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 5.1'
27-
spec.add_development_dependency 'sqlite3'
27+
spec.add_development_dependency 'sqlite3', '~> 1.3.6'
2828
spec.add_development_dependency 'rspec-rails', '~> 3.1'
2929
spec.add_development_dependency 'factory_girl', '~> 4.8'
3030
spec.add_development_dependency 'smart_rspec', '~> 0.1.6'

lib/jsonapi/utils/request.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ module Request
66
def jsonapi_request_handling
77
setup_request
88
check_request
9+
rescue JSONAPI::Exceptions::InvalidResource,
10+
JSONAPI::Exceptions::InvalidField,
11+
JSONAPI::Exceptions::InvalidInclude,
12+
JSONAPI::Exceptions::InvalidSortCriteria => err
13+
jsonapi_render_errors(json: err)
914
end
1015

1116
# Instantiate the request object.

spec/controllers/posts_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
expect(subject).to have_http_status :ok
173173
expect(subject).to have_primary_data('posts')
174174
expect(subject).to have_data_attributes(fields)
175-
expect(subject).to have_relationships(relationships)
175+
expect(json).to_not have_key('relationships')
176176
expect(data.dig('attributes', 'title')).to eq('Lorem ipsum')
177177
end
178178
end

0 commit comments

Comments
 (0)