Skip to content

Commit d59b6b1

Browse files
authored
Merge pull request #130 from yellowspot/fix-rails-deprecation-warning
Fix rails 6.1 deprecation warning on ActiveModel::Errors#keys (Backward compatible)
2 parents 6d49925 + e1af978 commit d59b6b1

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Diff for: VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.0
1+
0.4.1

Diff for: jsonapi-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.add_dependency 'jsonapi-parser', '~> 0.1.0'
1919

2020
spec.add_development_dependency 'rails', '~> 5.0'
21-
spec.add_development_dependency 'sqlite3', '~> 1.3.6'
21+
spec.add_development_dependency 'sqlite3', '~> 1.3'
2222
spec.add_development_dependency 'rake', '~> 11.3'
2323
spec.add_development_dependency 'rspec-rails', '~> 3.5'
2424
spec.add_development_dependency 'with_model', '~> 2.0'

Diff for: lib/jsonapi/rails/serializable_active_model_errors.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@ def initialize(exposures)
2525
end
2626

2727
def as_jsonapi
28-
@errors.keys.flat_map do |key|
28+
error_keys.flat_map do |key|
2929
@errors.full_messages_for(key).map do |message|
3030
SerializableActiveModelError.new(field: key, message: message,
3131
pointer: @reverse_mapping[key])
3232
.as_jsonapi
3333
end
3434
end
3535
end
36+
37+
private
38+
39+
def error_keys
40+
@errors.respond_to?(:attribute_names) ? @errors.attribute_names : @errors.keys
41+
end
3642
end
3743
end
3844
end

0 commit comments

Comments
 (0)