missing_validators 0.5.2 → 0.6.0

data/README.md

@@ -73,6 +73,8 @@ 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, 'edu'] }
     validates :url, url: { root: true }
+    validates :url, url: { scheme: :http }
+    validates :url, url: { scheme: [:http, 'https'] }
 
 RSpec matcher is also available for your convenience:
 

data/lib/missing_validators/validators/url_validator.rb

@@ -14,18 +14,32 @@ class UrlValidator < ActiveModel::EachValidator
   # @param [Object] value attribute value
   def validate_each(record, attribute, value)
     uri = URI.parse(value)
-    raise URI::InvalidURIError unless uri.kind_of?(URI::HTTP)
 
-    domains = Array.wrap(options[:domain])
-    host = uri.host.downcase
-    in_valid_domain = domains.empty? || domains.any? { |domain| host.end_with?(".#{domain.downcase}") }
-    raise URI::InvalidURIError unless in_valid_domain
+    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))
 
-    must_be_domain_root = options[:root] || false
-    if must_be_domain_root && (!['/', ''].include?(uri.path) || uri.query.present? || uri.fragment.present?)
       raise URI::InvalidURIError
     end
+
   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}") }
+  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 }
+  end
+
+  def is_root?(uri)
+    ['/', ''].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.5.2"
+  VERSION = "0.6.0"
 end

data/spec/validators/url_validator_spec.rb

@@ -35,62 +35,69 @@ describe UrlValidator do
     it { should_not allow_value("http://user_example.a").for(:url) }
   end
 
-  context "url is in the specific domain" do
-    context "url specified as symbol" do
-      let(:klass) do
-        Class.new do
-          include ActiveModel::Validations
-          attr_accessor :url, :name
-          validates :url, url: { domain: :org }
-        end
+  describe "url must be in a specific domain" do
+    let(:klass) do
+      Class.new do
+        include ActiveModel::Validations
+        attr_accessor :url1, :url2
+        validates :url1, url: { domain: :org }
+        validates :url2, url: { domain: [:org, 'edu', 'Com.Au'] }
       end
+    end
 
-      subject { klass.new }
+    subject { klass.new }
 
-      it { should ensure_valid_url_format_of(:url) }
-      it { should_not ensure_valid_url_format_of(:name) }
+    it { should allow_value("http://example.org").for(:url1) }
+    it { should_not allow_value("http://example.com").for(:url1) }
 
-      it { should allow_value("http://example.org").for(:url) }
-      it { should_not allow_value("http://example.com").for(:url) }
-    end
+    it { should allow_value("http://example.org").for(:url2) }
+    it { should allow_value("http://example.edu").for(:url2) }
+    it { should allow_value("http://example.com.au").for(:url2) }
+    it { should allow_value("http://example.Com.Au").for(:url2) }
+    it { should_not allow_value("http://example.com").for(:url2) }
+  end
 
-    context "url specified as array of strings and symbols" do
-      let(:klass) do
-        Class.new do
-          include ActiveModel::Validations
-          attr_accessor :url, :name
-          validates :url, url: { domain: [:org, 'edu', 'Com.Au'] }
-        end
+  describe "url must be domain root" do
+    let(:klass) do
+      Class.new do
+        include ActiveModel::Validations
+        attr_accessor :url1, :url2
+        validates :url1, url: { root: true }
+        validates :url2, url: { root: false }
       end
+    end
 
-      subject { klass.new }
+    subject { klass.new }
 
-      it { should ensure_valid_url_format_of(:url) }
-      it { should_not ensure_valid_url_format_of(:name) }
+    it { should allow_value("http://example.org").for(:url1) }
+    it { should allow_value("http://example.org/").for(:url1) }
+    it { should_not allow_value("http://example.com/test").for(:url1) }
+    it { should_not allow_value("http://example.com/#fragment").for(:url1) }
+    it { should_not allow_value("http://example.com/?key=value").for(:url1) }
 
-      it { should allow_value("http://example.org").for(:url) }
-      it { should allow_value("http://example.edu").for(:url) }
-      it { should allow_value("http://example.com.au").for(:url) }
-      it { should allow_value("http://example.Com.Au").for(:url) }
-      it { should_not allow_value("http://example.com").for(:url) }
-    end
+
+    it { should allow_value("http://example.org").for(:url2) }
+    it { should allow_value("http://example.org/lorem").for(:url2) }
   end
 
-  context "url must be domain root" do
+  describe "url must have a specific scheme" do
     let(:klass) do
       Class.new do
         include ActiveModel::Validations
-        attr_accessor :url, :name
-        validates :url, url: { root: true }
+        attr_accessor :url1, :url2
+        validates :url1, url: { scheme: 'http' }
+        validates :url2, url: { scheme: ['HTTP', :https] }
       end
     end
 
     subject { klass.new }
 
-    it { should allow_value("http://example.org").for(:url) }
-    it { should allow_value("http://example.org/").for(:url) }
-    it { should_not allow_value("http://example.com/test").for(:url) }
-    it { should_not allow_value("http://example.com/#fragment").for(:url) }
-    it { should_not allow_value("http://example.com/?key=value").for(:url) }
+    it { should allow_value("http://example.org").for(:url1) }
+    it { should_not allow_value("https://example.org").for(:url1) }
+
+    it { should allow_value("http://example.org").for(:url2) }
+    it { should allow_value("https://example.org").for(:url2) }
+    it { should allow_value("HTTPS://example.org").for(:url2) }
+    it { should_not allow_value("ftp://example.org").for(:url2) }
   end
 end

metadata

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