activevalidators 1.3.0 → 1.4.0

data/.gitignore

@@ -1,3 +1,4 @@
 *.swp
 *.gem
 *.rbc
+Gemfile.lock

data/README.md

@@ -20,6 +20,7 @@ In your models, the gem provides new validators like `email`, or `url`:
       validates :twitter_at,    :twitter => { :format => :username_with_at }
       validates :twitter_url,   :twitter => { :format => :url }
       validates :twitter,       :twitter => true
+      validates :postal_code,   :postal_code => { :format => :us }
     end
 
     class Article
@@ -53,13 +54,13 @@ Exhaustive list of supported validators and their implementation:
 * `credit_card` : based on the `Luhn` algorithm
 * `date`  : based on the `DateValidator` gem
 * `password` : based on a set of regular expressions
+* `postal_code`: based on a set of predefined masks
 
 Todo
 ----
 
 Lots of improvements can be made:
 
-* Add I18n specific types of error messages for each validator
 * Implement new validators
 * ...
 
@@ -81,8 +82,10 @@ Contributors
 * Oriol Gual
 * Paco Guzmán
 * Garrett Bjerkhoel
+* Renato Riccieri Santos Zannon
+* Brian Moseley
 
 Copyright
 ---------
 
-Copyright (c) 2010 Franck Verrot. MIT LICENSE. See LICENSE for details.
+Copyright (c) 2010-2011 Franck Verrot. MIT LICENSE. See LICENSE for details.

data/activevalidators.gemspec

@@ -4,9 +4,9 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.3.0'
+  s.version     = '1.4.0'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel", "Renato Riccieri Santos Zannon"]
+  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.summary     = %q{Collection of ActiveModel/ActiveRecord validations}

data/lib/active_model/validations/postal_code_validator.rb

@@ -0,0 +1,30 @@
+module ActiveModel
+  module Validations
+    class PostalCodeValidator < EachValidator
+      def validate_each(record, attribute, value)
+        @value = value
+        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?
+      end
+
+      def self.known_formats
+        @@known_formats ||= {
+          :us => ['#####', '#####-####'],
+        }
+      end
+
+      def matches_any?
+        false if @formats.nil? or not @formats.respond_to?(:detect)
+        @formats.detect { |format| @value.match(PostalCodeValidator.regexp_from format) }
+      end
+
+      private
+
+      def self.regexp_from(format)
+        Regexp.new "^"+(Regexp.escape format).gsub('\#','\d')+"$"
+      end
+    end
+  end
+end

data/lib/activevalidators.rb

@@ -3,19 +3,29 @@ require 'active_model'
 require 'active_record'
 require 'active_support/all'
 require 'active_model/validations'
-#Eager autoload the library's validators into AR::Validations
+
 module ActiveModel
   module Validations
     extend ActiveSupport::Autoload
-    autoload :EmailValidator
-    autoload :UrlValidator
-    autoload :RespondToValidator
-    autoload :PhoneValidator
-    autoload :SlugValidator
-    autoload :IpValidator
-    autoload :CreditCardValidator
-    autoload :DateValidator, 'date_validator'
-    autoload :PasswordValidator
-    autoload :TwitterValidator
+
+    def self.activevalidators
+      ['Email','Url','RespondTo','Phone','Slug','Ip','CreditCard','Date','Password','Twitter','PostalCode']
+    end
+
+    #Eager autoload the library's validators into AR::Validations
+    activevalidators.each do |validator_name|
+      autoload validator_name+'Validator'
+    end
+
+    #Defines methods like validates_credit_card
+    module HelperMethods
+      ActiveModel::Validations.activevalidators.map(&:underscore).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 })
+          validates(*args)
+        end
+      end
+    end
   end
 end

data/spec/activevalidators_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe "A class with active validators included" do
+  subject { TestRecord }
+
+  validators = ['Email','Url','RespondTo','Phone','Slug','Ip','CreditCard','Date','Password','Twitter'].map(&:underscore)
+  validators.each do |validator|
+    describe ".validates_#{validator}" do
+      it "is defined" do
+        subject.should respond_to("validates_#{validator}")
+      end
+
+      context "when it doesn't receive a hash with options" do
+        it "calls validates #{validator} => true" do
+          subject.should_receive('validates').with hash_including(validator => true)
+          subject.send("validates_#{validator}")
+        end
+
+        it "calls 'validates *attributes, #{validator} => true' when fed with attributes" do
+          subject.should_receive('validates').with(:attr1, :attr2, validator => true)
+          subject.send("validates_#{validator}", :attr1, :attr2)
+        end
+      end
+
+      context "when it receives a hash with options" do
+        it "calls validates #{validator} => options" do
+          subject.should_receive('validates').with hash_including(validator => {:options => :blah})
+          subject.send("validates_#{validator}", :options => :blah)
+        end
+
+        it "calls 'validates *attributes, #{validator} => options' when fed with attributes" do
+          subject.should_receive('validates').with(:attr1, :attr2, validator => {:options => :blah})
+          subject.send("validates_#{validator}", :attr1, :attr2, :options => :blah)
+        end
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,5 +10,6 @@ end
 class TestRecord
   include ActiveModel::Validations
   attr_accessor :ip, :url, :slug, :responder, :global_condition,
