Only check that the option exists once instead of doing on each conditional

1 files changed, 9 insertions, 8 deletions

diff --git a/activemodel/lib/active_model/validations/format.rb b/activemodel/lib/active_model/validations/format.rb
index f17105e574..488a498a41 100644
--- a/activemodel/lib/active_model/validations/format.rb
+++ b/activemodel/lib/active_model/validations/format.rb
@@ -38,14 +38,15 @@ module ActiveModel
       end
 
       def check_options_validity(name)
-        option = options[name]
-        if option && !option.is_a?(Regexp) && !option.respond_to?(:call)
-          raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
-        elsif option && option.is_a?(Regexp) &&
-              regexp_using_multiline_anchors?(option) && options[:multiline] != true
-          raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
-          "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
-          ":multiline => true option?"
+        if option = options[name]
+          if !option.is_a?(Regexp) && !option.respond_to?(:call)
+            raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
+          elsif option.is_a?(Regexp) &&
+                regexp_using_multiline_anchors?(option) && options[:multiline] != true
+            raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
+            "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
+            ":multiline => true option?"
+          end
         end
       end
     end