Skip to content

Compatibility with jsonapi-resources@0.9.7 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2019
Merged

Compatibility with jsonapi-resources@0.9.7 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b64c9e9
Compatibility with jsonapi-resources@0.9.5
krasnoukhov Mar 21, 2019
8b3a49a
Specify sqlite3 version so CI runs
krasnoukhov Mar 21, 2019
84b5455
0.9.7
krasnoukhov May 18, 2019
f94b485
0.9.8
krasnoukhov Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jsonapi-utils.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_runtime_dependency 'jsonapi-resources', '0.9.0'
spec.add_runtime_dependency 'jsonapi-resources', '0.9.8'

spec.add_development_dependency 'bundler', '~> 1.10'
spec.add_development_dependency 'rake', '~> 10.0'
spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '~> 5.1'
spec.add_development_dependency 'sqlite3'
spec.add_development_dependency 'sqlite3', '~> 1.3.6'
spec.add_development_dependency 'rspec-rails', '~> 3.1'
spec.add_development_dependency 'factory_girl', '~> 4.8'
spec.add_development_dependency 'smart_rspec', '~> 0.1.6'
Expand Down
5 changes: 5 additions & 0 deletions lib/jsonapi/utils/request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ module Request
def jsonapi_request_handling
setup_request
check_request
rescue JSONAPI::Exceptions::InvalidResource,
JSONAPI::Exceptions::InvalidField,
JSONAPI::Exceptions::InvalidInclude,
JSONAPI::Exceptions::InvalidSortCriteria => err
jsonapi_render_errors(json: err)
end

# Instantiate the request object.
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/posts_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
expect(subject).to have_http_status :ok
expect(subject).to have_primary_data('posts')
expect(subject).to have_data_attributes(fields)
expect(subject).to have_relationships(relationships)
expect(json).to_not have_key('relationships')
expect(data.dig('attributes', 'title')).to eq('Lorem ipsum')
end
end
Expand Down