missing_validators 0.6.0 → 0.6.3

data/README.md

@@ -72,7 +72,13 @@ You can specify domains to which the URL domain should belong in one of the folo
     validates :url, url: { domains: 'com' }
     validates :url, url: { domains: :com }
     validates :url, url: { domains: [:com, 'edu'] }
+
+You can specify if the URL should the site root:
+
     validates :url, url: { root: true }
+
+You can specify the URL scheme:
+
     validates :url, url: { scheme: :http }
     validates :url, url: { scheme: [:http, 'https'] }
 

data/lib/missing_validators/validators/email_validator.rb

@@ -15,14 +15,24 @@ class EmailValidator < ActiveModel::EachValidator
     allow_blank = options[:allow_blank] || false
     return if allow_blank && value.blank?
 
-    domains = Array.wrap(options[:domain])
-    email = value && value.downcase || ''
-    in_valid_domain = domains.empty? ? true : domains.any? { |domain| email.end_with?(".#{domain.downcase}") }
-
-    has_valid_format = !!(value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i)
-
-    unless in_valid_domain && has_valid_format
+    unless valid?(value, options)
       record.errors[attribute] << (options[:message] || I18n.t('errors.messages.email'))
     end
   end
+
+  private
+
+  def valid?(email, options)
+    validate_format(email) \
+      && validate_domain(email, Array.wrap(options[:domain]))
+  end
+
+  def validate_format(email)
+    !!(email =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i)
+  end
+
+  def validate_domain(email, domains)
+    email_downcased = email.to_s.downcase
+    domains.empty? || domains.any? { |domain| email_downcased.end_with?(".#{domain.downcase}") }
+  end
 end

data/lib/missing_validators/validators/url_validator.rb

@@ -14,32 +14,34 @@ class UrlValidator < ActiveModel::EachValidator
   # @param [Object] value attribute value
   def validate_each(record, attribute, value)
     uri = URI.parse(value)
-
-    unless uri.kind_of?(URI::HTTP) \
-      && in_valid_top_level_domains?(uri, Array.wrap(options[:domain])) \
-      && with_valid_scheme?(uri, Array.wrap(options[:scheme])) \
-      && (!!!options[:root] || is_root?(uri))
-
-      raise URI::InvalidURIError
-    end
-
+    raise URI::InvalidURIError unless valid?(uri, options)
   rescue URI::InvalidURIError
     record.errors[attribute] << (options[:message] || I18n.t('errors.messages.url'))
   end
 
   private
 
-  def in_valid_top_level_domains?(uri, tlds)
-    host_downcased = uri.host.downcase
-    tlds.empty? || tlds.map(&:downcase).any? { |domain| host_downcased.end_with?(".#{domain}") }
+  DEFAULT_SCHEMES = [:http, :https]
+
+  def valid?(uri, options)
+    uri.kind_of?(URI::Generic) \
+      && validate_domain(uri, Array.wrap(options[:domain])) \
+      && validate_scheme(uri, Array.wrap(options[:scheme] || UrlValidator::DEFAULT_SCHEMES)) \
+      && validate_root(uri, !!options[:root])
+  end
+
+  def validate_domain(uri, domains)
+    host_downcased = uri.host.to_s.downcase
+    domains.empty? || domains.any? { |domain| host_downcased.end_with?(".#{domain.downcase}") }
   end
 
-  def with_valid_scheme?(uri, schemes)
-    scheme_downcased = uri.scheme.downcase
-    schemes.empty? || schemes.map(&:to_s).map(&:downcase).any? { |scheme| scheme_downcased == scheme }
+  def validate_scheme(uri, schemes)
+    scheme_downcased = uri.scheme.to_s.downcase
+    schemes.empty? || schemes.any? { |scheme| scheme_downcased == scheme.to_s.downcase }
   end
 
-  def is_root?(uri)
+  def validate_root(uri, should_validate)
+    return true unless should_validate
     ['/', ''].include?(uri.path) && uri.query.blank? && uri.fragment.blank?
   end
 end

data/lib/missing_validators/version.rb

@@ -1,5 +1,5 @@
 # Provides a collection of custom validators that are often required in Rails applications.
 module MissingValidators
   # Gem version.
-  VERSION = "0.6.0"
+  VERSION = "0.6.3"
 end

data/spec/validators/url_validator_spec.rb

@@ -33,6 +33,7 @@ describe UrlValidator do
     it { should_not allow_value("http://user_examplecom").for(:url) }
     it { should_not allow_value("http://user_example.com").for(:url) }
     it { should_not allow_value("http://user_example.a").for(:url) }
+    it { should_not allow_value("ftp://foo.bar.baz.com").for(:url) }
   end
 
   describe "url must be in a specific domain" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing_validators
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348494356240 !ruby/object:Gem::Requirement
+  requirement: &70244538802020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348494356240
+  version_requirements: *70244538802020
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &70348494355460 !ruby/object:Gem::Requirement
+  requirement: &70244538801180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348494355460
+  version_requirements: *70244538801180
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70348494354760 !ruby/object:Gem::Requirement
+  requirement: &70244538800500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348494354760
+  version_requirements: *70244538800500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70348494353960 !ruby/object:Gem::Requirement
+  requirement: &70244538799780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348494353960
+  version_requirements: *70244538799780
 description: Validates email addresses, URLs, and inequality of attributes.
 email:
 - andrew.gridnev@gmail.com