postcode_validation 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe07cc9370f09af86639db17e609b5c91fb9e6a
-  data.tar.gz: ebc2119d78ffa900494f3a4663601b5d19873820
+  metadata.gz: 57328fd6ac678a16c52495ac3b0d52d570b7bd60
+  data.tar.gz: 8dee6be4036960966659ec23af27524e437ed18d
 SHA512:
-  metadata.gz: 6d8b1e78377725afe985594b28e855a0dcf4ab70b2328c0832dce444b88573cf7595734e7002a6e8715f1dc4698b982ef421289cb06e45d1bc18228f303c5d54
-  data.tar.gz: 2c773ae59d59578fb0aab31259e8a9b76571153a0a8a2edcb1d2780803a8beef7cc0fb4d4d2813c3f704712cf87d93c7c0420e9e29c857cab0a25ccce91689f2
+  metadata.gz: ed9c52f3533f04e9e33e9e85f2b2da07a865bf5022998162a1b4cef7f79445d19c82be438449d6d2dd509f7cfdf0c2a1812be8d2f0faf72225008c285456fa2d
+  data.tar.gz: 2627c832bbb3c9ed1a90cd8c6c06aa6acb866591130aedc6ad5844124ecede7c76dfa77dcb362c0827b9a57dea45b6d86920b1bebead69016f1c16c59b321f07

data/lib/postcode_validation/use_case/validate_address/format_validator.rb

@@ -3,13 +3,14 @@ require_relative 'format_validators/be_postcode_validator'
 require_relative 'format_validators/gb_postcode_validator'
 require_relative 'format_validators/fr_postcode_validator'
 require_relative 'format_validators/sg_postcode_validator'
+require_relative 'format_validators/in_postcode_validator'
 require_relative 'format_validators/no_op_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       class FormatValidator
-        def for country
+        def for(country)
           case country
             when 'NL'
               FormatValidators::NLPostcodeValidator.new
@@ -21,6 +22,8 @@ module PostcodeValidation
               FormatValidators::FRPostcodeValidator.new
             when 'SG'
               FormatValidators::SGPostcodeValidator.new
+            when 'IN'
+              FormatValidators::INPostcodeValidator.new
             else
               FormatValidators::NoOpPostcodeValidator.new
           end

data/lib/postcode_validation/use_case/validate_address/format_validators/be_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_external_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class BEPostcodeValidator < RegexValidator
+          include UseExternalPostcodeValidator
+
           REGEX = /^[1-9]{1}[0-9]{3}$/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/fr_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_external_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class FRPostcodeValidator < RegexValidator
+          include UseExternalPostcodeValidator
+
           REGEX = /^(F-)?((2[A|B])|[0-9]{2})[0-9]{3}$/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/gb_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_external_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class GBPostcodeValidator < RegexValidator
+          include UseExternalPostcodeValidator
+
           REGEX = /(?i)([A-Z]{1,2}[0-9]{1,2}[A-Z]?)\s*([0-9][A-Z]{2})/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/in_postcode_validator.rb

@@ -0,0 +1,16 @@
+require_relative 'regex_validator'
+require_relative 'use_format_check_only'
+
+module PostcodeValidation
+  module UseCase
+    class ValidateAddress
+      module FormatValidators
+        class INPostcodeValidator < RegexValidator
+          include UseFormatCheckOnly
+
+          REGEX = /^[1-9][0-9]{5}$/
+        end
+      end
+    end
+  end
+end

data/lib/postcode_validation/use_case/validate_address/format_validators/nl_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_external_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class NLPostcodeValidator < RegexValidator
+          include UseExternalPostcodeValidator
+
           REGEX = /(NL-)?(\d{4})\s*([A-Za-z]{2})/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/no_op_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_external_postcode_validator'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class NoOpPostcodeValidator < RegexValidator
+          include UseExternalPostcodeValidator
+
           REGEX = /.*/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/sg_postcode_validator.rb

@@ -1,10 +1,13 @@
 require_relative 'regex_validator'
+require_relative 'use_format_check_only'
 
 module PostcodeValidation
   module UseCase
     class ValidateAddress
       module FormatValidators
         class SGPostcodeValidator < RegexValidator
+          include UseFormatCheckOnly
+
           REGEX = /^\d{6}$/
         end
       end

data/lib/postcode_validation/use_case/validate_address/format_validators/use_external_postcode_validator.rb

@@ -0,0 +1,13 @@
+module PostcodeValidation
+  module UseCase
+    class ValidateAddress
+      module FormatValidators
+        module UseExternalPostcodeValidator
+          def format_check_only?
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/postcode_validation/use_case/validate_address/format_validators/use_format_check_only.rb

@@ -0,0 +1,13 @@
+module PostcodeValidation
+  module UseCase
+    class ValidateAddress
+      module FormatValidators
+        module UseFormatCheckOnly
+          def format_check_only?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/postcode_validation/use_case/validate_address.rb

@@ -7,19 +7,14 @@ module PostcodeValidation
         @format_validator = FormatValidator.new
         @address_match_gateway = address_match_gateway
         @logger = logger
-        @errors = []
       end
 
       def execute(postcode:, country:)
+        @errors = []
         check_country(country)
 
-        if country == 'SG'
-          check_postcode_format(postcode_without_spaces(postcode), country)
-
-          if @errors.empty?
-            return { valid?: true, reason: ['valid_postcode'] }
-          end
-        end
+        postcode = postcode_without_spaces(postcode)
+        return the_postcode_is_valid if use_local_validator?(country) && format_valid_for_country?(country, postcode)
 
         check_postcode_format(postcode, country)
         result = matched_addresses(postcode, country)
@@ -39,7 +34,7 @@ module PostcodeValidation
         return { valid?: false, reason: @errors } unless @errors.empty?
 
         result.each do |address|
-          return { valid?: true, reason: ['valid_postcode'] } if address.postcode_matches? postcode
+          return the_postcode_is_valid if address.postcode_matches? postcode
         end
 
         { valid?: false, reason: ['no_postcode_matches_found'] }
@@ -64,8 +59,24 @@ module PostcodeValidation
 
       def check_postcode_format(postcode, country)
         return if country.nil?
+        @errors << 'invalid_format' unless format_valid_for_country?(country, postcode)
+      end
+
+      def format_valid_for_country?(country, postcode)
         validator = @format_validator.for(country)
-        @errors << 'invalid_format' if !validator.valid?(postcode)
+        format_valid?(postcode, validator)
+      end
+
+      def format_valid?(postcode, validator)
+        validator.valid?(postcode)
+      end
+
+      def use_local_validator?(country)
+        format_check_only?(@format_validator.for(country))
+      end
+
+      def format_check_only?(validator)
+        validator.format_check_only?
       end
 
       def gracefully_handle_error(error)
@@ -76,6 +87,10 @@ module PostcodeValidation
       def postcode_without_spaces(postcode)
         postcode.gsub(' ', '')
       end
+
+      def the_postcode_is_valid
+        { valid?: true, reason: ['valid_postcode'] }
+      end
     end
   end
 end

data/lib/postcode_validation/version.rb

@@ -1,3 +1,3 @@
 module PostcodeValidation
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postcode_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Craig J. Bass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -140,10 +140,13 @@ files:
 - lib/postcode_validation/use_case/validate_address/format_validators/be_postcode_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/fr_postcode_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/gb_postcode_validator.rb
+- lib/postcode_validation/use_case/validate_address/format_validators/in_postcode_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/nl_postcode_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/no_op_postcode_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/regex_validator.rb
 - lib/postcode_validation/use_case/validate_address/format_validators/sg_postcode_validator.rb
+- lib/postcode_validation/use_case/validate_address/format_validators/use_external_postcode_validator.rb
+- lib/postcode_validation/use_case/validate_address/format_validators/use_format_check_only.rb
 - lib/postcode_validation/version.rb
 - postcode_validation.gemspec
 homepage: 
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Provides really basic postcode validation (intended for eCommerce platforms).