missing_validators 0.3.0 → 0.4.0

data/README.md

@@ -50,6 +50,29 @@ RSpec matcher is also available for your convenience:
       it { should ensure_valid_email_format_of(:email) }
     end
 
+### UrlValidator
+
+With an ActiveRecord model:
+
+    class User < ActiveRecord::Base
+      attr_accessor :blog, :name
+      validates :blog, url: true
+    end
+
+Or any ruby class:
+
+    class User
+      include ActiveModel::Validations
+      attr_accessor :blog, :name
+      validates :blog, url: true
+    end
+
+RSpec matcher is also available for your convenience:
+
+    describe User do
+      it { should ensure_valid_url_format_of(:url) }
+    end
+
 ### InequalityValidator
 
 With an ActiveRecord model:

data/lib/missing_validators/validators/email_validator.rb

@@ -10,32 +10,19 @@ class EmailValidator < ActiveModel::EachValidator
   #
   # @param [Object] record object to validate
   # @param [String] attribute name of the object attribute to validate
-  # @param [Object] attribute attribute value
+  # @param [Object] value attribute value
   def validate_each(record, attribute, value)
-    domains = Array.wrap options[:domain]
-
     allow_blank = options[:allow_blank] || false
+    return if allow_blank && value.blank?
 
-    value = "" if allow_blank && !value
-
-    if !allow_blank && !value
-      message = options[:message] || I18n.t('errors.messages.email')
-      record.errors[attribute] << message
-      return
-    end
+    domains = Array.wrap(options[:domain])
+    email = value && value.downcase
+    in_valid_domain = domains.empty? ? true : domains.any? { |domain| email.end_with?(".#{domain.downcase}") }
 
-    valid_domain = true
-
-    valid_format = !!(value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i)
-    if domains.any?
-      valid_domain = domains.inject (false) do |acc, domain|
-        acc || value.end_with?(".#{domain}")
-      end
-    end
+    has_valid_format = !!(value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i)
 
-    unless valid_format && valid_domain
-      message = options[:message] || I18n.t('errors.messages.email')
-      record.errors[attribute] << message
+    unless in_valid_domain && has_valid_format
+      record.errors[attribute] << (options[:message] || I18n.t('errors.messages.email'))
     end
   end
-end
+end

data/lib/missing_validators/validators/inequality_validator.rb

@@ -11,7 +11,7 @@ class InequalityValidator < ActiveModel::EachValidator
   #
   # @param [Object] record object to validate
   # @param [String] attribute name of the object attribute to validate
-  # @param [Object] attribute attribute value
+  # @param [Object] value attribute value
   def validate_each(record, attribute, value)
     unequal_to_attr = options[:to]
 

data/lib/missing_validators/validators/url_validator.rb

@@ -11,18 +11,16 @@ class UrlValidator < ActiveModel::EachValidator
   #
   # @param [Object] record object to validate
   # @param [String] attribute name of the object attribute to validate
-  # @param [Object] attribute attribute value
+  # @param [Object] value attribute value
   def validate_each(record, attribute, value)
-    begin
-      uri = URI.parse value
-      valid_format = uri.kind_of? URI::HTTP
-    rescue
-      valid_format = false
-    end
+    uri = URI.parse(value)
+    raise URI::InvalidURIError unless uri.kind_of?(URI::HTTP)
 
-    unless valid_format
-      message = options[:message] || I18n.t('errors.messages.url')
-      record.errors[attribute] << message
-    end
+    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
+  rescue URI::InvalidURIError
+    record.errors[attribute] << (options[:message] || I18n.t('errors.messages.url'))
   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.3.0"
+  VERSION = "0.4.0"
 end

data/missing_validators.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'shoulda-matchers'
 
-  gem.add_dependency 'activemodel', '> 3.0.0'
+  gem.add_dependency 'activemodel', '~> 3.0.0'
+  gem.add_dependency 'activesupport', '~> 3.0.0'
 end

data/spec/validators/email_validator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe EmailValidator do
-  subject(:model){ klass.new }
+  subject { klass.new }
 
   context "email has valid format" do
     let(:klass) do
@@ -16,12 +16,11 @@ describe EmailValidator do
     it { should allow_value("super+user@example.com").for(:email) }
     it { should_not allow_value("user_example.com").for(:email) }
 
-
     it { should ensure_valid_email_format_of(:email) }
     it { should_not ensure_valid_email_format_of(:name) }
   end
 
-  context "email is in a specific domain" do
+  context "email is in the specific domain" do
     context "email domain specified as string" do
       let(:klass) do
         Class.new do
@@ -35,30 +34,19 @@ describe EmailValidator do
       it { should_not allow_value("user@example.com").for(:email) }
     end
 
