From 01a4117338fa88e17b95e59e5907ac53f1d51c02 Mon Sep 17 00:00:00 2001
From: Laust Rud Jacobsen <laust@object.io>
Date: Sun, 15 Nov 2015 17:25:03 +0100
Subject: [PATCH] Rubocop: use modern unified format for Rails validations

---
 .rubocop_todo.yml     | 12 ------------
 app/models/app.rb     |  4 +---
 app/models/comment.rb |  2 +-
 app/models/deploy.rb  |  2 +-
 app/models/err.rb     |  2 +-
 app/models/notice.rb  |  2 +-
 app/models/problem.rb |  5 ++---
 app/models/user.rb    |  6 +++---
 8 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 48d4126..471fb4e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,18 +41,6 @@ Rails/Output:
     - 'app/interactors/problem_recacher.rb'
     - 'db/seeds.rb'
 
-# Offense count: 12
-# Configuration parameters: Include.
-Rails/Validation:
-  Exclude:
-    - 'app/models/app.rb'
-    - 'app/models/comment.rb'
-    - 'app/models/deploy.rb'
-    - 'app/models/err.rb'
-    - 'app/models/notice.rb'
-    - 'app/models/problem.rb'
-    - 'app/models/user.rb'
-
 # Offense count: 105
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
diff --git a/app/models/app.rb b/app/models/app.rb
index 21f832e..92929eb 100644
--- a/app/models/app.rb
+++ b/app/models/app.rb
@@ -35,9 +35,7 @@ class App
   before_save :normalize_github_repo
   after_update :store_cached_attributes_on_problems
 
-  validates_presence_of :name, :api_key
-  validates_uniqueness_of :name, allow_blank: true
-  validates_uniqueness_of :api_key, allow_blank: true
+  validates :name, :api_key, presence: true, uniqueness: { allow_blank: true }
   validates_associated :watchers
   validates_associated :notice_fingerprinter
   validate :check_issue_tracker
diff --git a/app/models/comment.rb b/app/models/comment.rb
index b2a0def..6199613 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -14,7 +14,7 @@ class Comment
   belongs_to :user
   delegate   :app, to: :err
 
-  validates_presence_of :body
+  validates :body, presence: true
 
   def deliver_email
     Mailer.comment_notification(self).deliver_now
diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 38b05f1..3448f53 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -16,7 +16,7 @@ class Deploy
   after_create :store_cached_attributes_on_problems
   after_create :deliver_email
 
-  validates_presence_of :username, :environment
+  validates :username, :environment, presence: true
 
   def resolve_app_errs
     app.problems.unresolved.in_env(environment).each(&:resolve!)
diff --git a/app/models/err.rb b/app/models/err.rb
index 572f58c..50a2893 100644
--- a/app/models/err.rb
+++ b/app/models/err.rb
@@ -14,7 +14,7 @@ class Err
   belongs_to :problem
   has_many :notices, inverse_of: :err, dependent: :destroy
 
-  validates_presence_of :problem_id, :fingerprint
+  validates :problem_id, :fingerprint, presence: true
 
   delegate :app, :resolved?, to: :problem
 end
diff --git a/app/models/notice.rb b/app/models/notice.rb
index fe539e0..30b14d2 100644
--- a/app/models/notice.rb
+++ b/app/models/notice.rb
@@ -24,7 +24,7 @@ class Notice
   before_save :sanitize
   before_destroy :problem_recache
 
-  validates_presence_of :backtrace_id, :server_environment, :notifier
+  validates :backtrace_id, :server_environment, :notifier, presence: true
 
   scope :ordered, -> { order_by(:created_at.asc) }
   scope :reverse_ordered, -> { order_by(:created_at.desc) }
diff --git a/app/models/problem.rb b/app/models/problem.rb
index afce776..ed9f127 100644
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -53,7 +53,8 @@ class Problem
   has_many :errs, inverse_of: :problem, dependent: :destroy
   has_many :comments, inverse_of: :err, dependent: :destroy
 
-  validates_presence_of :environment
+  validates :environment, presence: true
+  validates :last_notice_at, :first_notice_at, presence: true
 
   before_create :cache_app_attributes
   before_save :truncate_message
@@ -63,8 +64,6 @@ class Problem
   scope :ordered, -> { order_by(:last_notice_at.desc) }
   scope :for_apps, ->(apps) { where(:app_id.in => apps.all.map(&:id)) }
 
-  validates_presence_of :last_notice_at, :first_notice_at
-
   def self.all_else_unresolved(fetch_all)
     if fetch_all
       all
diff --git a/app/models/user.rb b/app/models/user.rb
index eaaa56a..4c680b0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,12 +38,12 @@ class User
 
   before_save :ensure_authentication_token
 
-  validates_presence_of :name
-  validates_uniqueness_of :github_login, allow_nil: true
+  validates :name, presence: true
+  validates :github_login, uniqueness: { allow_nil: true }
 
   if Errbit::Config.user_has_username
     field :username
-    validates_presence_of :username
+    validates :username, presence: true
   end
 
   def per_page
--
libgit2 0.21.2