Merge branch 'master' into iD-2.19.6

[rails.git] / app / validators / whitespace_validator.rb

diff --git a/app/validators/whitespace_validator.rb b/app/validators/whitespace_validator.rb
index 333ad0e05f76a327fb53e72fa168ea267b6ccea2..3032c109eb03c1bae7bbc6fcc16b3546c055dd73 100644 (file)
--- a/app/validators/whitespace_validator.rb
+++ b/app/validators/whitespace_validator.rb
@@ -1,11 +1,6 @@
 class WhitespaceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless options.fetch(:leading, true)
-      record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if /\A\s/.match?(value)
-    end
-
-    unless options.fetch(:trailing, true)
-      record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if /\s\z/.match?(value)
-    end
+    record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if !options.fetch(:leading, true) && /\A\s/.match?(value)
+    record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if !options.fetch(:trailing, true) && /\s\z/.match?(value)
   end
 end