-    context "email domain specified as symbol" do
-      let(:klass) do
-        Class.new do
-          include ActiveModel::Validations
-          attr_accessor :email
-          validates :email, email: { domain: :edu }
-        end
-      end
-
-      it { should allow_value("user@example.edu").for(:email) }
-      it { should_not allow_value("user@example.com").for(:email) }
-    end
-
     context "email set as an array of strings and symbols" do
       let(:klass) do
         Class.new do
           include ActiveModel::Validations
           attr_accessor :email
-          validates :email, email: { domain: ['com', :edu] }
+          validates :email, email: { domain: ['com', :edu, 'Com.Au'] }
         end
       end
 
       it { should allow_value("user@example.com").for(:email) }
       it { should allow_value("user@example.edu").for(:email) }
+      it { should allow_value("user@example.com.au").for(:email) }
+      it { should allow_value("user@example.Com.Au").for(:email) }
       it { should_not allow_value("user@example.org").for(:email) }
     end
   end

data/spec/validators/url_validator_spec.rb

@@ -1,35 +1,72 @@
 require 'spec_helper'
 
 describe UrlValidator do
-  let(:klass) do
-    Class.new do
-      include ActiveModel::Validations
-      attr_accessor :url, :name
-      validates :url, url: true
+  context "url has valid format" do
+    let(:klass) do
+      Class.new do
+        include ActiveModel::Validations
+        attr_accessor :url, :name
+        validates :url, url: true
+      end
     end
+
+    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.com").for(:url) }
+    it { should allow_value("http://FooBar.cOm").for(:url) }
+    it { should allow_value("http://foo.bar.baz.com").for(:url) }
+    it { should allow_value("http://123.com").for(:url) }
+    it { should allow_value("http://www.example.ru").for(:url) }
+    it { should allow_value("http://user-example.co.uk").for(:url) }
+    it { should allow_value("https://example.com").for(:url) }
+    it { should allow_value("http://example.org/").for(:url) }
+    it { should allow_value("https://example.net/index.html").for(:url) }
+    it { should allow_value("http://example.net/login.php").for(:url) }
+    it { should allow_value("https://example.travel/").for(:url) }
+    it { should allow_value("http://example.aero").for(:url) }
+    it { should allow_value("http://example.aero?foo=bar").for(:url) }
+
+    it { should_not allow_value("example").for(:url) }
+    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) }
   end
 
-  subject(:model){ 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.com").for(:url) }
-  it { should allow_value("http://FooBar.cOm").for(:url) }
-  it { should allow_value("http://foo.bar.baz.com").for(:url) }
-  it { should allow_value("http://123.com").for(:url) }
-  it { should allow_value("http://www.example.ru").for(:url) }
-  it { should allow_value("http://user-example.co.uk").for(:url) }
-  it { should allow_value("https://example.com").for(:url) }
-  it { should allow_value("http://example.org/").for(:url) }
-  it { should allow_value("https://example.net/index.html").for(:url) }
-  it { should allow_value("http://example.net/login.php").for(:url) }
-  it { should allow_value("https://example.travel/").for(:url) }
-  it { should allow_value("http://example.aero").for(:url) }
-  it { should allow_value("http://example.aero?foo=bar").for(:url) }
-
-  it { should_not allow_value("example").for(:url) }
-  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) }
+  context "url is in the specified domain" do
+    let(:klass) do
+      Class.new do
+        include ActiveModel::Validations
+        attr_accessor :url, :name
+        validates :url, url: { domain: :org }
+      end
+    end
+
+    subject { klass.new }
+
+    it { should ensure_valid_url_format_of(:url) }
+    it { should allow_value("http://example.org").for(:url) }
+    it { should_not allow_value("http://example.com").for(:url) }
+  end
+
+  context "email set as an 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
+    end
+
+    subject { klass.new }
+
+    it { should ensure_valid_url_format_of(:url) }
+    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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing_validators
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156739940 !ruby/object:Gem::Requirement
+  requirement: &70241132959780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156739940
+  version_requirements: *70241132959780
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &2156739000 !ruby/object:Gem::Requirement
+  requirement: &70241132957560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156739000
+  version_requirements: *70241132957560
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2156737100 !ruby/object:Gem::Requirement
+  requirement: &70241132955500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156737100
+  version_requirements: *70241132955500
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70241132954740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70241132954740
 description: Adds some handy validators.
 email:
 - andrew.gridnev@gmail.com
@@ -101,4 +112,3 @@ test_files:
 - spec/validators/email_validator_spec.rb
 - spec/validators/inequality_validator_spec.rb
 - spec/validators/url_validator_spec.rb
-has_rdoc: