validates_zipcode 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fddc5611ea7a76c0566f14ad7fc9957058fb9bc0
-  data.tar.gz: 19cc15442cda3506264a34fc384ae343913eaa31
+  metadata.gz: 18c95b5c356913b61606be8760fc1be5fd392353
+  data.tar.gz: 86a84e1e63d45ca9b2966bf151dd1dc35f015342
 SHA512:
-  metadata.gz: 2142b4d7f47c25811efaaa88dcd8ee9dd418a8dd7751b0881c52b74184b34872748d755df5cfebe039435e5c8caec0eb32db6feac771dbf3d51bb5e889285811
-  data.tar.gz: 8e11226752017ecb1da7ffb7a085aa294e26195e891be9e0c351f4be28bad875c698f3a24df3c0456e3d51a272390a8bf5a8bac47ae4e39a5c7aec9d396931e9
+  metadata.gz: 72be9513ed1857044d0689407283476762f6db7c758d4cef66a871a8baaaf02c774cc2e4bd7236506bea2103fdcf577a6ffd9d8a22dd696c6c8f76da5030eb76
+  data.tar.gz: 14efc7339977773b23bcf1a1727d9d024836ff388fcaf6b81024589e1950a0ae49f56f951398e073df615c51ae3dd2634816f8e0f4489abc62ee2fd52f4f1732

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.0.18
+
+- Adds support for `excluded_country_codes` in the validation setup.
+- Remove support for UAE, not reliable sources found, assume not used.
+
 ## 0.0.17
 
 - Updates support for Luxembourg postal codes ~ @rivsc

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.16)
+    validates_zipcode (0.0.18)
       activemodel (>= 3.2.0)
 
 GEM
@@ -49,4 +49,4 @@ DEPENDENCIES
   validates_zipcode!
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.16)
+    validates_zipcode (0.0.18)
       activemodel (>= 3.2.0)
 
 GEM
@@ -55,4 +55,4 @@ DEPENDENCIES
   validates_zipcode!
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.16)
+    validates_zipcode (0.0.18)
       activemodel (>= 3.2.0)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   validates_zipcode!
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.16)
+    validates_zipcode (0.0.18)
       activemodel (>= 3.2.0)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   validates_zipcode!
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.16)
+    validates_zipcode (0.0.18)
       activemodel (>= 3.2.0)
 
 GEM
@@ -53,4 +53,4 @@ DEPENDENCIES
   validates_zipcode!
 
 BUNDLED WITH
-   1.13.1
+   1.13.6

data/lib/validates_zipcode.rb

@@ -6,7 +6,7 @@ require "validates_zipcode/version"
 require "validates_zipcode/zipcode"
 
 module ValidatesZipcode
-  def self.valid?(zipcode, country_alpha2)
-    ValidatesZipcode::Zipcode.new(zipcode: zipcode, country_alpha2: country_alpha2).valid?
+  def self.valid?(zipcode, country_alpha2, options = {})
+    ValidatesZipcode::Zipcode.new(options.merge(zipcode: zipcode, country_alpha2: country_alpha2)).valid?
   end
 end

data/lib/validates_zipcode/cldr_regex_collection.rb

@@ -139,7 +139,9 @@ module ValidatesZipcode
       WF: /\A986\d{2}\z/,
       XK: /\A\d{5}\z/,
       YT: /\A976\d{2}\z/,
-      AE: /\A([a-zA-Z\d\s]){3,}\z/,
+      # NOTE: UAE has no postal codes
+      # https://github.com/dgilperez/validates_zipcode/issues/28
+      # AE: /\A([a-zA-Z\d\s]){3,}\z/,
       AF: /\A\d{4}\z/,
       AL: /\A\d{4}\z/,
       AG: /\A([a-zA-Z\d\s]){3,}\z/,
@@ -205,7 +207,7 @@ module ValidatesZipcode
       NR: /\A([a-zA-Z\d\s]){3,}\z/,
       PT: /\A\d{4}([\-]\d{3})?\z/,
       PS: /\A\d{3}\z/,
-      PA: /\A\d{6}\z/,
+      PA: /\A\d{4}\z/,
       PE: /\A\d{5}\z/,
       QA: /\A([a-zA-Z\d\s]){3,}\z/,
       RW: /\A([a-zA-Z\d\s]){3,}\z/,

data/lib/validates_zipcode/validator.rb

@@ -17,17 +17,23 @@ require 'active_model/validator'
 module ValidatesZipcode
   class Validator < ActiveModel::EachValidator
     def initialize(options)
-      @country_code           = options.fetch(:country_code) { }
-      @country_code_attribute = options.fetch(:country_code_attribute) { :country_alpha2 }
+      @country_code           = options.fetch(:country_code, nil)
+      @country_code_attribute = options.fetch(:country_code_attribute, :country_alpha2)
+      @excluded_country_codes = options.fetch(:excluded_country_codes, [])
 
       super
     end
 
     def validate_each(record, attribute, value)
-      alpha2 = @country_code || record.send(@country_code_attribute)
+      alpha2  = @country_code || record.send(@country_code_attribute)
+      options = { zipcode: value.to_s,
+                  country_alpha2: alpha2,
+                  excluded_country_codes: @excluded_country_codes }
 
-      unless ValidatesZipcode::Zipcode.new(zipcode: value.to_s, country_alpha2: alpha2).valid?
-        record.errors.add(attribute, I18n.t('errors.messages.invalid_zipcode', value: value, default: 'Zipcode is invalid'))
+      unless ValidatesZipcode::Zipcode.new(options).valid?
+        record.errors.add(attribute, :invalid_zipcode, message: I18n.t('errors.messages.invalid_zipcode',
+                                                       value: value,
+                                                       default: 'Zipcode is invalid'))
       end
     end
   end

data/lib/validates_zipcode/version.rb

@@ -1,3 +1,3 @@
 module ValidatesZipcode
-  VERSION = "0.0.17"
+  VERSION = '0.0.18'
 end

data/lib/validates_zipcode/zipcode.rb

@@ -3,11 +3,13 @@ module ValidatesZipcode
     include CldrRegexpCollection
 
     def initialize(args = {})
-      @zipcode        = args.fetch(:zipcode)
-      @country_alpha2 = args.fetch(:country_alpha2)
+      @zipcode                = args.fetch(:zipcode)
+      @country_alpha2         = args.fetch(:country_alpha2)
+      @excluded_country_codes = args.fetch(:excluded_country_codes, [])
     end
 
     def valid?
+      return true if @excluded_country_codes.include?(@country_alpha2)
       return true unless regexp
       !!(regexp =~ @zipcode)
     end

data/spec/validates_zipcode_spec.rb

@@ -135,7 +135,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('2100', 'RS')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '2100')
     end
   end
 
@@ -156,7 +156,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('21006', 'LT')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '21006')
     end
   end
 
@@ -168,7 +168,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('MD-2100', 'MD')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, 'MD-2100')
     end
   end
 
@@ -182,7 +182,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('4500-2500', 'PT')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '4500-2500')
     end
   end
 
@@ -196,7 +196,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('723155', 'BR')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '723155')
     end
   end
 
@@ -210,7 +210,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('723155', 'KR')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '723155')
     end
   end
 
@@ -224,7 +224,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('981 32', 'CZ')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '981 32')
     end
   end
 
@@ -238,7 +238,7 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('120 00', 'SK')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '120 00')
     end
   end
 
@@ -252,7 +252,41 @@ describe ValidatesZipcode, '#validate_each' do
 
     it 'does not validate with an invalid zipcode' do
       record = build_record('1200', 'IL')
-      zipcode_should_be_invalid(record)
+      zipcode_should_be_invalid(record, '1200')
+    end
+  end
+
+  context 'Panama' do
+    it 'validates with a valid zipcode' do
+      ['0800', '6369'].each do |zipcode|
+        record = build_record(zipcode, 'PA')
+        zipcode_should_be_valid(record)
+      end
+    end
+
+    it 'does not validate with an invalid zipcode' do
+      ['10800', '369', 'A341'].each do |zipcode|
+        record = build_record(zipcode, 'PA')
+        zipcode_should_be_invalid(record, zipcode)
+      end
+    end
+  end
+
+  context 'Excluded existing country code' do
+    context 'Panama' do
+      it 'validates with a valid zipcode' do
+        ['0800', '6369'].each do |zipcode|
+          record = build_record(zipcode, 'PA')
+          zipcode_should_be_valid(record, excluded_country_codes: ['PA'])
+        end
+      end
+
+      it 'validates with an invalid zipcode' do
+        ['10800', '369', 'A341'].each do |zipcode|
+          record = build_record(zipcode, 'PA')
+          zipcode_should_be_valid(record, excluded_country_codes: ['PA'])
+        end
+      end
     end
   end
 end
@@ -272,17 +306,21 @@ describe ValidatesZipcode, '.valid?' do
     it "is true with an unknown country code -  we don't have all!" do
       expect(ValidatesZipcode.valid?('12345', 'ZZ')).to eq(true)
     end
+
+    it "is true with an excluded country code -  we don't want those to fail and nil is hairy" do
+      expect(ValidatesZipcode.valid?('XXXX!!!XXXX', 'PA', excluded_country_codes: ['PA'])).to eq(true)
+    end
   end
 end
 
-def zipcode_should_be_valid(record)
-  ValidatesZipcode::Validator.new(attributes: :zipcode).validate(record)
+def zipcode_should_be_valid(record, options = {})
+  ValidatesZipcode::Validator.new(options.merge(attributes: :zipcode)).validate(record)
 
   expect(record.errors).to be_empty
 end
 
-def zipcode_should_be_invalid(record, zipcode = "invalid_zip")
-  ValidatesZipcode::Validator.new(attributes: :zipcode).validate(record)
+def zipcode_should_be_invalid(record, zipcode, options = {})
+  ValidatesZipcode::Validator.new(options.merge(attributes: :zipcode)).validate(record)
 
   expect(record.errors.size).to eq 1
   expect(record.errors.messages[:zipcode]).to include 'Zipcode is invalid'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_zipcode
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - David Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Localizable zipcode validation for Rails.