rails_validations 1.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951d63d5356bcdf895cef31ec5726e049079bc7a
-  data.tar.gz: bbfbf7c0b5e64858ad78723f1990d205aa40918b
+  metadata.gz: 8bec571f7a49e06d0474ab65d15f2e6313daae4d
+  data.tar.gz: 5e1e0f575fc60fc008966542af827038e1592e14
 SHA512:
-  metadata.gz: 563d7dfa6e1f2cc9035a7c3b761f8b86a08f452b63ccc8725442f7d6abd7c60a4dc5ca28ff4f5ca2abacbf488fb0098bdae3b1bc42e41c1d6627a6f232e06449
-  data.tar.gz: 09f588a7881780926db041f19f4e8edce501cc1c8d12cc878f06f7bcb087f620a5502820d6eb0734c2440a1590994f85ccf63683ddeb63502cea17c4c4110330
+  metadata.gz: 0238a93909c34d8b8ad6707bbb3abb834c5aaaf89b01cf2fa02d1cf21f6b531fd52f2ceda0686e0f4c2506163e3bdb4f942df3ec18a63ad97314548574241256
+  data.tar.gz: f2d3c0499d7f7f5f7ef74094a5b9706db0463a15ab13dcbc3ce2646d1c11144e2e97f57f71940f2199001afb581c9c09623e368d578fc64fc77194b1bae4f75a

data/README.markdown

@@ -4,7 +4,8 @@
 [![Inline docs](http://inch-ci.org/github/bluerail/rails_validations.svg?branch=master)](http://inch-ci.org/github/bluerail/rails_validations)
 
 
-A few extra validations for Ruby on Rails.
+A few extra validations for Ruby on Rails. Works with Ruby 1.9 and newer, and
+Rails 3 and newer (including Rails 4).
 
 We try to do the sane thing by not being too strict, when in doubt, we accept
 input as being valid. We never want to reject valid input as invalid.
@@ -141,6 +142,11 @@ Currently implemented countries:
 ChangeLog
 =========
 
+Version 1.4, 2015-08-11
+-----------------------
+- Make it work with Ruby 1.9 and Rails 3.0
+
+
 Version 1.3, 2015-05-22
 -----------------------
 - Add `commerce_number` validation.

data/config/locales/en.yml

@@ -1,5 +1,8 @@
 en:
   rails_validations:
+    postal_code:
+      invalid: not a valid postal code
+
     email:
       invalid: not a valid email address
 

data/config/locales/nl.yml

@@ -1,5 +1,8 @@
 nl:
   rails_validations:
+    postal_code:
+      invalid: geen geldige postcode
+
     email:
       invalid: geen geldig e-mailaddress
 

data/lib/validators/commerce_number_validator.rb

@@ -3,7 +3,7 @@ class CommerceNumberValidator < ActiveModel::EachValidator
   # keys are ISO-3366-1 alpha2
   REGEXP = {
     # KvK nummer; 8 digits. Allow space, -, and . for formatting
-    nl: -> (v) { v.gsub(/[.\- ]/, '') =~ /\A\d{8}\z/ },
+    nl: ->(v) { v.gsub(/[.\- ]/, '') =~ /\A\d{8}\z/ },
   }.freeze
 
 

data/lib/validators/date_validator.rb

@@ -34,11 +34,15 @@ class DateValidator < ActiveModel::EachValidator
     elsif raw_value.respond_to? :to_date
       begin
         raw_value.to_date
-      rescue ArgumentError
+      rescue
         false
       end
     else
-      false
+      begin
+        Date.parse raw_value
+      rescue
+        false
+      end
     end
   end
 

data/lib/validators/domain_validator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+#
 # Validate if a string is a valid domain. This should work with IDN.
 #
 #  validates :domain_column, domain: true

data/lib/validators/email_validator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+#
 # Validate email, also works with UTF-8/IDN.
 #
 # The validation is intentionally simply, you can never be sure an email is

data/lib/validators/vat_number_validator.rb

@@ -6,7 +6,7 @@ class VatNumberValidator < ActiveModel::EachValidator
     # 'NL' + 9 digits + B + 2-digit company index – e.g. NL999999999B99
     # Allow space, -, and . for formatting
     # TODO: I think this also has a check digit?
-    nl: -> (v) { v.upcase.gsub(/[.\- ]/, '') =~ /\ANL\d{9}B\d{2}\z/ },
+    nl: ->(v) { v.upcase.gsub(/[.\- ]/, '') =~ /\ANL\d{9}B\d{2}\z/ },
   }.freeze
 
 

data/spec/spec_helper.rb

@@ -59,7 +59,10 @@ module ValidationsSpecHelper
 
 
   def with_validation validate_string
-    described_class.clear_validators!
+    #Rails 4: described_class.clear_validators!
+    described_class.reset_callbacks(:validate)
+    described_class._validators.clear
+
     described_class.class_eval "validates :v, #{validate_string}"
 
     yield
@@ -75,7 +78,7 @@ RSpec::Matchers.define :be_invalid do |i18n_key, i18n_params={}|
   match do |record|
     record.valid? == false &&
       record.errors.first.present? &&
-      record.errors.first[1] == I18n.t("rails_validations.#{i18n_key}", **i18n_params)
+      record.errors.first[1] == I18n.t("rails_validations.#{i18n_key}", i18n_params)
   end
 end
 

data/spec/validations/date_spec.rb

@@ -77,4 +77,25 @@ describe ValidationsSpecHelper::Date do
       expect(model(Date.today.to_s, (Date.today - 2.days).to_s)).to be_valid
     end
   end
+
+  it 'works when giving a string' do
+    with_validation 'date: true' do
+      [
+        '2015-01-01',
+        '01-09-2015',
+      ].each do |str|
+        expect(model(str)).to be_valid
+      end
+    end
+  end
+
+  it "sets an errors when a string isn't quite a valid date" do
+    with_validation 'date: true' do
+      [
+        '6-2015',
+      ].each do |str|
+        expect(model(str)).to be_invalid('date.invalid')
+      end
+    end
+  end
 end

data/spec/validations/domain_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module ValidationsSpecHelper
@@ -38,7 +40,7 @@ describe ValidationsSpecHelper::Domain do
     end
   end
 
-  
+
   it 'works with :max_domain_parts' do
     with_validation 'domain: { max_domain_parts: 3 }' do
       expect(model('not.many')).to be_valid

data/spec/validations/email_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module ValidationsSpecHelper

data/spec/validations/iban_spec.rb

@@ -16,6 +16,7 @@ describe ValidationsSpecHelper::Iban do
       %w{
         NL65AEGO0721647952
         NL43ABNA0841376913
+        NL29INGB0006303043
       }.each do |v|
         expect(model(v)).to be_valid
       end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rails_validations
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.4.1
 platform: ruby
 authors:
 - Martin Tournoij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: iban-tools
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="