activevalidators 1.9.0 → 2.0.0

data/.travis.yml

@@ -1,10 +1,7 @@
-# Offical support for MRIs + REE
+language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
-  - ree
-  - rbx-18mode
+  - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
-  - jruby
+  - ruby-head

data/README.md

@@ -1,4 +1,4 @@
-# ActiveValidators [![Travis](https://secure.travis-ci.org/cesario/activevalidators.png)](http://travis-ci.org/cesario/activevalidators)
+# ActiveValidators [![Travis](https://secure.travis-ci.org/franckverrot/activevalidators.png)](http://travis-ci.org/franckverrot/activevalidators)
 
 # Description
 
@@ -98,4 +98,4 @@ Lots of improvements can be made:
 
 ## Copyright
 
-Copyright (c) 2010-2011 Franck Verrot. MIT LICENSE. See LICENSE for details.
+Copyright (c) 2010-2012 Franck Verrot. MIT LICENSE. See LICENSE for details.

data/activevalidators.gemspec

@@ -1,22 +1,25 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
-  s.name        = "activevalidators"
-  s.version     = '1.9.0'
+  s.name        = 'activevalidators'
+  s.version     = '2.0.0'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel", "Renato Riccieri Santos Zannon", "Brian Moseley"]
-  s.email       = ["franck@verrot.fr"]
-  s.homepage    = "http://github.com/cesario/activevalidators"
+  s.authors     = ['Franck Verrot', 'Paco Guzmán', 'Oriol Gual', 'Garrett Bjerkhoel', 'Renato Riccieri Santos Zannon', 'Brian Moseley']
+  s.email       = ['franck@verrot.fr']
+  s.homepage    = 'http://github.com/franckverrot/activevalidators'
   s.summary     = %q{Collection of ActiveModel/ActiveRecord validations}
   s.description = %q{ActiveValidators is a collection of ActiveModel/ActiveRecord validations}
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "minitest"
+  s.required_ruby_version = '>= 1.9.2'
+
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'minitest'
   s.add_dependency 'rake'          , '>= 0.8.7'
   s.add_dependency 'activemodel'   , '>= 3.0.0'
+  s.add_dependency 'phony'         , '~> 1.7.4'
+  s.add_dependency 'countries'     , '~> 0.8.2'
   s.add_dependency 'mail'
   s.add_dependency 'date_validator'
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
 end
-

data/lib/active_model/validations/email_validator.rb

@@ -2,24 +2,29 @@ require 'mail'
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
-      EMAIL_REGEXP = %r{\A[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}\z}
-
-      def validate_each(record,attribute,value)
-        opts = options.dup
-        opts[:strict] ||= false
-
+      def validate_each(record, attribute, value)
+        # takes from: https://github.com/hallelujah/valid_email
         begin
-          address = Mail::Address.new(value)
-          valid   = address.domain && 
-                    value.include?(address.address) &&
-                    ( 
-                      !opts[:strict] || 
-                      address.domain.match(EMAIL_REGEXP) 
-                    )
-        rescue Mail::Field::ParseError
+          mail = Mail::Address.new(value)
+          # We must check that value contains a domain and that value is an email address
+          valid = mail.domain && value.include?(mail.address)
+
+          if options[:only_address]
+            # We need to dig into treetop
+            # A valid domain must have dot_atom_text elements size > 1
+            # user@localhost is excluded
+            # treetop must respond to domain
+            # We exclude valid email values like <user@localhost.com>
+            # Hence we use m.__send__(tree).domain
+            tree = mail.__send__(:tree)
+            valid &&= (tree.domain.dot_atom_text.elements.size > 1)
+          else
+            valid &&= (mail.domain.split('.').length > 1)
+          end
+        rescue Exception => e
           valid = false
         end
-        record.errors.add(attribute) unless valid
+        record.errors.add attribute, (options[:message]) unless valid
       end
     end
   end

data/lib/active_model/validations/phone_validator.rb

@@ -2,28 +2,8 @@ module ActiveModel
   module Validations
     class PhoneValidator < EachValidator
       def validate_each(record, attribute, value)
