activevalidators 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    activevalidators (1.1.0)
+    activevalidators (1.2.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
+      date_validator (= 0.5.9)
       mail
 
 GEM
@@ -21,6 +22,8 @@ GEM
     activesupport (3.0.3)
     arel (2.0.4)
     builder (2.1.2)
+    date_validator (0.5.9)
+      activemodel (>= 3.0.0)
     diff-lcs (1.1.2)
     i18n (0.4.2)
     mail (2.2.10)
@@ -50,6 +53,7 @@ DEPENDENCIES
   activerecord (>= 3.0.0)
   activevalidators!
   bundler
+  date_validator (= 0.5.9)
   mail
   rspec
   rspec-core

data/README.md

@@ -23,15 +23,34 @@ In your models, the gem provides new validators like `email`, or `url`:
     end
 
     class Article
-      validates :slug,         :slug => true
+      validates :slug,          :slug => true
+      validates :expiration_date,
+                      :date => {
+                                 :after => lambda { Time.now },
+                                 :before => lambda { Time.now + 1.year }
+                               }
     end
 
+    class Device
+      validates :ipv6,          :ip => { :format => :v6 }
+      validates :ipv4,          :ip => { :format => :v4 }
+    end
+
+    class Account
+      validates :visa_card,     :credit_card => { :type => :visa }
+      validates :credit_card,   :credit_card => { :type => :all  }
+    end
+
+
 Exhaustive list of supported validators and their implementation:
 
 * `email` : based on the `mail` gem
 * `url`   : based on a regular expression
 * `phone` : based on a regular expression
 * `slug`  : based on `ActiveSupport::String#parameterize`
+* `ip`    : based on `Resolv::IPv[4|6]::Regex`
+* `credit_card` : based on the `Luhnacy` gem
+* `date`  : based on the `DateValidator` gem
 
 Todo
 ----

data/activevalidators.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.1.0'
+  s.version     = '1.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot"]
   s.email       = ["franck@verrot.fr"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 3.0.0'
   s.add_dependency 'activemodel', '>= 3.0.0'
   s.add_dependency 'mail'
-
+  s.add_dependency 'date_validator', '0.5.9'
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/active_model/validations/credit_card_validator.rb

@@ -0,0 +1,57 @@
+module ActiveModel
+  module Validations
+
+    class CreditCardValidator < EachValidator
+      def validate_each(record, attribute, value)
+        record.errors.add(attribute) unless Luhn.valid?(options[:type], sanitize_card(value))
+      end
+
+      def sanitize_card(value)
+        value.tr('- ','')
+      end
+
+      class Luhn
+        def self.valid?(card_type,number)
+          if card_type == :any
+            self.luhn_valid?(number)
+          else
+            self.send("#{card_type.to_s}?", number)
+          end
+        end
+
+        def self.mastercard?(number)
+          self.luhn_valid?(number) and !(number !~ /^5[1-5].{14}/)
+        end
+
+        def self.visa?(number)
+          self.luhn_valid?(number) and !(number !~ /^4.{15}/)
+        end
+
+        def self.amex?(number)
+          self.luhn_valid?(number) and !(number !~ /^3[47].{13}/)
+        end
+
+        def self.luhn_valid?(s)
+          return false unless s && s.is_a?(String)
+          return false if s.empty?
+          value = s.gsub(/\D/, '')
+          return false if value.empty?
+          value.
+            reverse.
+            each_char.
+            collect(&:to_i).
+            each_with_index.
+            inject(0) {| num, (i, index) |
+              num + if (index + 1) % 2 == 0
+                      i*=2; ((i > 9) ? (i % 10) + 1 : i)
+              else
+                i
+              end
+          } % 10 == 0
+        end
+
+      end
+    end
+
+  end
+end

data/lib/active_model/validations/ip_validator.rb

@@ -0,0 +1,13 @@
+module ActiveModel
+  module Validations
+    require 'resolv'
+    class IpValidator < EachValidator
+      def validate_each(record, attribute, value)
+        r = Resolv.const_get("IP#{options[:format]}")
+        raise "Unknown IP validator format #{options[:format].inspect}" if r.nil?
+        record.errors.add(attribute) unless !(r::Regex !~ value)
+      end
+
+    end
+  end
+end

data/lib/activevalidators.rb

@@ -12,5 +12,8 @@ module ActiveModel
     autoload :RespondToValidator
     autoload :PhoneValidator
     autoload :SlugValidator
+    autoload :IpValidator
+    autoload :CreditCardValidator
+    autoload :DateValidator, 'date_validator'
   end
 end

data/spec/models/credit_card_validator_model.rb

@@ -0,0 +1,7 @@
+module Models
+  class CreditCardValidatorModel
+    include ActiveModel::Validations
+    attr_accessor :card
+    validates :card,  :credit_card => { :type => :any }, :if => :card
+  end
+end

data/spec/models/ip_validator_model.rb

@@ -0,0 +1,8 @@
+module Models
+  class IpValidatorModel
+    include ActiveModel::Validations
+    attr_accessor :ipv4, :ipv6
+    validates :ipv4, :ip => { :format => :v4 }, :if => :ipv4
+    validates :ipv6, :ip => { :format => :v6 }, :if => :ipv6
+  end
+end

data/spec/specs/credit_card_spec.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+# Here are some valid credit cards
+CARDS = {
+  #American Express
+  :amex =>	'3400 0000 0000 009',
+  #Carte Blanche	
+  :carte_blanche => '3000 0000 0000 04',
+  #Discover	
+  :discover => '6011 0000 0000 0004',
+  #Diners Club	
+  :diners_club => '3852 0000 0232 37',
+  #enRoute	
+  :en_route => '2014 0000 0000 009',
+  #JCB	
+  :jcb => '2131 0000 0000 0008',
+  #MasterCard	
+  :master_card => '5500 0000 0000 0004',
+  #Solo	
+  :solo => '6334 0000 0000 0004',
+  #Switch	
+  :switch => '4903 0100 0000 0009',
+  #Visa	
+  :visa => '4111 1111 1111 1111',
+  #Laser	
+  :laser => '6304 1000 0000 0008'
+}
+
+describe "Credit Card Validation" do
+  CARDS.each_pair do |card, number|
+  it "accepts #{card} valid cards" do
+    model = Models::CreditCardValidatorModel.new
+    model.card = number
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+  end
+
+  describe "for invalid cards" do
+    let(:model) do
+      Models::CreditCardValidatorModel.new.tap do |m|
+        m.card = '99999'
+      end
+    end
+
+    it "rejects invalid cards" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
+
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:card].should == [model.errors.generate_message(:card, :invalid)]
+    end
+  end
+end

data/spec/specs/date_validator_spec.rb

@@ -0,0 +1,124 @@
+#Copied from DateValidator v0.5.9
+#The translation stuff has been removed though
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+require 'active_support/time' # For testing Date and TimeWithZone objects
+
+class TestRecord
+  include ActiveModel::Validations
+  attr_accessor :expiration_date
+
+  def initialize(expiration_date)
+    @expiration_date = expiration_date
+  end
+end
+
+describe "DateValidator" do
+
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+  end
+
+  it "checks validity of the arguments" do
+    [3, "foo", 1..6].each do |wrong_argument|
+      expect {
+        TestRecord.validates :expiration_date, :date => {:before => wrong_argument}
+      }.to raise_error(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
+    end
+  end
+
+  it "complains if provided with no options" do
+    TestRecord.validates :expiration_date, :date => {:before => Time.now}
+    model = TestRecord.new(nil)
+    model.should_not be_valid
+  end
+
+  [:valid,:invalid].each do |should_be|
+
+    _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
+
+    context _context do
+
+      [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+
+          now = Time.now.to_datetime
+
+          model_date = case check
+            when :after then should_be == :valid ? now + 21000 : now - 1
+            when :before then should_be == :valid ? now - 21000 : now + 1
+            when :after_or_equal_to then should_be == :valid ? now : now - 21000
+            when :before_or_equal_to then should_be == :valid ? now : now + 21000
+          end
+
+#          it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
+            #TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
+            #model = TestRecord.new(model_date)
+            #should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should_not(be_valid, "an attribute should be invalidwhen offending the #{check} check")
+          #end
+
+          if _context == 'when value does not match validation requirements'
+
+            it "yields a default error message indicating that value must be #{check} validation requirements" do
+              TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
+              model = TestRecord.new(model_date)
+              model.should_not be_valid
+            end
+            
+          end
+
+      end
+
+      if _context == 'when value does not match validation requirements'
+
+        it "allows for a custom validation message" do
+          TestRecord.validates :expiration_date, :date => {:before_or_equal_to => Time.now, :message => 'must be after Christmas'}
+          model = TestRecord.new(Time.now + 21000)
+          model.should_not be_valid
+        end
+
+      end
+
+    end
+
+  end
+
+  extra_types = [:proc, :symbol]
+  extra_types.push(:date) if defined?(Date) and defined?(DateTime)
+  extra_types.push(:time_with_zone) if defined?(ActiveSupport::TimeWithZone)
+
+  extra_types.each do |type|
+    it "accepts a #{type} as an argument to a check" do
+      case type
+        when :proc then
+          expect {
+            TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
+          }.to_not raise_error
+        when :symbol then
+          expect {
+            TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
+            TestRecord.validates :expiration_date, :date => {:after => :min_date}
+          }.to_not raise_error
+        when :date then
+          expect {
+            TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
+          }.to_not raise_error
+        when :time_with_zone then
+          expect {
+            Time.zone = "Hawaii"
+            TestRecord.validates :expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}
+          }.to_not raise_error
+      end
+    end
+  end
+
+  it "gracefully handles an unexpected result from a proc argument evaluation" do
+    TestRecord.validates :expiration_date, :date => {:after => Proc.new{ nil }}
+    TestRecord.new(Time.now).should_not be_valid
+  end
+
+  it "gracefully handles an unexpected result from a symbol argument evaluation" do
+    TestRecord.send(:define_method, :min_date, lambda { nil })
+    TestRecord.validates :expiration_date, :date => {:after => :min_date}
+    TestRecord.new(Time.now).should_not be_valid
+  end
+end

data/spec/specs/ip_spec.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "IP Validation" do
+  describe "IPv4 Validation" do
+    it "accepts valid IPs" do
+      model = Models::IpValidatorModel.new
+      model.ipv4 = '192.168.1.1'
+      model.valid?.should be(true)
+      model.should have(0).errors
+    end
+
+    describe "for invalid IPs" do
+      let(:model) do
+        Models::IpValidatorModel.new.tap do |m|
+          m.ipv4 = '267.34.56.3'
+        end
+      end
+
+      it "rejects invalid IPs" do
+        model.valid?.should be(false)
+        model.should have(1).errors
+      end
+
+      it "generates an error message of type invalid" do
+        model.valid?.should be(false)
+        model.errors[:ipv4].should == [model.errors.generate_message(:ipv4, :invalid)]
+      end
+    end
+  end
+
+  describe "IPv6 Validation" do
+    it "accepts valid IPs" do
+      model = Models::IpValidatorModel.new
+      model.ipv6 = '::1'
+      model.valid?.should be(true)
+      model.should have(0).errors
+    end
+
+    describe "for invalid IPs" do
+      let(:model) do
+        Models::IpValidatorModel.new.tap do |m|
+          m.ipv6 = '192.168.1.1'
+        end
+      end
+
+      it "rejects invalid IPs" do
+        model.valid?.should be(false)
+        model.should have(1).errors
+      end
+
+      it "generates an error message of type invalid" do
+        model.valid?.should be(false)
+        model.errors[:ipv6].should == [model.errors.generate_message(:ipv6, :invalid)]
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Franck Verrot
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,21 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: date_validator
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 9
+        version: 0.5.9
+  type: :runtime
+  version_requirements: *id008
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
 email: 
 - franck@verrot.fr
@@ -131,19 +146,26 @@ files:
 - Rakefile
 - activevalidators.gemspec
 - autotest/discover.rb
+- lib/active_model/validations/credit_card_validator.rb
 - lib/active_model/validations/email_validator.rb
+- lib/active_model/validations/ip_validator.rb
 - lib/active_model/validations/phone_validator.rb
 - lib/active_model/validations/respond_to_validator.rb
 - lib/active_model/validations/slug_validator.rb
 - lib/active_model/validations/url_validator.rb
 - lib/activevalidators.rb
+- spec/models/credit_card_validator_model.rb
 - spec/models/email_validator_model.rb
+- spec/models/ip_validator_model.rb
 - spec/models/phone_validator_model.rb
 - spec/models/respond_to_validator_model.rb
 - spec/models/slug_validator_model.rb
 - spec/models/url_validator_model.rb
 - spec/spec_helper.rb
+- spec/specs/credit_card_spec.rb
+- spec/specs/date_validator_spec.rb
 - spec/specs/email_spec.rb
+- spec/specs/ip_spec.rb
 - spec/specs/phone_spec.rb
 - spec/specs/respond_to_spec.rb
 - spec/specs/slug_spec.rb
@@ -181,13 +203,18 @@ signing_key:
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations
 test_files: 
+- spec/models/credit_card_validator_model.rb
 - spec/models/email_validator_model.rb
+- spec/models/ip_validator_model.rb
 - spec/models/phone_validator_model.rb
 - spec/models/respond_to_validator_model.rb
 - spec/models/slug_validator_model.rb
 - spec/models/url_validator_model.rb
 - spec/spec_helper.rb
+- spec/specs/credit_card_spec.rb
+- spec/specs/date_validator_spec.rb
 - spec/specs/email_spec.rb
+- spec/specs/ip_spec.rb
 - spec/specs/phone_spec.rb
 - spec/specs/respond_to_spec.rb
 - spec/specs/slug_spec.rb