activevalidators 1.6.0 → 1.7.0

data/README.md

@@ -1,4 +1,4 @@
-ActiveValidators [![Travis](http://travis-ci.org/cesario/activevalidators.png)](http://travis-ci.org/cesario/activevalidators)
+ActiveValidators [![Travis](https://secure.travis-ci.org/cesario/activevalidators.png)](http://travis-ci.org/cesario/activevalidators)
 ================
 
 Collection of ActiveModel/ActiveRecord validations
@@ -12,6 +12,7 @@ In your Gemfile ( >>= 1.1.0 ):
 
 In your models, the gem provides new validators like `email`, or `url`:
 
+```ruby
     class User
       validates :email_address, :email => true
       validates :link_url,      :url   => true
@@ -38,6 +39,7 @@ In your models, the gem provides new validators like `email`, or `url`:
     end
 
     class Account
+      validates :any_card,      :credit_card => true
       validates :visa_card,     :credit_card => { :type => :visa }
       validates :credit_card,   :credit_card => { :type => :any  }
     end
@@ -45,7 +47,7 @@ In your models, the gem provides new validators like `email`, or `url`:
     class Order
       validates :tracking_num,  :tracking_number => { :carrier => :ups }
     end
-
+```
 
 Exhaustive list of supported validators and their implementation:
 

data/lib/active_model/validations/credit_card_validator.rb

@@ -3,7 +3,8 @@ module ActiveModel
 
     class CreditCardValidator < EachValidator
       def validate_each(record, attribute, value)
-        record.errors.add(attribute) unless Luhn.valid?(options[:type], sanitize_card(value))
+        type = options.fetch(:type, :any)
+        record.errors.add(attribute) if value.blank? || !Luhn.valid?(type, sanitize_card(value))
       end
 
       def sanitize_card(value)
@@ -23,6 +24,10 @@ module ActiveModel
           self.luhn_valid?(number) and !(number !~ /^5[1-5].{14}/)
         end
 
+        class << self
+          alias :master_card? :mastercard?
+        end
+
         def self.visa?(number)
           self.luhn_valid?(number) and !(number !~ /^4.{15}/)
         end
@@ -31,6 +36,15 @@ module ActiveModel
           self.luhn_valid?(number) and !(number !~ /^3[47].{13}/)
         end
 
+        [:diners_club, :en_route, :discover, :jcb, :carte_blanche, :switch,
+          :solo, :laser].each do |card_type|
+          class_eval <<-VALIDATOR, __FILE__, __LINE__ + 1
+          def self.#{card_type}?(number)
+            self.luhn_valid?(number)
+          end
+          VALIDATOR
+        end
+
         def self.luhn_valid?(s)
           return false unless s && s.is_a?(String)
           return false if s.empty?
@@ -49,7 +63,6 @@ module ActiveModel
               end
           } % 10 == 0
         end
-
       end
     end
 

data/lib/active_model/validations/ip_validator.rb

@@ -2,7 +2,7 @@ module ActiveModel
   module Validations
     class IpValidator < EachValidator
       def validate_each(record, attribute, value)
-        record.errors.add(attribute) unless regex.match(value)
+        record.errors.add(attribute) if value.blank? || !regex.match(value)
       end
 
       def check_validity!

data/lib/active_model/validations/phone_validator.rb

@@ -4,9 +4,7 @@ module ActiveModel
       def validate_each(record, attribute, value)
         @value = value
         @formats = PhoneValidator.known_formats[options[:country]] || PhoneValidator.known_formats[:us]
-        unless matches_any?
-          record.errors.add(attribute)
-        end
+        record.errors.add(attribute) if value.blank? || !matches_any?
       end
 
       def self.known_formats

data/lib/active_model/validations/postal_code_validator.rb

@@ -6,7 +6,7 @@ module ActiveModel
         country = options[:country] || :us
         @formats = PostalCodeValidator.known_formats[country]
         raise "No known postal code formats for country #{country}" unless @formats
-        record.errors.add(attribute) unless matches_any?
+        record.errors.add(attribute) if value.blank? || !matches_any?
       end
 
       def self.known_formats

data/lib/active_model/validations/tracking_number_validator.rb

@@ -6,7 +6,7 @@ module ActiveModel
         raise "Carrier option required" unless carrier
         method = "valid_#{carrier.to_s}?"
         raise "Tracking number validation not supported for carrier #{carrier}" unless self.respond_to?(method)
-        record.errors.add(attribute) unless self.send(method, value)
+        record.errors.add(attribute) if value.blank? || !self.send(method, value) 
       end
 
       # UPS:

data/lib/active_model/validations/url_validator.rb

@@ -1,8 +1,13 @@
 module ActiveModel
   module Validations
     class UrlValidator < EachValidator
+      class << self
+        attr_accessor :url_regex
+      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})*)?$/
       def validate_each(record, attribute, value)
