activevalidators 1.7.1 → 1.8.0

data/README.md

@@ -21,7 +21,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 }
+      validates :postal_code,   :postal_code => { :country => :us }
     end
 
     class Article

data/Rakefile

@@ -12,8 +12,6 @@ Rake::TestTask.new do |t|
   t.warning = true
 end
 
-require 'turn'
-
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'activevalidators'

data/activevalidators.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler"
   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'

data/lib/active_model/validations/postal_code_validator.rb

@@ -3,15 +3,22 @@ module ActiveModel
     class PostalCodeValidator < EachValidator
       def validate_each(record, attribute, value)
         @value = value
-        country = options[:country] || :us
-        @formats = PostalCodeValidator.known_formats[country]
+        unless country = options[:country]
+          if country_method = options[:country_method]
+	    country = record.send(country_method)
+          else
+	    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?
       end
 
       def self.known_formats
         @@known_formats ||= {
-          :us => ['#####', '#####-####'],
+          'us' => ['#####', '#####-####'],
+          'pt' => ['####', '####-###'],
         }
       end
 

data/lib/active_model/validations/tracking_number_validator.rb

@@ -44,7 +44,7 @@ module ActiveModel
 
       MOD10_WEIGHTS = [3,1]
       def usps_mod10(chars)
-        10 - weighted_sum(chars.reverse, MOD10_WEIGHTS) % 10
+        (10 - weighted_sum(chars.reverse, MOD10_WEIGHTS) % 10) % 10
       end
 
       MOD11_WEIGHTS = [8,6,4,2,3,5,9,7]

data/lib/active_validators/version.rb

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

data/test/test_helper.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 # silence warnings
 old_w, $-w = $-w, false
 
-begin; require 'turn'; rescue LoadError; end
 require 'minitest/spec'
 require 'minitest/mock'
 require 'minitest/autorun'

data/test/validations/date_test.rb

@@ -11,6 +11,6 @@ describe "Date Validation" do
     d = TestRecord.new(:start_date => Time.now, :end_date => Time.now - 1)
 
     refute d.valid?
-    refute_includes d.errors.map(&:to_s).join, 'translation missing'
+    refute_includes d.errors.to_s, 'translation missing'
   end
 end

data/test/validations/tracking_number_test.rb

@@ -68,6 +68,10 @@ describe "Tracking Number Validation" do
         assert_valid_tracking_number({:carrier => :usps}, '71123456789123456787')
       end
 
+      it '20 character USS128 tracking number with valid MOD10 check digit ending in 0' do
+        assert_valid_tracking_number({:carrier => :usps}, '03110240000115809160')
+      end
+
       it '22 character USS128 tracking number with valid MOD10 check digit' do
         assert_valid_tracking_number({:carrier => :usps}, '9171969010756003077385')
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 1
-  version: 1.7.1
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Franck Verrot
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 Z
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -50,24 +50,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: turn
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +65,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,11 +81,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +97,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mail
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,11 +111,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: date_validator
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,7 +125,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
 email: 
 - franck@verrot.fr