postcode_validation 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '088fc75d33abd2357b07acb49dcf0163f6f23693'
-  data.tar.gz: 19cf3164986d0eb2e4521e1d9f948d8bbc8b07a2
+  metadata.gz: 9a2ee17af8ab9e30269ce747e03640806f649082
+  data.tar.gz: 7fb8833e0a5bdad90fdf10277f9455ca721067f9
 SHA512:
-  metadata.gz: a0bf80a864292625c161faef98f79bdf3105d34d8d593584b82c630337767a1a55312bcf7c053998e74429e00495d4c0e5ca52f4a93fc870e502e38bff230fde
-  data.tar.gz: 7603b41258a1d3e18d7ded44c4741f2ad18aa0bbcf5c3de0259d62d88996aa31616e9d5c997329d08094ddd78c271a597c7e72a6cc35cb3658d7e5c9ea7b15e8
+  metadata.gz: 6890ec86b5ecf3371daff0866f82bbcc845212b524abb80687a76bc518f06d9c6160c3cca9e0ca6bfe63b279fb004f219c8031da99a5dd15b077774e00ea7114
+  data.tar.gz: 9d90f00f2f74fb977d6a89ed34d8b159b84a80a45d67d591760ef098b8a05c128140b1b4c1896e6181ccca976fd00fb70201c3f5ed5e5b9dcb4ccd17529a33d9

data/lib/postcode_validation.rb

@@ -4,9 +4,12 @@ module PostcodeValidation
   require 'httparty'
   require 'postcode_validation/domain/potential_address_match'
   require 'postcode_validation/domain/address'
+  require 'postcode_validation/domain/address_detail'
   require 'postcode_validation/error/request_error'
   require 'postcode_validation/gateway/pca_potential_address_match'
   require 'postcode_validation/gateway/pca_address_list'
+  require 'postcode_validation/gateway/pca_address_detail'
   require 'postcode_validation/use_case/validate_address'
   require 'postcode_validation/use_case/address_list'
+  require 'postcode_validation/use_case/address_detail_retriever'
 end

data/lib/postcode_validation/domain/address.rb

@@ -1,17 +1,22 @@
 module PostcodeValidation
   module Domain
     class Address
-      def initialize(row:)
+      def initialize(row:, key:)
         @row = row
+        @key = key
       end
 
-      def street_address
+      def label
         "#{row['Text']}, #{row['Description']}"
       end
 
+      def id
+        row['Id']
+      end
+
       private
 
-      attr_reader :row
+      attr_reader :row, :key
     end
   end
 end

data/lib/postcode_validation/domain/address_detail.rb

@@ -0,0 +1,33 @@
+module PostcodeValidation
+  module Domain
+    class AddressDetail
+      def initialize(result:)
+        @result = result
+      end
+
+      def company
+        result['Company']
+      end
+
+      def address_line_1
+        result['Line1']
+      end
+
+      def address_line_2
+        result['Line2']
+      end
+
+      def city
+        result['City']
+      end
+
+      def country
+        result['CountryName']
+      end
+
+      private
+
+      attr_reader :result
+    end
+  end
+end

data/lib/postcode_validation/gateway/pca_address_detail.rb

@@ -0,0 +1,36 @@
+module PostcodeValidation
+  module Gateway
+    class PCAAddressDetail
+      include HTTParty
+
+      class PCARequestError < PostcodeValidation::Error::RequestError; end
+
+      KEY = ENV['POSTCODE_ANYWHERE_KEY']
+      base_uri 'https://services.postcodeanywhere.co.uk'
+
+      def find(id:)
+        PostcodeValidation::Domain::AddressDetail.new(result: address(id))
+      end
+
+      private
+
+      def error_message(row)
+        "#{row['Error']} #{row['Cause']} #{row['Resolution']}"
+      end
+
+      def address(id)
+        JSON.parse(
+          self.class.get(
+            '/Capture/Interactive/Retrieve/1.00/json.ws',
+            {
+              query: {
+                Id: id,
+                Key: KEY
+              }
+            }
+          ).body
+        ).first
+      end
+    end
+  end
+end

data/lib/postcode_validation/gateway/pca_address_list.rb

@@ -19,7 +19,7 @@ module PostcodeValidation
               more_results_id: row['Id']
             )
           elsif row['Type'] == 'Address'
-            PostcodeValidation::Domain::Address.new(row: row)
+            PostcodeValidation::Domain::Address.new(row: row, key: KEY)
           end
         end.flatten
       end

data/lib/postcode_validation/use_case/address_detail_retriever.rb

@@ -0,0 +1,42 @@
+require_relative 'validate_address/format_validator'
+
+module PostcodeValidation
+  module UseCase
+    class AddressDetailRetriever
+      def initialize(address_detail_retriever_gateway:, logger: nil)
+        @address_detail_retriever_gateway = address_detail_retriever_gateway
+        @logger = logger
+      end
+
+      def execute(id:)
+        address = find_address(id)
+
+        formatted(address)
+      rescue PostcodeValidation::Error::RequestError => e
+        log_error(e)
+      end
+
+      private
+
+      attr_reader :address_detail_retriever_gateway, :logger
+
+      def formatted(address)
+        {
+          address_line_1: address.address_line_1,
+          address_line_2: address.address_line_2,
+          company: address.company,
+          city: address.city,
+          country: address.country
+        }
+      end
+
+      def log_error(e)
+        logger.error(e) unless logger.nil?
+      end
+
+      def find_address(id)
+        @address_detail_retriever_gateway.find(id: id)
+      end
+    end
+  end
+end

data/lib/postcode_validation/use_case/address_list.rb

@@ -22,7 +22,10 @@ module PostcodeValidation
 
       def formatted(addresses)
         addresses.map do |address|
-          { street_address: address.street_address }
+          {
+            id: address.id,
+            label: address.label
+          }
         end
       end
 

data/lib/postcode_validation/version.rb

@@ -1,3 +1,3 @@
 module PostcodeValidation
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postcode_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Craig J. Bass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -125,12 +125,15 @@ files:
 - Rakefile
 - lib/postcode_validation.rb
 - lib/postcode_validation/domain/address.rb
+- lib/postcode_validation/domain/address_detail.rb
 - lib/postcode_validation/domain/potential_address_match.rb
 - lib/postcode_validation/error/request_error.rb
+- lib/postcode_validation/gateway/pca_address_detail.rb
 - lib/postcode_validation/gateway/pca_address_list.rb
 - lib/postcode_validation/gateway/pca_potential_address_match.rb
 - lib/postcode_validation/plugins/solidus.rb
 - lib/postcode_validation/plugins/solidus/models/concerns/spree_order_postcode_valid.rb
+- lib/postcode_validation/use_case/address_detail_retriever.rb
 - lib/postcode_validation/use_case/address_list.rb
 - lib/postcode_validation/use_case/validate_address.rb
 - lib/postcode_validation/use_case/validate_address/format_validator.rb