-        unless value =~ /^https?:\/\/(?i)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/
+        unless value =~ self.class.url_regex
           record.errors.add(attribute)
         end
       end

data/lib/active_validators/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveValidators
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/lib/activevalidators.rb

@@ -1,26 +1,18 @@
-require 'active_support'
 require 'active_model'
-require 'active_record'
-require 'active_support/all'
-require 'active_model/validations'
 
 module ActiveModel
   module Validations
-    extend ActiveSupport::Autoload
-
     def self.activevalidators
-      ['Email','Url','RespondTo','Phone','Slug','Ip','CreditCard','Date','Password','Twitter','PostalCode',
-        'TrackingNumber']
+      %w(email url respond_to phone slug ip credit_card date password twitter postal_code tracking_number)
     end
 
-    #Eager autoload the library's validators into AR::Validations
     activevalidators.each do |validator_name|
-      autoload validator_name+'Validator'
+      require "active_model/validations/#{validator_name}_validator"
     end
 
     #Defines methods like validates_credit_card
     module HelperMethods
-      ActiveModel::Validations.activevalidators.map(&:underscore).each do |validator|
+      ActiveModel::Validations.activevalidators.each do |validator|
         define_method('validates_'+validator) do |*fields|
           options ||= (fields.delete fields.find { |f| f.kind_of? Hash}) || true
           args = fields.push({ validator => options })

data/test/validations/credit_card_test.rb

@@ -29,26 +29,43 @@ describe "Credit Card Validation" do
   }
 
   VALID_CARDS.each_pair do |card, number|
-    it "accepts #{card} valid cards" do
-      subject = build_card_record :card => number
-      subject.valid?.must_equal true
-      subject.errors.size.must_equal 0
+    describe "it accepts #{card} cards" do
+      it "using a specific card type" do
+        subject = build_card_record({:card => number}, {:type => card})
+        assert card_is_valid?(subject)
+      end
+      it "using :credit_card => { :type => :any }" do
+        subject = build_card_record({:card => number}, {:type => :any})
+        assert card_is_valid?(subject)
+      end
+      it "using :credit_card => true" do
+        subject = build_card_record({:card => number}, true)
+        assert card_is_valid?(subject)
+      end
     end
   end
 
   describe "for invalid cards" do
     it "rejects invalid cards and generates an error message of type invalid" do
       subject = build_card_record :card => '99999'
-      subject.valid?.must_equal false
-      subject.errors.size.must_equal 1
-
-      subject.errors[:card].include?(subject.errors.generate_message(:card, :invalid)).must_equal true
+      assert card_is_invalid?(subject)
     end
   end
 
-  def build_card_record(attrs = {})
+  def build_card_record(attrs = {}, validator = {:type => :any})
     TestRecord.reset_callbacks(:validate)
-    TestRecord.validates :card,  :credit_card => { :type => :any }
+    TestRecord.validates :card,  :credit_card => validator
     TestRecord.new attrs
   end
+
+  def card_is_valid?(subject)
+    subject.valid?.must_equal true
+    subject.errors.size.must_equal 0
+  end
+
+  def card_is_invalid?(subject)
+    subject.valid?.must_equal false
+    subject.errors.size.must_equal 1
+    subject.errors[:card].include?(subject.errors.generate_message(:card, :invalid)).must_equal true
+  end
 end

data/test/validations/url_test.rb

@@ -7,18 +7,33 @@ describe "Url Validation" do
     TestRecord.new
   end
 
-  it "accepts valid urls" do
-    subject = build_url_record
-    subject.url = 'http://www.verrot.fr'
-    subject.valid?.must_equal true
-    subject.errors.size.must_equal 0
-  end
+  describe "valid urls" do
+    it "accepts urls without port number" do
+      subject = build_url_record
+      subject.url = 'http://www.verrot.fr'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    it "accepts urls with port number" do
+      subject = build_url_record
+      subject.url = 'http://www.verrot.fr:1234'
+      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
+    it "accepts urls with basic auth" do
+      subject = build_url_record
+      subject.url = 'http://foo:bar@www.verrot.fr'
+      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
   end
 
   describe "for invalid urls" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Franck Verrot
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler