validates_zipcode 0.0.18 → 0.0.19

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.0.19
+
+- Fixes JP and IE formats, thanks to ~ @timokleemann
+
 ## 0.0.18
 
 - Adds support for `excluded_country_codes` in the validation setup.

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.18)
+    validates_zipcode (0.0.19)
       activemodel (>= 3.2.0)
 
 GEM

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.18)
+    validates_zipcode (0.0.19)
       activemodel (>= 3.2.0)
 
 GEM

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.18)
+    validates_zipcode (0.0.19)
       activemodel (>= 3.2.0)
 
 GEM

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.18)
+    validates_zipcode (0.0.19)
       activemodel (>= 3.2.0)
 
 GEM

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    validates_zipcode (0.0.18)
+    validates_zipcode (0.0.19)
       activemodel (>= 3.2.0)
 
 GEM

data/lib/validates_zipcode/cldr_regex_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Regex source: http://unicode.org/cldr/trac/browser/trunk/common/supplemental/postalCodeData.xml
 # 159 countries supported
 #
@@ -9,7 +10,7 @@ module ValidatesZipcode
       GG: /\AGY\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/,
       IM: /\AIM\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}\z/,
       US: /\A\d{5}([ \-](?:\d{4}|\d{6}))?\z/,
-      IE: /\A([AC-FHKNPRTV-Y]\d{2}|D6W)[0-9AC-FHKNPRTV-Y]{4}\z/,
+      IE: /\A([AC-FHKNPRTV-Y]\d{2}|D6W)\s?[0-9AC-FHKNPRTV-Y]{4}\z/,
       CA: /\A[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJ-NPRSTV-Z][ ]?\d[ABCEGHJ-NPRSTV-Z]\d\z/,
       DE: /\A\d{5}\z/,
       AU: /\A\d{4}\z/,
@@ -184,7 +185,7 @@ module ValidatesZipcode
       HN: /\A(([a-zA-Z]){2}|\d{2})\d{4}\z/,
       IO: /\A\d{5}\z/,
       IR: /\A\d{5}\z/,
-      JP: /\A\d{7}\z/,
+      JP: /\A\d{3}\-?\d{4}\z/,
       JM: /\A(JM)[A-Z]{3}\d{2}\z/,
       KI: /\A([a-zA-Z\d\s]){3,}\z/,
       KN: /\A([a-zA-Z\d\s]){3,8}\z/,

data/lib/validates_zipcode/helper_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveModel
   module Validations
     module HelperMethods

data/lib/validates_zipcode/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ValidatesZipcode
   class Railtie < Rails::Railtie
   end

data/lib/validates_zipcode/validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Usage:
 #
 # class User < ActiveModel
@@ -32,8 +33,8 @@ module ValidatesZipcode
 
       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'))
+          value: value,
+          default: 'Zipcode is invalid'))
       end
     end
   end

data/lib/validates_zipcode/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ValidatesZipcode
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

data/lib/validates_zipcode/zipcode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ValidatesZipcode
   class Zipcode
     include CldrRegexpCollection

data/lib/validates_zipcode.rb

@@ -1,9 +1,10 @@
-require "validates_zipcode/railtie" if defined?(Rails)
-require "validates_zipcode/cldr_regex_collection"
-require "validates_zipcode/validator"
-require "validates_zipcode/helper_methods"
-require "validates_zipcode/version"
-require "validates_zipcode/zipcode"
+# frozen_string_literal: true
+require 'validates_zipcode/railtie' if defined?(Rails)
+require 'validates_zipcode/cldr_regex_collection'
+require 'validates_zipcode/validator'
+require 'validates_zipcode/helper_methods'
+require 'validates_zipcode/version'
+require 'validates_zipcode/zipcode'
 
 module ValidatesZipcode
   def self.valid?(zipcode, country_alpha2, options = {})

data/spec/spec_helper.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'validates_zipcode'

data/spec/validates_zipcode_spec.rb

@@ -1,88 +1,71 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ValidatesZipcode, '#validate_each' do
-  context "Luxembourg" do
+  context 'Argentina' do
     it 'does not add errors with a valid zipcode' do
-      ['L-5635', '5635'].each do |zipcode|
-        record = build_record(zipcode, "LU")
-        zipcode_should_be_valid(record)
-      end
-    end
-
-    it 'adds errors with an invalid Zipcode' do
-      ['124', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'LU')
-        zipcode_should_be_invalid(record, zipcode)
-      end
-    end
-  end
-
-  context "Spain" do
-    it 'does not add errors with a valid zipcode' do
-      record = build_record('93108', "ES")
+      record = build_record('C1424CHN', 'AR')
       zipcode_should_be_valid(record)
     end
 
     it 'adds errors with an invalid Zipcode' do
-      ['1234', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'ES')
+      %w[1234 12345 D0D0D0 invalid_zip].each do |zipcode|
+        record = build_record(zipcode, 'AR')
         zipcode_should_be_invalid(record, zipcode)
       end
     end
   end
 
-  context "USA" do
+  context 'Australia and New Zeland' do
     it 'does not add errors with a valid zipcode' do
-      record = build_record('93108', "US")
-      zipcode_should_be_valid(record)
-      [12345, '12345', '12345-1234', '12345-123456', '12345 1234', '12345 123456'].each do |zipcode|
-        record = build_record(zipcode, 'US')
+      %w[AU NZ].each do |code|
+        record = build_record('9310', code)
         zipcode_should_be_valid(record)
       end
     end
 
     it 'adds errors with an invalid Zipcode' do
-      ['1234', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'US')
-        zipcode_should_be_invalid(record, zipcode)
+      %w[AU NZ].each do |code|
+        %w[C1424CHN 12345 invalid_zip].each do |zipcode|
+          record = build_record(zipcode, code)
+          zipcode_should_be_invalid(record, zipcode)
+        end
       end
     end
   end
 
-  context "Ireland" do
-    it 'does not add errors with a valid postcode' do
-      ['D6W1234', 'A230984', 'D00AV92', 'Y631FHK', 'A000000', 'D44N4X4'].each do |zipcode|
-        record = build_record(zipcode, 'IE')
+  context 'Brazil' do
+    it 'validates with a valid zipcode' do
+      ['72315', '72315-500', '72315500', '24210-325', '24210325'].each do |zipcode|
+        record = build_record(zipcode, 'BR')
         zipcode_should_be_valid(record)
       end
     end
 
-    it 'adds errors with an invalid Zipcode' do
-      ['1234', '12345-12345', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'IE')
-        zipcode_should_be_invalid(record, zipcode)
-      end
+    it 'does not validate with an invalid zipcode' do
+      record = build_record('723155', 'BR')
+      zipcode_should_be_invalid(record, '723155')
     end
   end
 
-  context "Argentina" do
+  context 'Canada' do
     it 'does not add errors with a valid zipcode' do
-      record = build_record('C1424CHN', "AR")
+      record = build_record('A1J2Z9', 'CA')
       zipcode_should_be_valid(record)
     end
 
     it 'adds errors with an invalid Zipcode' do
-      ['1234', '12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'AR')
+      %w[C1424CHN 12345 D0D0D0 invalid_zip].each do |zipcode|
+        record = build_record(zipcode, 'CA')
         zipcode_should_be_invalid(record, zipcode)
       end
     end
   end
 
-  context "Chile" do
+  context 'Chile' do
     it 'does not add errors with a valid zipcode' do
       ['123-1233', '000-0000', '1234567'].each do |zipcode|
-        record = build_record(zipcode, "CL")
+        record = build_record(zipcode, 'CL')
         zipcode_should_be_valid(record)
       end
     end
@@ -95,54 +78,62 @@ describe ValidatesZipcode, '#validate_each' do
     end
   end
 
-  context "Australia and New Zeland" do
-    it 'does not add errors with a valid zipcode' do
-      ["AU", "NZ"].each do |code|
-        record = build_record('9310', code)
+  context 'Czech' do
+    it 'validates with a valid zipcode' do
+      ['12000', '721 00'].each do |zipcode|
+        record = build_record(zipcode, 'CZ')
         zipcode_should_be_valid(record)
       end
     end
 
-    it 'adds errors with an invalid Zipcode' do
-      ["AU", "NZ"].each do |code|
-        ['C1424CHN', '12345', 'invalid_zip'].each do |zipcode|
-          record = build_record(zipcode, code)
-          zipcode_should_be_invalid(record, zipcode)
-        end
-      end
+    it 'does not validate with an invalid zipcode' do
+      record = build_record('981 32', 'CZ')
+      zipcode_should_be_invalid(record, '981 32')
     end
   end
 
-  context "Canada" do
-    it 'does not add errors with a valid zipcode' do
-      record = build_record('A1J2Z9', 'CA')
-      zipcode_should_be_valid(record)
+  context 'Ireland' do
+    it 'does not add errors with a valid postcode - old format' do
+      ['D02 AF30', 'X91 PK81', 'V94 H2PP', 'D07 R6YE', 'D6W1234',
+        'A230984', 'D00AV92', 'Y631FHK', 'A000000', 'D44N4X4'].each do |zipcode|
+        record = build_record(zipcode, 'IE')
+        zipcode_should_be_valid(record)
+      end
     end
 
     it 'adds errors with an invalid Zipcode' do
-      ['C1424CHN', '12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
-        record = build_record(zipcode, 'CA')
+      ['1234', '12345-12345', 'invalid_zip'].each do |zipcode|
+        record = build_record(zipcode, 'IE')
         zipcode_should_be_invalid(record, zipcode)
       end
     end
   end
 
-  context 'Serbia' do
+  context 'Israel' do
     it 'validates with a valid zipcode' do
-      record = build_record('21000', 'RS')
-      zipcode_should_be_valid(record)
+      %w[1029200 880000 90001].each do |zipcode|
+        record = build_record(zipcode, 'IL')
+        zipcode_should_be_valid(record)
+      end
     end
 
     it 'does not validate with an invalid zipcode' do
-      record = build_record('2100', 'RS')
-      zipcode_should_be_invalid(record, '2100')
+      record = build_record('1200', 'IL')
+      zipcode_should_be_invalid(record, '1200')
     end
   end
 
-  context "unknown country" do
-    it 'does not add errors with a any zipcode' do
-      record = build_record('A1J2Z9', 'ZZ')
-      zipcode_should_be_valid(record)
+  context 'Japan' do
+    it 'validates with a valid zipcode' do
+      %w[1029200 102-9200 408-0301 207-1000].each do |zipcode|
+        record = build_record(zipcode, 'JP')
+        zipcode_should_be_valid(record)
+      end
+    end
+
+    it 'does not validate with an invalid zipcode' do
+      record = build_record('1200', 'JP')
+      zipcode_should_be_invalid(record, '1200')
     end
   end
 
@@ -160,6 +151,22 @@ describe ValidatesZipcode, '#validate_each' do
     end
   end
 
+  context 'Luxembourg' do
+    it 'does not add errors with a valid zipcode' do
+      ['L-5635', '5635'].each do |zipcode|
+        record = build_record(zipcode, 'LU')
+        zipcode_should_be_valid(record)
+      end
+    end
+
+    it 'adds errors with an invalid Zipcode' do
+      ['124', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
+        record = build_record(zipcode, 'LU')
+        zipcode_should_be_invalid(record, zipcode)
+      end
+    end
+  end
+
   context 'Moldova' do
     it 'validates with a valid zipcode' do
       record = build_record('MD2001', 'MD')
@@ -172,59 +179,45 @@ describe ValidatesZipcode, '#validate_each' do
     end
   end
 
-  context 'Portugal' do
+  context 'Panama' do
     it 'validates with a valid zipcode' do
-      ['4500', '4500-250'].each do |zipcode|
-        record = build_record(zipcode, 'PT')
+      %w[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
-      record = build_record('4500-2500', 'PT')
-      zipcode_should_be_invalid(record, '4500-2500')
-    end
-  end
-
-  context 'Brazil' do
-    it 'validates with a valid zipcode' do
-      ['72315', '72315-500', '72315500', '24210-325', '24210325'].each do |zipcode|
-        record = build_record(zipcode, 'BR')
-        zipcode_should_be_valid(record)
+      %w[10800 369 A341].each do |zipcode|
+        record = build_record(zipcode, 'PA')
+        zipcode_should_be_invalid(record, zipcode)
       end
     end
-
-    it 'does not validate with an invalid zipcode' do
-      record = build_record('723155', 'BR')
-      zipcode_should_be_invalid(record, '723155')
-    end
   end
 
-  context 'South Korea' do
+  context 'Portugal' do
     it 'validates with a valid zipcode' do
-      ['72315', '723-150', '11011', '110-110'].each do |zipcode|
-        record = build_record(zipcode, 'KR')
+      ['4500', '4500-250'].each do |zipcode|
+        record = build_record(zipcode, 'PT')
         zipcode_should_be_valid(record)
       end
     end
 
     it 'does not validate with an invalid zipcode' do
-      record = build_record('723155', 'KR')
-      zipcode_should_be_invalid(record, '723155')
+      record = build_record('4500-2500', 'PT')
+      zipcode_should_be_invalid(record, '4500-2500')
     end
   end
 
-  context 'Czech' do
+  context 'Serbia' do
     it 'validates with a valid zipcode' do
-      ['12000', '721 00'].each do |zipcode|
-        record = build_record(zipcode, 'CZ')
-        zipcode_should_be_valid(record)
-      end
+      record = build_record('21000', 'RS')
+      zipcode_should_be_valid(record)
     end
 
     it 'does not validate with an invalid zipcode' do
-      record = build_record('981 32', 'CZ')
-      zipcode_should_be_invalid(record, '981 32')
+      record = build_record('2100', 'RS')
+      zipcode_should_be_invalid(record, '2100')
     end
   end
 
@@ -242,47 +235,70 @@ describe ValidatesZipcode, '#validate_each' do
     end
   end
 
-  context 'Israel' do
+  context 'Spain' do
+    it 'does not add errors with a valid zipcode' do
+      record = build_record('93108', 'ES')
+      zipcode_should_be_valid(record)
+    end
+
+    it 'adds errors with an invalid Zipcode' do
+      ['1234', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
+        record = build_record(zipcode, 'ES')
+        zipcode_should_be_invalid(record, zipcode)
+      end
+    end
+  end
+
+  context 'South Korea' do
     it 'validates with a valid zipcode' do
-      ['1029200', '880000', '90001'].each do |zipcode|
-        record = build_record(zipcode, 'IL')
+      ['72315', '723-150', '11011', '110-110'].each do |zipcode|
+        record = build_record(zipcode, 'KR')
         zipcode_should_be_valid(record)
       end
     end
 
     it 'does not validate with an invalid zipcode' do
-      record = build_record('1200', 'IL')
-      zipcode_should_be_invalid(record, '1200')
+      record = build_record('723155', 'KR')
+      zipcode_should_be_invalid(record, '723155')
     end
   end
 
-  context 'Panama' do
-    it 'validates with a valid zipcode' do
-      ['0800', '6369'].each do |zipcode|
-        record = build_record(zipcode, 'PA')
+  context 'USA' do
+    it 'does not add errors with a valid zipcode' do
+      record = build_record('93108', 'US')
+      zipcode_should_be_valid(record)
+      [12_345, '12345', '12345-1234', '12345-123456', '12345 1234', '12345 123456'].each do |zipcode|
+        record = build_record(zipcode, 'US')
         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')
+    it 'adds errors with an invalid Zipcode' do
+      ['1234', '12345-12345', 'D0D0D0', 'invalid_zip'].each do |zipcode|
+        record = build_record(zipcode, 'US')
         zipcode_should_be_invalid(record, zipcode)
       end
     end
   end
 
+  context 'unknown country' do
+    it 'does not add errors with a any zipcode' do
+      record = build_record('A1J2Z9', 'ZZ')
+      zipcode_should_be_valid(record)
+    end
+  end
+
   context 'Excluded existing country code' do
     context 'Panama' do
       it 'validates with a valid zipcode' do
-        ['0800', '6369'].each do |zipcode|
+        %w[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|
+        %w[10800 369 A341].each do |zipcode|
           record = build_record(zipcode, 'PA')
           zipcode_should_be_valid(record, excluded_country_codes: ['PA'])
         end
@@ -292,7 +308,7 @@ describe ValidatesZipcode, '#validate_each' do
 end
 
 describe ValidatesZipcode, '.valid?' do
-  context "Spain" do
+  context 'Spain' do
     it 'is true with a valid zipcode for a given country code' do
       expect(ValidatesZipcode.valid?('93108', 'ES')).to eq(true)
     end
@@ -319,7 +335,7 @@ def zipcode_should_be_valid(record, options = {})
   expect(record.errors).to be_empty
 end
 
-def zipcode_should_be_invalid(record, zipcode, options = {})
+def zipcode_should_be_invalid(record, _zipcode, options = {})
   ValidatesZipcode::Validator.new(options.merge(attributes: :zipcode)).validate(record)
 
   expect(record.errors.size).to eq 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_zipcode
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - David Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md