lib/scrivener/validations.rb in scrivener-0.3.0 vs lib/scrivener/validations.rb in scrivener-0.4.0
- old
+ new
@@ -119,11 +119,11 @@
if assert_present(att, error)
assert_format(att, /\A\-?\d+\z/, error)
end
end
- URL = /\A(http|https):\/\/([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}|(2
+ URL = /\A(http|https):\/\/([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,12}|(2
5[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}
|localhost)(:[0-9]{1,5})?(\/.*)?\z/ix
def assert_url(att, error = [att, :not_url])
if assert_present(att, error)
@@ -132,10 +132,10 @@
end
EMAIL = /\A([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*
[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@
((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+
- [a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)\z/ix
+ [a-z]{2,12})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)\z/ix
def assert_email(att, error = [att, :not_email])
if assert_present(att, error)
assert_format(att, EMAIL, error)
end