-        @value = value
-        @formats = PhoneValidator.known_formats[options[:country]] || PhoneValidator.known_formats[:us]
-        record.errors.add(attribute) if value.blank? || !matches_any?
-      end
-
-      def self.known_formats
-        @@known_formats ||=
-        {:us     => ["###-###-####", "##########", "###.###.####", "### ### ####", "(###) ###-####"],
-         :brazil => ["## ####-####", "(##) ####-####", "##########"],
-         :france => ["## ## ## ## ##"],
-         :uk     => ["#### ### ####"]}
-      end
-
-      def matches_any?
-        false if @formats.nil? or not @formats.respond_to?(:detect)
-        @formats.detect { |format| @value.match(PhoneValidator.regexp_from format) }
-      end
-
-      private
-
-      def self.regexp_from(format)
-        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d')+"$"
+        country_code = Country.new(options[:country].to_s.upcase).country_code unless options[:country].blank?
+        record.errors.add(attribute, options[:message]) if value.blank? || ! (options[:country].blank? ? Phony.plausible?(value) : Phony.plausible?(value, cc: country_code) )
       end
 
     end

data/lib/active_model/validations/postal_code_validator.rb

@@ -17,8 +17,62 @@ module ActiveModel
 
       def self.known_formats
         @@known_formats ||= {
-          'us' => ['#####', '#####-####'],
+          'ad' => ['AD###', '###'],
+          'ar' => ['####', '@####@@@'],
+          'at' => ['####'],
+          'au' => ['####'],
+          'bg' => ['####'],
+          'be' => ['####'],
+          'bg' => ['####'],
+          'br' => ['#####-###', '########'],
+          'ca' => ['@#@ #@#', '@#@#@#'],
+          'ch' => ['####'],
+          'cz' => ['### ##', '#####'],
+          'de' => ['#####'],
+          'dk' => ['####'],
+          'dr' => ['#####'],
+          'sp' => ['#####'],
+          'fi' => ['#####'],
+          'fr' => ['#####'],
+          'uk' => ['@# #@@', '@## #@@', '@@# #@@', '@@## #@@', '@#@ #@@', '@@#@ #@@'],
+          'gf' => ['#####'],
+          'gl' => ['####'],
+          'gp' => ['#####'],
+          'gt' => ['#####'],
+          'hr' => ['HR-#####', 'H#####'],
+          'hu' => ['####'],
+          'in' => ['######'],
+          'ic' => ['###'],
+          'it' => ['#####'],
+          'jp' => ['###-####', '#######'],
+          'li' => ['####'],
+          'lk' => ['#####'],
+          'lt' => ['LT-#####', '#####'],
+          'lu' => ['####'],
+          'mc' => ['#####'],
+          'md' => ['MD-####'],
+          'mk' => ['####'],
+          'mq' => ['#####'],
+          'mx' => ['#####'],
+          'my' => ['#####'],
+          'nl' => ['#### @@', '####@@'],
+          'no' => ['####'],
+          'ph' => ['####'],
+          'pk' => ['#####'],
+          'pl' => ['##-###', '#####'],
+          'pm' => ['#####'],
           'pt' => ['####', '####-###'],
+          'ru' => ['######'],
+          'se' => ['SE-#### ##', '#### ##', '######'],
+          'si' => ['SI- ####', 'SI-####', '####'],
+          'sk' => ['### ##', '#####'],
+          'sm' => ['4789#', '#'],
+          'th' => ['#####'],
+          'tr' => ['#####'],
+          'tr' => ['#####'],
+          'us' => ['#####', '#####-####'],
+          'wf' => ['#####'],
+          'za' => ['####']
         }
       end
 
@@ -30,7 +84,7 @@ module ActiveModel
       private
 
       def self.regexp_from(format)
