Skip to content

add back message key in order to have error_codes #1366

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
dblock merged 2 commits into from
Apr 22, 2016
Merged

add back message key in order to have error_codes #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8d8712
Store back `message_key` on `Grape::Exceptions::Validation`
Apr 20, 2016
a21783c
feedbacks
Apr 22, 2016
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

* Your contribution here.

#### Features
* [#1366](https://github.com/ruby-grape/grape/pull/1366): Store `message_key` on `Grape::Exceptions::Validation` - [@mkou](https://github.com/mkou).

0.16.2 (4/12/2016)
==================

Expand Down
5 changes: 4 additions & 1 deletion lib/grape/exceptions/validation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ class Validation < Grape::Exceptions::Base
def initialize(args = {})
fail 'Params are missing:' unless args.key? :params
@params = args[:params]
args[:message] = translate_message(args[:message]) if args.key? :message
if args.key?(:message)
@message_key = args[:message] if args[:message].is_a?(Symbol)
args[:message] = translate_message(args[:message])
end
super
Copy link
Member

@dblock dblock Apr 21, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I nitpick? Is this better? Avoids checking key? twice.

return unless args.key?(:message)
@message_key = args[:message] if args[:message].is_a?(Symbol)
args[:message] = translate_message(args[:message])

or with an if, I don't care.

Copy link
Contributor Author

@mkou mkou Apr 21, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm wouldn't the return bypass the super method?
I like the idea of not checking the key twice though.

Copy link
Contributor Author

@mkou mkou Apr 21, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you prefer that version ?

super && return unless args.key?(:message)
@message_key = args[:message] if args[:message].is_a?(Symbol)
args[:message] = translate_message(args[:message])
super

or

if args.key?(:message)
  @message_key = args[:message] if args[:message].is_a?(Symbol)
  args[:message] = translate_message(args[:message])
end
super

(I think I prefer the last one)

Copy link
Contributor

@ridiculous ridiculous Apr 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

definitely the latter 👍

Copy link
Member

@dblock dblock Apr 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

likewise I'm with @ridiculous

end

Expand Down
10 changes: 10 additions & 0 deletions spec/grape/exceptions/validation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@
it 'fails when params are missing' do
expect { Grape::Exceptions::Validation.new(message: 'presence') }.to raise_error(RuntimeError, 'Params are missing:')
end
context 'when message is a symbol' do
it 'stores message_key' do
expect(Grape::Exceptions::Validation.new(params: ['id'], message: :presence).message_key).to eq(:presence)
end
end
context 'when message is a String' do
it 'does not store the message_key' do
expect(Grape::Exceptions::Validation.new(params: ['id'], message: 'presence').message_key).to eq(nil)
end
end
end