-    :local_condition, :phone, :email, :card, :password, :twitter_username
+    :local_condition, :phone, :email, :card, :password, :twitter_username,
+    :postal_code
 end

data/spec/validations/postal_code_spec.rb

@@ -0,0 +1,61 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Postal Code Validation" do
+
+  subject { TestRecord.new }
+
+  context "when no country is given" do
+    before(:each) do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :postal_code, :postal_code => true
+    end
+
+    it 'should validate format of postal code with #####' do
+      subject.postal_code = '11211'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+
+    it 'should validate format of postal code with #####-#####' do
+      subject.postal_code = '94117-1234'
+      subject.should be_valid
+      subject.should have(0).errors
+    end
+  end
+
+  ActiveModel::Validations::PostalCodeValidator.known_formats.each do |country, formats|
+    context "when given a :#{country} country parameter" do
+      before(:each) do
+        TestRecord.reset_callbacks(:validate)
+        TestRecord.validates :postal_code, :postal_code => {:country => country}
+      end
+
+      formats.each do |format|
+        it "should validate format of postal code with #{format}" do
+          subject.postal_code = format.gsub('#','9')
+          subject.should be_valid
+          subject.should have(0).errors
+        end
+      end
+    end
+  end
+
+
+  describe "for invalid formats" do
+    before :each do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :postal_code, :postal_code => true
+      subject.postal_code = '999'
+    end
+
+    it "rejects invalid formats" do
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generates an error message of type invalid" do
+      subject.should_not be_valid
+      subject.errors[:postal_code].should include subject.errors.generate_message(:postal_code, :invalid)
+    end
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
-  version: 1.3.0
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Franck Verrot
@@ -10,11 +15,12 @@ authors:
 - Oriol Gual
 - Garrett Bjerkhoel
 - Renato Riccieri Santos Zannon
+- Brian Moseley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 -04:00
+date: 2011-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +31,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -36,6 +45,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -47,6 +59,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -58,6 +73,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -69,6 +87,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id005
@@ -80,6 +103,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id006
@@ -91,6 +119,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 2
+        - 15
         version: 2.2.15
   type: :runtime
   version_requirements: *id007
@@ -102,6 +135,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :runtime
   version_requirements: *id008
@@ -118,7 +156,6 @@ files:
 - .bundle/config
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -129,17 +166,20 @@ files:
 - lib/active_model/validations/ip_validator.rb
 - lib/active_model/validations/password_validator.rb
 - lib/active_model/validations/phone_validator.rb
+- lib/active_model/validations/postal_code_validator.rb
 - lib/active_model/validations/respond_to_validator.rb
 - lib/active_model/validations/slug_validator.rb
 - lib/active_model/validations/twitter_validator.rb
 - lib/active_model/validations/url_validator.rb
 - lib/activevalidators.rb
+- spec/activevalidators_spec.rb
 - spec/spec_helper.rb
 - spec/validations/credit_card_spec.rb
 - spec/validations/email_spec.rb
 - spec/validations/ip_spec.rb
 - spec/validations/password_spec.rb
 - spec/validations/phone_spec.rb
+- spec/validations/postal_code_spec.rb
 - spec/validations/respond_to_spec.rb
 - spec/validations/slug_spec.rb
 - spec/validations/twitter_spec.rb
@@ -158,12 +198,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -173,12 +219,14 @@ signing_key:
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations
 test_files: 
+- spec/activevalidators_spec.rb
 - spec/spec_helper.rb
 - spec/validations/credit_card_spec.rb
 - spec/validations/email_spec.rb
 - spec/validations/ip_spec.rb
 - spec/validations/password_spec.rb
 - spec/validations/phone_spec.rb
+- spec/validations/postal_code_spec.rb
 - spec/validations/respond_to_spec.rb
 - spec/validations/slug_spec.rb
 - spec/validations/twitter_spec.rb

data/Gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    activevalidators (1.3.0)
-      activemodel (~> 3.0.0)
-      activerecord (~> 3.0.0)
-      date_validator (~> 0.6.1)
-      mail (~> 2.2.15)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.5)
-    arel (2.0.9)
-    builder (2.1.2)
-    date_validator (0.6.1)
-      activemodel (~> 3.0.0)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activevalidators!
-  bundler
-  rspec
-  rspec-core
-  rspec-expectations