From 0671db52a8152ad6d0c4104fa5fc437b9fd6c69d Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Mon, 20 Jun 2016 19:11:42 +0800
Subject: [PATCH] Use keyword args to be more clear:
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12566374
---
lib/gitlab/email/handler/base_handler.rb | 7 +++----
lib/gitlab/email/handler/create_issue_handler.rb | 5 ++++-
lib/gitlab/email/handler/create_note_handler.rb | 5 ++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/gitlab/email/handler/base_handler.rb b/lib/gitlab/email/handler/base_handler.rb
index 1691fca6465..b7ed11cb638 100644
--- a/lib/gitlab/email/handler/base_handler.rb
+++ b/lib/gitlab/email/handler/base_handler.rb
@@ -43,17 +43,16 @@ module Gitlab
end.join
end
- def verify_record!(record, exception, name)
+ def verify_record!(record:, invalid_exception:, record_name:)
return if record.persisted?
- error_title =
- "The #{name} could not be created for the following reasons:"
+ error_title = "The #{record_name} could not be created for the following reasons:"
msg = error_title + record.errors.full_messages.map do |error|
"\n\n- #{error}"
end.join
- raise exception, msg
+ raise invalid_exception, msg
end
end
end
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb
index f8b23d07165..4e6566af8ab 100644
--- a/lib/gitlab/email/handler/create_issue_handler.rb
+++ b/lib/gitlab/email/handler/create_issue_handler.rb
@@ -22,7 +22,10 @@ module Gitlab
validate_permission!(:create_issue)
- verify_record!(create_issue, InvalidIssueError, 'issue')
+ verify_record!(
+ record: create_issue,
+ invalid_exception: InvalidIssueError,
+ record_name: 'issue')
end
def author
diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb
index e4da6b590fb..69646651223 100644
--- a/lib/gitlab/email/handler/create_note_handler.rb
+++ b/lib/gitlab/email/handler/create_note_handler.rb
@@ -19,7 +19,10 @@ module Gitlab
raise NoteableNotFoundError unless sent_notification.noteable
raise EmptyEmailError if message.blank?
- verify_record!(create_note, InvalidNoteError, 'comment')
+ verify_record!(
+ record: create_note,
+ invalid_exception: InvalidNoteError,
+ record_name: 'comment')
end
def author
--
GitLab