-        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d')+"$"
+        Regexp.new "^"+(Regexp.escape format).gsub(/[@#]/, '@' => '[[:alpha:]]', '#' => 'd')+"$"
       end
     end
   end

data/lib/active_model/validations/url_validator.rb

@@ -1,15 +1,84 @@
+require 'uri'
+
 module ActiveModel
   module Validations
+
+    # Public: Uses `URI.regexp` to validate URLs, by default only allows
+    # the http and https protocols.
+    #
+    # Examples
+    #
+    #    validates :url, :url => true
+    #    # => only allow http, https
+    #
+    #    validates :url, :url => %w{http https ftp ftps}
+    #    # => allow http, https, ftp and ftps
+    #
     class UrlValidator < EachValidator
-      class << self
-        attr_accessor :url_regex
+
+      # Public: Creates a new instance, overrides `:protocols` if either
+      # `:with` or `:in` are defined, to allow for shortcut setters.
+      #
+      # Examples:
+      #
+      #     validates :url, :url => { :protocols => %w{http https ftp} }
+      #     # => accepts http, https and ftp URLs
+      #
+      #     validates :url, :url => 'https'
+      #     # => accepts only https URLs (shortcut form of above)
+      #
+      #     validates :url, :url => true
+      #     # => by default allows only http and https
+      #
+      # Raises an ArgumentError if the array with the allowed protocols
+      # is empty.
+      #
+      # Returns a new instance.
+      def initialize(options)
+        options[:protocols] ||= options.delete(:protocol) || options.delete(:with) || options.delete(:in)
+        super
       end
-      # Damn complex regex found on GWave https://wave.google.com/wave/?pli=1#restored:wave:googlewave.com!w%252BsFbGJUukA
-      self.url_regex = /^(?#Protocol)(?:(?:ht|f)tp(?:s?)\:\/\/|~\/|\/)?(?#Username:Password)(?:\w+:\w+@)?(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:\/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|\/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?$/
+
+      # Internal: Ensures that at least one protocol is defined. If the protocols
+      # are empty it throws an ArgumentError.
+      #
+      # Raises ArgumentError if protocols is empty.
+      #
+      # Returns nothing.
+      def check_validity!
+        raise ArgumentError, "At least one URI protocol is required" if protocols.empty?
+      end
+
+      # Internal: Returns an array of protocols to use with the URI regexp.
+      # The default protocols are `http` and `https`.
+      #
+      # Returns the Array with the allowed protocols.
+      def protocols
+        Array.wrap(options[:protocols] || %w{http https})
+      end
+
+      # Internal: Constructs the regular expression to check
+      # the URI for the configured protocols.
+      #
+      # Returns the Regexp.
+      def uri_regexp
+        @uri_regexp ||= URI.regexp(protocols)
+      end
+
+      # Internal: Tries to convert supplied string into URI,
+      # if not possible returns nil => invalid URI.
+      #
+      # Returns the URI or nil.
+      def as_uri(value)
+        URI.parse(value.to_s) rescue nil if value.present?
+      end
+
+      # Public: Validate URL, if it fails adds an error.
+      #
+      # Returns nothing.
       def validate_each(record, attribute, value)
-        unless value =~ self.class.url_regex
-          record.errors.add(attribute)
-        end
+        uri = as_uri(value)
+        record.errors.add(attribute) unless uri && value.to_s =~ uri_regexp
       end
     end
   end

data/lib/activevalidators.rb

@@ -1,4 +1,6 @@
 require 'active_model'
+require 'phony'
+require 'countries'
 
 module ActiveModel
   module Validations

data/test/validations/email_test.rb

@@ -2,7 +2,7 @@ require 'test_helper.rb'
 
 describe "Email Validation" do
   describe "strict: true" do
-    
+
     it "accepts valid emails" do
       subject = build_email_record({:email => 'franck@verrot.fr'}, {:strict => true})
       subject.valid?.must_equal true
@@ -14,60 +14,60 @@ describe "Email Validation" do
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
-    
+
     it "accepts complete emails" do
       subject = build_email_record({:email => 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'}, {:strict => true})
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
-    
-    it "accepts complete emails" do
+
+    it "accepts email addresses without TLD" do
       subject = build_email_record({:email => 'franck@verrotfr'}, {:strict => true})
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
   end
-  
+
   describe "strict: false (default)" do
     it "accepts valid emails" do
       subject = build_email_record :email => 'franck@verrot.fr'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
-      
+
     it "accepts valid emails" do
       subject = build_email_record :email => 'franck@edu.verrot-gouv.fr'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
-      
+
     it "accepts complete emails" do
       subject = build_email_record :email => 'Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
-    
-    it "accepts complete emails" do
+
+    it "rejects email addresses without TLD" do
       subject = build_email_record :email => 'franck@verrotfr'
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
     end
   end
-  
+
   describe "for invalid emails" do
     it "rejects invalid emails" do
       subject = build_email_record :email => 'franck.fr'
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
-      
+
     it 'rejects local emails' do
       subject = build_email_record :email => 'franck.fr'
       subject.email = 'franck'
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
-      
+
     it 'generates an error message of type invalid' do
       subject = build_email_record :email => 'franck.fr'
       subject.valid?.must_equal false

data/test/validations/phone_test.rb

@@ -11,64 +11,53 @@ describe "Phone Validation" do
   describe "when no country is given" do
     it 'should validate format of phone with ###-###-####' do
       subject = build_phone_validation true
-      subject.phone = '999-999-9999'
+      subject.phone = '1-999-999-9999'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
 
     it 'should validate format of phone with ##########' do
       subject = build_phone_validation true
-      subject.phone = '9999999999'
+      subject.phone = '19999999999'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
 
     it 'should validate format of phone with ###.###.####' do
       subject = build_phone_validation true
-      subject.phone = '999.999.9999'
+      subject.phone = '1999.999.9999'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
 
     it 'should validate format of phone with ### ### ####' do
       subject = build_phone_validation true
-      subject.phone = '999 999 9999'
+      subject.phone = '1999 999 9999'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
 
     it 'should validate format of phone with (###) ###-####' do
       subject = build_phone_validation true
-      subject.phone = '(999) 999-9999'
+      subject.phone = '1(999) 999-9999'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
 
   end
 
-  ActiveModel::Validations::PhoneValidator.known_formats.each do |country, formats|
-    describe "when given a :#{country} country parameter" do
-      formats.each do |format|
-        it "should validate format of phone with #{format}" do
-          subject = build_phone_validation :country => country
-          subject.phone = format.gsub('#','9')
-          subject.valid?.must_equal true
-          subject.errors.size.must_equal 0
-        end
-      end
-    end
-  end
-
 
   describe "for invalid formats" do
     it "rejects invalid formats" do
-      subject = build_phone_validation true, :phone => '999'
+      subject = build_phone_validation true
+      subject.phone = '999'
       subject.valid?.must_equal false
       subject.errors.size.must_equal 1
     end
 
     it "generates an error message of type invalid" do
-      subject = build_phone_validation true, :phone => '999'
+      subject = build_phone_validation true
+      subject.phone = '999'
       subject.valid?.must_equal false
       subject.errors[:phone].include?(subject.errors.generate_message(:phone, :invalid)).must_equal true
     end

data/test/validations/postal_code_test.rb

@@ -28,7 +28,7 @@ describe "Postal Code Validation" do
       formats.each do |format|
         it "should validate format of postal code with #{format}" do
           subject = build_postal_code_record :country => country
-          subject.postal_code = format.gsub('#','9')
+          subject.postal_code = format.gsub(/[@#]/, '@' => 'A', '#' => '9')
           subject.valid?.must_equal true
           subject.errors.size.must_equal 0
         end

data/test/validations/url_test.rb

@@ -7,6 +7,12 @@ describe "Url Validation" do
     TestRecord.new
   end
 
+  def build_ftp_record
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :url, :url => 'ftp'
+    TestRecord.new
+  end
+
   describe "valid urls" do
     it "accepts urls without port number" do
       subject = build_url_record
@@ -28,12 +34,20 @@ describe "Url Validation" do
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
+
     it "accepts valid SSL urls" do
       subject = build_url_record
       subject.url = 'https://www.verrot.fr'
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end
+
+    it "accepts ftp if defined" do
+      subject = build_ftp_record
+      subject.url = 'ftp://ftp.verrot.fr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
   end
 
   describe "for invalid urls" do
@@ -50,5 +64,26 @@ describe "Url Validation" do
       subject.valid?.must_equal false
       subject.errors[:url].include?(subject.errors.generate_message(:url, :invalid)).must_equal true
     end
+
+    it "rejects nil urls" do
+      subject = build_url_record
+      subject.url = nil
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "rejects empty urls" do
+      subject = build_url_record
+      subject.url = ''
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "rejects invalid protocols" do
+      subject = build_url_record
+      subject.url = 'ftp://ftp.verrot.fr'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152419540700 !ruby/object:Gem::Requirement
+  requirement: &70278581021300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152419540700
+  version_requirements: *70278581021300
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70152419540020 !ruby/object:Gem::Requirement
+  requirement: &70278581019760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,10 +37,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152419540020
+  version_requirements: *70278581019760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152419506560 !ruby/object:Gem::Requirement
+  requirement: &70278581018660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,10 +48,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70152419506560
+  version_requirements: *70278581018660
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70152419506060 !ruby/object:Gem::Requirement
+  requirement: &70278581017920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,10 +59,32 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152419506060
+  version_requirements: *70278581017920
+- !ruby/object:Gem::Dependency
+  name: phony
+  requirement: &70278581017380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70278581017380
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: &70278581016540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70278581016540
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70152419505620 !ruby/object:Gem::Requirement
+  requirement: &70278581010060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,10 +92,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152419505620
+  version_requirements: *70278581010060
 - !ruby/object:Gem::Dependency
   name: date_validator
-  requirement: &70152419504580 !ruby/object:Gem::Requirement
+  requirement: &70278581008820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -81,7 +103,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152419504580
+  version_requirements: *70278581008820
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
 email:
 - franck@verrot.fr
@@ -121,7 +143,7 @@ files:
 - test/validations/tracking_number_test.rb
 - test/validations/twitter_test.rb
 - test/validations/url_test.rb
-homepage: http://github.com/cesario/activevalidators
+homepage: http://github.com/franckverrot/activevalidators
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -132,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: