postcode_validation 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8b4a803a5020000e3f4821f2cc88630325966e
-  data.tar.gz: 857b89f459c5be246d1f40f5a93aa9455bd57e43
+  metadata.gz: b1b7365d65c023287b34e28abfc3cfe8b1db68f1
+  data.tar.gz: 9d6173ff64a453177a2785b00268ef0e05174377
 SHA512:
-  metadata.gz: bd834808528eec1e1ed859aeb0402b64b648ac16b51b4a618ac7c8d68ebc7b95f740de0582d5e4a9d667be9ed87ebae0dcee6a74de0ad8eb778380ae57580cb9
-  data.tar.gz: a037eb83a887540faa3a2f07cffc8702e759c8334a0c73c52f432db1c95b7f85c7f3665b87ac5d21b9cb54ccde3d7a09c2c9f4b2785088deb2a512187cc1bad2
+  metadata.gz: d9a0615d997a863c470ed6a9730d90f677be4dc45a10bd9c6b46e1c9532f962976007477ea23a1fdf2ce2878c7ce9f20964c3ae5e1aa53fc2cb0ec76a9640bb7
+  data.tar.gz: c3746ff38a800745b7a355155598132bf6bac61e8c46f6c2114ffa9acedeeae8bea91e9f3af45357745323a3ba1740652f91d8ac0c7449e5ac22c2aa1e5a8fc6

data/README.md

@@ -1,12 +1,12 @@
 # PostcodeValidation [![Build Status](https://travis-ci.org/madetech/postcode_validation.svg?branch=master)](https://travis-ci.org/madetech/postcode_validation)
 
 This gem provides basic postcode validation functionality which can be used in any application
- 
+
 The specific validation that we perform goes beyond simple regex matching, to determine if the postcode actually exists.
- 
-To do this it uses PCAPredict.com's Capture+ API. 
+
+To do this it uses PCAPredict.com's Capture+ API.
 By leveraging this service we are able to provide validation against country's postcode that they support.
- 
+
 It also comes with out of the box plugins for:
 
 - Solidus
@@ -29,7 +29,7 @@ Or install it yourself as:
 
 ## Usage
 
-This gem relies on ```ENV['POSTCODE_ANYWHERE_KEY']``` being set to a valid PCAPredict service key for Capture+. 
+This gem relies on ```ENV['POSTCODE_ANYWHERE_KEY']``` being set to a valid PCAPredict service key for Capture+.
 
 One of the easiest ways to do this is to use the ```dotenv``` gem for this in your host application.
 
@@ -86,3 +86,4 @@ Key contributions:
 
 * [Craig J. Bass](https://github.com/craigjbass)
 * [Seb Ashton](https://github.com/sebashton)
+* [Chris Blackburn](https://github.com/chrisblackburn)

data/lib/postcode_validation/domain/potential_address_match.rb

@@ -1,18 +1,29 @@
 module PostcodeValidation
   module Domain
     class PotentialAddressMatch
-      def initialize(text:)
+      def initialize(text:, description:)
         @text = text
+        @description = description
       end
 
       def postcode_matches?(postcode)
-        letters_and_numbers_only(text).include?(letters_and_numbers_only(postcode.upcase))
+        normalised_postcode = letters_and_numbers_only(postcode.upcase)
+
+        text_includes?(normalised_postcode) || description_includes?(normalised_postcode)
       end
 
-      attr_reader :text
+      attr_reader :text, :description
 
       private
 
+      def text_includes?(postcode)
+        letters_and_numbers_only(text).include?(postcode)
+      end
+
+      def description_includes?(postcode)
+        letters_and_numbers_only(description).include?(postcode)
+      end
+
       def letters_and_numbers_only(postcode)
         postcode.gsub(/[^0-9a-zA-Z]/, '')
       end

data/lib/postcode_validation/gateway/pca_potential_address_match.rb

@@ -14,7 +14,8 @@ module PostcodeValidation
         response.map do |row|
           raise PCARequestError, error_message(row) if row.key?('Error')
 
-          PostcodeValidation::Domain::PotentialAddressMatch.new(text: row['Text'])
+          PostcodeValidation::Domain::PotentialAddressMatch.new(text: row['Text'],
+                                                                description: row['Description'])
         end
       end
 

data/lib/postcode_validation/use_case/validate_address.rb

@@ -27,7 +27,7 @@ module PostcodeValidation
         matches = potential_address_matches
         return false if matches.first.nil?
 
-        matches.map { |address| return true if address.postcode_matches? postcode }
+        matches.each { |address| return true if address.postcode_matches? postcode }
         false
       end
 

data/lib/postcode_validation/version.rb

@@ -1,3 +1,3 @@
 module PostcodeValidation
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: postcode_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Craig J. Bass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -115,10 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .env
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Provides really basic postcode validation (intended for eCommerce platforms).