Skip to content

Commit f3332f5

Browse files
committed
address rubocop issue -- update dependencies... wonder if we need to move @beauby's jsonapi gems to rails-api, in order to faster turnaround time
1 parent a08b1d0 commit f3332f5

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ eval_gemfile local_gemfile if File.readable?(local_gemfile)
88
gemspec
99

1010
gem 'jsonapi', github: 'beauby/jsonapi'
11-
gem 'jsonapi-deserializable', github: 'beauby/jsonapi-deserializable', branch: 'new-dsl'
1211
gem 'jsonapi-validations', github: 'beauby/jsonapi-validations'
1312
gem 'jsonapi-rails', github: 'beauby/jsonapi-rails', branch: 'initial-implementation'
1413

active_model_serializers.gemspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ Gem::Specification.new do |spec|
4242
# 'minitest'
4343
# 'thread_safe'
4444

45-
spec.add_runtime_dependency 'jsonapi', '~> 0.1.1.beta5'
45+
# spec.add_runtime_dependency 'jsonapi-rails'
46+
# spec.add_runtime_dependency 'jsonapi', '>= 0.1.1.beta2'
47+
spec.add_runtime_dependency 'jsonapi-deserializable', '~> 0.1.1.beta3'
4648
spec.add_runtime_dependency 'case_transform', '>= 0.2'
4749

4850
spec.add_development_dependency 'activerecord', rails_versions

lib/active_model_serializers/adapter/json_api/deserialization.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module Deserialization
7575
#
7676
def parse!(document, options = {})
7777
parse(document, options) do |exception|
78-
raise exception
78+
fail exception
7979
end
8080
end
8181

0 commit comments

Comments
 (0)