activevalidators 1.5.1 → 1.6.0

data/.travis.yml

@@ -0,0 +1,10 @@
+# Offical support for MRIs + REE
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - rbx
+  - rbx-2.0
+  - jruby

data/README.md

@@ -1,4 +1,4 @@
-ActiveValidators
+ActiveValidators [![Travis](http://travis-ci.org/cesario/activevalidators.png)](http://travis-ci.org/cesario/activevalidators)
 ================
 
 Collection of ActiveModel/ActiveRecord validations
@@ -49,17 +49,18 @@ In your models, the gem provides new validators like `email`, or `url`:
 
 Exhaustive list of supported validators and their implementation:
 
-* `email` : based on the `mail` gem
-* `url`   : based on a regular expression
-* `phone` : based on a set of predefined masks
-* `twitter` : based on a regular expression
-* `slug`  : based on `ActiveSupport::String#parameterize`
-* `ip`    : based on `Resolv::IPv[4|6]::Regex`
 * `credit_card` : based on the `Luhn` algorithm
 * `date`  : based on the `DateValidator` gem
+* `email` : based on the `mail` gem
+* `ip`    : based on `Resolv::IPv[4|6]::Regex`
 * `password` : based on a set of regular expressions
+* `phone` : based on a set of predefined masks
 * `postal_code`: based on a set of predefined masks
+* `respond_to`
+* `slug`  : based on `ActiveSupport::String#parameterize`
 * `tracking_number`: based on a set of predefined masks
+* `twitter` : based on a regular expression
+* `url`   : based on a regular expression
 
 Todo
 ----
@@ -89,6 +90,8 @@ Contributors
 * Garrett Bjerkhoel
 * Renato Riccieri Santos Zannon
 * Brian Moseley
+* Travis Vachon
+* Rob Zuber
 
 Copyright
 ---------

data/Rakefile

@@ -1,8 +1,21 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-
 require 'rubygems'
 require 'rubygems/specification'
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = true
+  t.warning = true
+end
+
+require 'turn'
+
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
 require 'activevalidators'
 
 def gemspec
@@ -12,31 +25,15 @@ def gemspec
                end
 end
 
-begin
-  require 'rspec/core/rake_task'
-
-  desc "Run specs"
-  RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(-fs --color)
-    t.ruby_opts  = %w(-w)
-  end
-
-  namespace :spec do
-    task :clean do
-      rm_rf 'tmp'
-      rm_rf 'pkg'
-    end
-
-    desc "Run the full spec suite"
-    task :full => ["clean", "spec"]
-  end
-
-rescue LoadError
-  task :spec do
-    abort "Run `gem install rspec` to be able to run specs"
-  end
+desc "Clean the current directory"
+task :clean do
+  rm_rf 'tmp'
+  rm_rf 'pkg'
 end
 
+desc "Run the full spec suite"
+task :full => ["clean", "test"]
+
 desc "install the gem locally"
 task :install => :package do
   sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
@@ -59,4 +56,4 @@ task :install => :gem do
   sh "gem install pkg/#{gemspec.full_name}.gem"
 end
 
-task :default => :spec
+task :default => :full

data/activevalidators.gemspec

@@ -1,10 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
+require 'active_validators/version'
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.5.1'
+  s.version     = ActiveValidators::VERSION
   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"]
@@ -13,14 +14,13 @@ Gem::Specification.new do |s|
   s.description = %q{ActiveValidators is a collection of ActiveModel/ActiveRecord validations}
 
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-core"
-  s.add_development_dependency "rspec-expectations"
-  s.add_dependency 'activerecord'  , '~> 3.0.0'
-  s.add_dependency 'activemodel'   , '~> 3.0.0'
-  s.add_dependency 'mail'          , '~> 2.2.15'
-  s.add_dependency 'date_validator', '~> 0.6.1'
-  s.add_dependency 'date_validator', '~> 0.6.1'
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "turn"
+  s.add_dependency 'rake'          , '>= 0.8.7'
+  s.add_dependency 'activerecord'  , '>= 3.0.0'
+  s.add_dependency 'activemodel'   , '>= 3.0.0'
+  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")

data/lib/active_model/validations/tracking_number_validator.rb

@@ -2,30 +2,67 @@ module ActiveModel
   module Validations
     class TrackingNumberValidator < EachValidator
       def validate_each(record, attribute, value)
-        @value = value
-        carrier = options[:carrier]
+        carrier = options[:carrier] || (options[:carrier_field] && record.send(options[:carrier_field]))
         raise "Carrier option required" unless carrier
-        @formats = TrackingNumberValidator.known_formats[carrier]
-        raise "No known tracking number formats for carrier #{carrier}" unless @formats
-        record.errors.add(attribute) unless matches_any?
+        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)
       end
 
-      def self.known_formats
-        @@known_formats ||= {
-          # see https://www.ups.com/content/us/en/tracking/help/tracking/tnh.html
-          :ups => ['1Z................', '............', 'T..........', '.........'],
-        }
+      # UPS:
+      # ups tracking codes are validated solely on their format
+      # see https://www.ups.com/content/us/en/tracking/help/tracking/tnh.html
+      UPS_REGEXES = [ /^1Z[a-zA-Z0-9]{16}$/, /^[a-zA-Z0-9]{12}$/, /^[a-zA-Z0-9]{9}$/, /^T[a-zA-Z0-9]{10}$/ ]
+      def valid_ups?(value)
+        !!UPS_REGEXES.detect { |fmt| value.match(fmt) }
       end
 
-      def matches_any?
-        false if @formats.nil? or not @formats.respond_to?(:detect)
-        @formats.detect { |format| @value.match(TrackingNumberValidator.regexp_from format) }
+      # USPS:
+      # usps tracking codes are validated based on format (one of USS228 or USS39)
+      # and a check digit (using either of the USPS's MOD10 or MOD11 algorithms)
+      # see USPS Publications:
+      #  -  #91 (05/2008) pp. 38
+      #  -  #97 (05/2002) pp. 62-63
+      #  - #109 (09/2007) pp. 19-21
+      def valid_usps?(value)
+        uss228?(value) || uss39?(value)
       end
 
-      private
+      USS128_REGEX = /^(\d{19,21})(\d)$/
+      def uss228?(value)
+        m = value.match(USS128_REGEX)
+        m.present? && (m[2].to_i == usps_mod10(m[1]))
+      end
+
+      USS39_REGEX = /^[a-zA-Z0-9]{2}(\d{8})(\d)US$/
+      def uss39?(value)
+        m = value.match(USS39_REGEX)
+        # it appears to be valid for a USS39 barcode's checkdigit to be calculated with either the usps mod 10
+        # algorithm or the usps mod 11.
+        m.present? && (m[2].to_i == usps_mod10(m[1]) || m[2].to_i == usps_mod11(m[1]))
+      end
+
+      MOD10_WEIGHTS = [3,1]
+      def usps_mod10(chars)
+        10 - weighted_sum(chars.reverse, MOD10_WEIGHTS) % 10
+      end
+
+      MOD11_WEIGHTS = [8,6,4,2,3,5,9,7]
+      def usps_mod11(chars)
+        mod = weighted_sum(chars, MOD11_WEIGHTS) % 11
+        case mod
+        when 0 then 5
+        when 1 then 0
+        else 11 - mod
+        end
+      end
 
-      def self.regexp_from(format)
-        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d').gsub('\.','[a-zA-Z0-9]')+"$"
+      # takes a string containing digits and calculates a checksum using the provided weight array
+      # cycles the weight array if it's not long enough
+      def weighted_sum(value, weights)
+        digits = value.split('').map { |d| d.to_i }
+        weights = weights.cycle.take(digits.count) if weights.count < digits.count
+        digits.zip(weights).inject(0) { |s,p| s + p[0] * p[1] }
       end
     end
   end

data/lib/active_validators/version.rb

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

data/test/test_helper.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+
+# silence warnings
+old_w, $-w = $-w, false
+
+begin; require 'turn'; rescue LoadError; end
+require 'minitest/spec'
+require 'minitest/mock'
+require 'minitest/autorun'
+
+# unsilence warnings
+$-w = old_w
+
+require 'activevalidators'
+
+%w(models).each do |directory|
+  Dir["#{File.dirname(__FILE__)}/#{directory}/*.rb"].each {|f| require f}
+end
+
+class TestRecord
+  include ActiveModel::Validations
+  attr_accessor :ip, :url, :slug, :responder, :global_condition,
+    :local_condition, :phone, :email, :card, :password, :twitter_username,
+    :postal_code, :carrier, :tracking_number
+
+  def initialize(attrs = {})
+    attrs.each_pair { |k,v| send("#{k}=", v) }
+  end
+end

data/{spec/validations/credit_card_spec.rb → test/validations/credit_card_test.rb}

@@ -1,13 +1,6 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+require 'test_helper.rb'
 
 describe "Credit Card Validation" do
-  before(:each) do
-    TestRecord.reset_callbacks(:validate)
-    TestRecord.validates :card,  :credit_card => { :type => :any }
-  end
-  
-  subject { TestRecord.new }
-
   # Here are some valid credit cards
   VALID_CARDS =  
   {
@@ -37,26 +30,25 @@ describe "Credit Card Validation" do
 
   VALID_CARDS.each_pair do |card, number|
     it "accepts #{card} valid cards" do
-      subject.card = number
-      subject.should be_valid
-      subject.should have(0).errors
+      subject = build_card_record :card => number
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
     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
 
-    before :each do
-      subject.card = '99999'
-    end
-
-    it "rejects invalid cards" do
-      subject.should_not be_valid
-      subject.should have(1).error
+      subject.errors[:card].include?(subject.errors.generate_message(:card, :invalid)).must_equal true
     end
+  end
 
-    it "generates an error message of type invalid" do
-      subject.should_not be_valid
-      subject.errors[:card].should include subject.errors.generate_message(:card, :invalid)
-    end
+  def build_card_record(attrs = {})
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :card,  :credit_card => { :type => :any }
+    TestRecord.new attrs
   end
 end

data/test/validations/email_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper.rb'
+
+describe "Email Validation" 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 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
+
+  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
+      subject.errors[:email].include?(subject.errors.generate_message(:email, :invalid)).must_equal true
+    end
+  end
+
+  def build_email_record(attrs = {})
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :email, :email => true
+    TestRecord.new attrs
+  end
+end

data/test/validations/ip_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper.rb'
+
+describe "IP Validation" do
+  describe "IPv4 Validation" do
+    it "accepts valid IPs" do
+      subject = build_ip_record :v4, :ip => '192.168.1.1'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    describe "for invalid IPs" do
+      it "rejects invalid IPs" do
+        subject = build_ip_record :v4, :ip => '267.34.56.3'
+        subject.valid?.must_equal false
+        subject.errors.size.must_equal 1
+      end
+
+      it "generates an error message of type invalid" do
+        subject = build_ip_record  :v4, :ip => '267.34.56.3'
+        subject.valid?.must_equal false
+        subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid)).must_equal true
+      end
+    end
+  end
+
+  describe "IPv6 Validation" do
+    it "accepts valid IPs" do
+      subject = build_ip_record :v6, :ip => '::1'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    describe "for invalid IPs" do
+      it "rejects invalid IPs" do
+        subject = build_ip_record :v6, :ip => '192.168.1.1'
+        subject.valid?.must_equal false
+        subject.errors.size.must_equal 1
+      end
+
+      it "generates an error message of type invalid" do
+        subject = build_ip_record :v6, :ip => '192.168.1.1'
+        subject.valid?.must_equal false
+        subject.errors[:ip].include?(subject.errors.generate_message(:ip, :invalid)).must_equal true
+      end
+    end
+  end
+
+  it "checks validity of the arguments" do
+    [3, "foo", 1..6].each do |wrong_argument|
+      assert_raises(ArgumentError,"Unknown IP validator format #{wrong_argument.inspect}") do
+        TestRecord.validates :ip, :ip => { :format => wrong_argument }
+      end
+    end
+  end
+
+  def build_ip_record(version, attrs = {})
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :ip, :ip => { :format => version }
+    TestRecord.new attrs
+  end
+end

data/test/validations/password_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper.rb'
+
+describe "Password Validation" do
+  STRENGTHS = {
+    :weak   => { :valid => 'sixchr',   :invalid => 'foo' },
+    :medium => { :valid => 'chrs123',  :invalid => 'sixchr' },
+    :strong => { :valid => 'HQSij2323#$%', :invalid => 'chrs123' }
+  }
+
+  STRENGTHS.each_pair do |strength, passwords|
+    describe "#{strength} mode" do
+      describe "valid passwords" do
+        it "accepts a #{strength} password like #{passwords[:valid]}" do
+          subject = build_password_record strength, :password => passwords[:valid]
+          subject.valid?.must_equal true
+          subject.errors.size.must_equal 0
+        end
+      end
+
+      describe "invalid passwords" do
+        it "rejects invalid passwords like #{passwords[:invalid]}" do
+          subject = build_password_record strength, :password => passwords[:invalid]
+          subject.valid?.must_equal false
+          subject.errors.size.must_equal 1
+        end
+
+        it "generates an error message of type invalid" do
+          subject = build_password_record strength, :password => passwords[:invalid]
+          subject.valid?.must_equal false
+          subject.errors[:password].include?(subject.errors.generate_message(:password, :invalid)).must_equal true
+        end
+      end
+    end
+  end
+  def build_password_record(strength, attrs = {})
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :password, :password => { :strength => strength }
+    TestRecord.new attrs
+  end
+end