From 58c49966fa73469e324c51e26d8bc9a482627818 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 23 Jun 2016 17:18:02 +0200 Subject: [PATCH] updated validator based on feedback --- app/validators/addressable_url_validator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/validators/addressable_url_validator.rb b/app/validators/addressable_url_validator.rb index 64e8581e0d3..cbb80b5c68e 100644 --- a/app/validators/addressable_url_validator.rb +++ b/app/validators/addressable_url_validator.rb @@ -29,9 +29,7 @@ class AddressableUrlValidator < ActiveModel::EachValidator value.strip! - valid_uri?(value) && valid_protocol?(value) - rescue Addressable::URI::InvalidURIError - false + valid_protocol?(value) && valid_uri?(value) end def default_options @@ -40,6 +38,8 @@ class AddressableUrlValidator < ActiveModel::EachValidator def valid_uri?(value) Addressable::URI.parse(value).is_a?(Addressable::URI) + rescue Addressable::URI::InvalidURIError + false end def valid_protocol?(value)