activevalidators 2.0.1 → 2.0.2

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
+  - 1.8.7
+  - ree
+  - jruby-18mode
+  - rbx-18mode
   - 1.9.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
+  - jruby-19mode
   - rbx-19mode
-  - ruby-head
+  - ruby-head

data/activevalidators.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'activevalidators'
-  s.version     = '2.0.1'
+  s.version     = '2.0.2'
   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']
@@ -9,8 +9,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Collection of ActiveModel/ActiveRecord validations}
   s.description = %q{ActiveValidators is a collection of ActiveModel/ActiveRecord validations}
 
-  s.required_ruby_version = '>= 1.9.2'
-
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'minitest'
   s.add_dependency 'rake'          , '>= 0.8.7'

data/lib/active_model/validations/email_validator.rb

@@ -2,6 +2,10 @@ require 'mail'
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
+      def check_validity!
+        raise ArgumentError, "Not a callable object #{options[:with].inspect}" unless options[:with] == nil || options[:with].respond_to?(:call)
+      end
+
       def validate_each(record, attribute, value)
         # takes from: https://github.com/hallelujah/valid_email
         begin
@@ -24,6 +28,13 @@ module ActiveModel
         rescue Exception => e
           valid = false
         end
+
+        if options[:with]
+          # technically the test suite will pass without the boolean coercion 
+          # but we know the code is safer with it in place
+          valid &&= !!options[:with].call(mail)
+        end
+
         record.errors.add attribute, (options[:message]) unless valid
       end
     end

data/lib/active_model/validations/phone_validator.rb

@@ -3,7 +3,7 @@ module ActiveModel
     class PhoneValidator < EachValidator
       def validate_each(record, attribute, value)
         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) )
+        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

@@ -5,11 +5,11 @@ module ActiveModel
         @value = value
         unless country = options[:country]
           if country_method = options[:country_method]
-	    country = record.send(country_method)
+            country = record.send(country_method)
           else
-	    country = 'us'
-	  end
-	end
+            country = 'us'
+          end
+        end
         @formats = PostalCodeValidator.known_formats[country.to_s]
         raise "No known postal code formats for country #{country}" unless @formats
         record.errors.add(attribute) if value.blank? || !matches_any?
@@ -45,6 +45,7 @@ module ActiveModel
           'ic' => ['###'],
           'it' => ['#####'],
           'jp' => ['###-####', '#######'],
+          'ky' => ['KY#-####'],
           'li' => ['####'],
           'lk' => ['#####'],
           'lt' => ['LT-#####', '#####'],
@@ -84,7 +85,7 @@ module ActiveModel
       private
 
       def self.regexp_from(format)
-        Regexp.new '\A' + (Regexp.escape format).gsub(/[@#]/, '@' => '[[:alpha:]]', '#' => 'd') + '\z'
+        Regexp.new '\A' + ActiveValidators::OneNineShims::OneNineString.new(Regexp.escape format).gsub(/[@#]/, '@' => '[[:alpha:]]', '#' => 'd') + '\z'
       end
     end
   end

data/lib/active_validators/one_nine_shims/one_nine_string.rb

@@ -0,0 +1,11 @@
+module ActiveValidators
+  module OneNineShims
+    class OneNineString < String
+      def gsub(pattern, hash)
+        super(pattern) do |m|
+          hash[m]
+        end
+      end
+    end
+  end
+end

data/lib/activevalidators.rb

@@ -1,6 +1,7 @@
 require 'active_model'
 require 'phony'
 require 'countries'
+require 'active_validators/one_nine_shims/one_nine_string'
 
 module ActiveModel
   module Validations

data/test/validations/email_test.rb

@@ -54,6 +54,38 @@ describe "Email Validation" do
     end
   end
 
+  describe "with: #<Proc>" do
+    it "rejects any false result" do
+      subject = build_email_record({:email => "franck@verrot.fr"}, {:with => lambda {|e| false }})
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "accepts any true result" do
+      subject = build_email_record({:email => "franck@verrot.fr"}, {:with => lambda {|e| true }})
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    it "passes in the parsed email address" do
+      subject = build_email_record({:email => "franck@hotmail.com"}, {:with => lambda {|email| not email.domain == "hotmail.com" }})
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "rejects a nil result" do
+      subject = build_email_record({:email => "franck@verrot.fr"}, {:with => lambda {|email| email.domain =~ /\.com\Z/ }})
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "accepts a numerical result" do
+      subject = build_email_record({:email => "franck@verrot.fr"}, {:with => lambda {|email| email.domain =~ /\.fr\Z/ }})
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+  end
+
   describe "for invalid emails" do
     it "rejects invalid emails" do
       subject = build_email_record :email => 'franck.fr'
@@ -75,9 +107,17 @@ describe "Email Validation" do
     end
   end
 
+  it "checks validity of the arguments" do
+    [3, "foo", 1..6].each do |wrong_argument|
+      assert_raises(ArgumentError,"Not a callable object #{wrong_argument.inspect}") do
+        TestRecord.validates :email, :email => { :with => wrong_argument }
+      end
+    end
+  end
+
   def build_email_record(attrs = {}, opts = {})
     TestRecord.reset_callbacks(:validate)
-    TestRecord.validates :email, :email => { :strict => opts[:strict] }
+    TestRecord.validates :email, :email => { :strict => opts[:strict], :with => opts[:with] }
     TestRecord.new attrs
   end
 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(/[@#]/, '@' => 'A', '#' => '9')
+          subject.postal_code = ActiveValidators::OneNineShims::OneNineString.new(format).gsub(/[@#]/, '@' => 'A', '#' => '9')
           subject.valid?.must_equal true
           subject.errors.size.must_equal 0
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70131187685580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131187685580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70131187684280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,10 +42,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131187684280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70131187683500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,10 +58,15 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70131187683500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70131187682840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,10 +74,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70131187682840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: phony
-  requirement: &70131187682280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +90,15 @@ dependencies:
         version: 1.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70131187682280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &70131187681620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -81,10 +106,15 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70131187681620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70131187681060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,10 +122,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131187681060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: date_validator
-  requirement: &70131187680120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,7 +138,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131187680120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
 email:
 - franck@verrot.fr
@@ -129,6 +169,7 @@ files:
 - lib/active_model/validations/tracking_number_validator.rb
 - lib/active_model/validations/twitter_validator.rb
 - lib/active_model/validations/url_validator.rb
+- lib/active_validators/one_nine_shims/one_nine_string.rb
 - lib/activevalidators.rb
 - test/test_helper.rb
 - test/validations/credit_card_test.rb
@@ -154,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Collection of ActiveModel/ActiveRecord validations