postcode_validation 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85d70cc5c0dca698702ada4030e4cec7930669e4
-  data.tar.gz: aed97e95e68d47aef10598b777465df5cc688201
+  metadata.gz: '088fc75d33abd2357b07acb49dcf0163f6f23693'
+  data.tar.gz: 19cf3164986d0eb2e4521e1d9f948d8bbc8b07a2
 SHA512:
-  metadata.gz: 976aa07fbedf7c9b5623657f75799bc64edb7c7da61f004dbd843bde8cdb009bef972768f0c3d21e3a3c066e42a71db6993c84b2dbffe01963b29eac5eac6cc7
-  data.tar.gz: a8a18ee919b5740f47e6f21cc7f5ca9ebff572b8ac40817a3e05650ac368453884302c23c5a3983fb63d105a1e8d492bac86a9ab54a197f37094dc0da0fc8c37
+  metadata.gz: a0bf80a864292625c161faef98f79bdf3105d34d8d593584b82c630337767a1a55312bcf7c053998e74429e00495d4c0e5ca52f4a93fc870e502e38bff230fde
+  data.tar.gz: 7603b41258a1d3e18d7ded44c4741f2ad18aa0bbcf5c3de0259d62d88996aa31616e9d5c997329d08094ddd78c271a597c7e72a6cc35cb3658d7e5c9ea7b15e8

data/lib/postcode_validation/domain/address.rb

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

data/lib/postcode_validation/gateway/pca_address_list.rb

@@ -8,15 +8,20 @@ module PostcodeValidation
       KEY = ENV['POSTCODE_ANYWHERE_KEY']
       base_uri 'https://services.postcodeanywhere.co.uk'
 
-      def query(search_term:, country:)
-        response = address_list_for_postcode(country, search_term)
-
-        response.map do |row|
+      def query(search_term:, country:, more_results_id: nil)
+        address_list_for_postcode(country, search_term, more_results_id).map do |row|
           raise PCARequestError, error_message(row) if row.key?('Error')
 
-          PostcodeValidation::Domain::Address.new(street_address: row['StreetAddress'],
-                                                  place: row['Place'])
-        end
+          if row['Type'] == 'Postcode'
+            self.class.new.query(
+              country: country,
+              search_term: search_term,
+              more_results_id: row['Id']
+            )
+          elsif row['Type'] == 'Address'
+            PostcodeValidation::Domain::Address.new(row: row)
+          end
+        end.flatten
       end
 
       private
@@ -25,19 +30,27 @@ module PostcodeValidation
         "#{row['Error']} #{row['Cause']} #{row['Resolution']}"
       end
 
-      def address_list_for_postcode(country, search_term)
-        JSON.parse(self.class.get('/PostcodeAnywhere/Interactive/Find/1.1/json.ws', lookup_parameters(country, search_term)).body)
+      def address_list_for_postcode(country, search_term, more_results_id)
+        JSON.parse(
+          self.class.get(
+            '/Capture/Interactive/Find/1.00/json.ws',
+            lookup_parameters(country, search_term, more_results_id)
+          ).body
+        )
       end
 
-      def lookup_parameters(country, search_term)
-        {
+      def lookup_parameters(country, search_term, more_results_id)
+        result = {
           query: {
-            Country: country,
+            Countries: country,
             Key: KEY,
-            SearchTerm: search_term,
-            Filter: 'None'
+            Text: search_term,
+            Limit: 8
           }
         }
+
+        result[:query].merge!(Container: more_results_id) unless more_results_id.nil?
+        result
       end
     end
   end

data/lib/postcode_validation/use_case/address_list.rb

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

data/lib/postcode_validation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postcode_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Craig J. Bass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty