gds-api-adapters 83.0.0 → 85.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 921ed76df07dc2083415048acc0ddff80db26c5f3295691d81f7560f5d55d458
-  data.tar.gz: 21c0741d4e870e768a95b129c09a77d35cdd1f47c9bbdc9684d12192ebc3d5e5
+  metadata.gz: d0e7c159e27c8d969ceda2b447b8fcf1fe39528236bd924ee7dd33c97e27b6ea
+  data.tar.gz: c19e0660b7cf3e5ea2bd59ea39b940d45cd475230f45805f6f886606ab039e76
 SHA512:
-  metadata.gz: c94e219206c289f6ee340ed3c4384c936201fb93d867547546f4ca984f7fdafa6c69e3b677870b8c0d5003c50aaaa44da8e729bdc57820ef47b1a7a68eed0f7b
-  data.tar.gz: 600b41211a2911bcde2d6d9e0f218b015f66e02322a608b02bc19dc4a12b049837e20baf230c12bb6d58ac65e72fc9be75d1dd1910196d8092fd29b4420fb55b
+  metadata.gz: 765fd1eda340f5b5f38935d7502ef13429c69794044176e282e4884d7c5623a60d3b98c5931205ad198d490c5f42d9ee3b2fe17c68664cf819e617dfc68c9af3
+  data.tar.gz: 1f57b304c744502c45f6c4640bc294c42d33c20034204b27dd260aa277711163ada24e28ce7a843a6f97efa35f298fa6e5582e3b9e338f13501e5d1b17ad8a9e

data/Rakefile

@@ -12,6 +12,12 @@ Rake::TestTask.new("test") do |t|
   t.warning = false
 end
 
+Rake::TestTask.new("pact_test") do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/pacts/**/*_test.rb"]
+  t.warning = false
+end
+
 task default: %i[lint test]
 
 require "pact_broker/client/tasks"

data/lib/gds_api/imminence.rb

@@ -30,11 +30,6 @@ class GdsApi::Imminence < GdsApi::Base
     get_raw("#{@endpoint}/places/#{type}.kml").body
   end
 
-  def areas_for_postcode(postcode)
-    url = "#{@endpoint}/areas/#{uri_encode(postcode)}.json"
-    get_json(url)
-  end
-
   # @private
   def self.extract_location_hash(location)
     # Deal with all known location formats:

data/lib/gds_api/locations_api.rb

@@ -25,4 +25,22 @@ class GdsApi::LocationsApi < GdsApi::Base
 
     { "latitude" => response["average_latitude"], "longitude" => response["average_longitude"] } unless response["results"].nil?
   end
+
+  # Get all results for a postcode
+  #
+  # @param [String, nil] postcode The postcode for which results are requested
+  #
+  # @return [Hash] The fulls results as returned from Locations API, with the average latitude
+  # and longitude, and an array of results for individual addresses with lat/long/lcc, eg:
+  #  {
+  #  "average_latitude"=>51.43122412857143,
+  # "average_longitude"=>-0.37395367142857144,
+  # "results"=>
+  #  [{"address"=>"29, DEAN ROAD, HAMPTON, TW12 1AQ",
+  #    "latitude"=>51.4303819,
+  #    "longitude"=>-0.3745976,
+  #    "local_custodian_code"=>5810}, ETC...
+  def results_for_postcode(postcode)
+    get_json("#{endpoint}/v1/locations?postcode=#{postcode}")
+  end
 end

data/lib/gds_api/test_helpers/imminence.rb

@@ -12,21 +12,6 @@ module GdsApi
         stub_imminence_places_request(details["slug"], query_hash, details["details"])
       end
 
-      def stub_imminence_has_areas_for_postcode(postcode, areas)
-        results = {
-          "_response_info" => { "status" => "ok" },
-          "total" => areas.size,
-          "startIndex" => 1,
-          "pageSize" => areas.size,
-          "currentPage" => 1,
-          "pages" => 1,
-          "results" => areas,
-        }
-
-        stub_request(:get, %r{\A#{IMMINENCE_API_ENDPOINT}/areas/#{postcode}\.json})
-          .to_return(body: results.to_json)
-      end
-
       def stub_imminence_has_places_for_postcode(places, slug, postcode, limit)
         query_hash = { "postcode" => postcode, "limit" => limit }
         stub_imminence_places_request(slug, query_hash, places)

data/lib/gds_api/test_helpers/locations_api.rb

@@ -5,11 +5,11 @@ module GdsApi
 
       def stub_locations_api_has_location(postcode, locations)
         results = []
-        locations.each do |l|
+        locations.each_with_index do |l, i|
           results << {
+            "address" => l["address"] || "Empty Address #{i}",
             "latitude" => l["latitude"] || 0,
             "longitude" => l["longitude"] || 0,
-            "postcode" => postcode,
             "local_custodian_code" => l["local_custodian_code"],
           }
         end

data/lib/gds_api/test_helpers/search.rb

@@ -4,7 +4,7 @@ require "gds_api/test_helpers/json_client_helper"
 module GdsApi
   module TestHelpers
     module Search
-      SEARCH_ENDPOINT = Plek.find("search")
+      SEARCH_ENDPOINT = Plek.find("search-api")
 
       def stub_any_search_post(index: nil)
         if index

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "83.0.0".freeze
+  VERSION = "85.0.0".freeze
 end

data/lib/gds_api.rb

@@ -11,7 +11,6 @@ require "gds_api/licence_application"
 require "gds_api/link_checker_api"
 require "gds_api/local_links_manager"
 require "gds_api/locations_api"
-require "gds_api/mapit"
 require "gds_api/maslow"
 require "gds_api/organisations"
 require "gds_api/publishing_api"
@@ -123,13 +122,6 @@ module GdsApi
     GdsApi::LocationsApi.new(Plek.find("locations-api"), options)
   end
 
-  # Creates a GdsApi::Mapit adapter
-  #
-  # @return [GdsApi::Mapit]
-  def self.mapit(options = {})
-    GdsApi::Mapit.new(Plek.find("mapit"), options)
-  end
-
   # Creates a GdsApi::Maslow adapter
   #
   # It's set to use an external url as an endpoint as the Maslow adapter is
@@ -179,7 +171,7 @@ module GdsApi
   #
   # @return [GdsApi::Search]
   def self.search(options = {})
-    GdsApi::Search.new(Plek.find("search"), options)
+    GdsApi::Search.new(Plek.find("search-api"), options)
   end
 
   # Creates a GdsApi::Support adapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 83.0.0
+  version: 85.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pact
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +358,6 @@ files:
 - lib/gds_api/list_response.rb
 - lib/gds_api/local_links_manager.rb
 - lib/gds_api/locations_api.rb
-- lib/gds_api/mapit.rb
 - lib/gds_api/maslow.rb
 - lib/gds_api/middleware/govuk_header_sniffer.rb
 - lib/gds_api/organisations.rb
@@ -383,7 +382,6 @@ files:
 - lib/gds_api/test_helpers/link_checker_api.rb
 - lib/gds_api/test_helpers/local_links_manager.rb
 - lib/gds_api/test_helpers/locations_api.rb
-- lib/gds_api/test_helpers/mapit.rb
 - lib/gds_api/test_helpers/organisations.rb
 - lib/gds_api/test_helpers/publishing_api.rb
 - lib/gds_api/test_helpers/router.rb
@@ -419,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs

data/lib/gds_api/mapit.rb

@@ -1,51 +0,0 @@
-require_relative "base"
-require_relative "exceptions"
-
-class GdsApi::Mapit < GdsApi::Base
-  def location_for_postcode(postcode)
-    response = get_json("#{base_url}/postcode/#{CGI.escape postcode}.json")
-    Location.new(response) unless response.nil?
-  end
-
-  def areas_for_type(type)
-    get_json("#{base_url}/areas/#{type}.json")
-  end
-
-  def area_for_code(code_type, code)
-    get_json("#{base_url}/code/#{code_type}/#{code}.json")
-  end
-
-  class Location
-    attr_reader :response
-
-    def initialize(response)
-      @response = response
-    end
-
-    def lat
-      @response["wgs84_lat"]
-    end
-
-    def lon
-      @response["wgs84_lon"]
-    end
-
-    def areas
-      @response["areas"].map { |_i, area| OpenStruct.new(area) }
-    end
-
-    def postcode
-      @response["postcode"]
-    end
-
-    def country_name
-      @response["country_name"]
-    end
-  end
-
-private
-
-  def base_url
-    endpoint
-  end
-end

data/lib/gds_api/test_helpers/mapit.rb

@@ -1,91 +0,0 @@
-module GdsApi
-  module TestHelpers
-    module Mapit
-      MAPIT_ENDPOINT = Plek.find("mapit")
-
-      def stub_mapit_has_a_postcode(postcode, coords)
-        response = {
-          "wgs84_lat" => coords.first,
-          "wgs84_lon" => coords.last,
-          "postcode" => postcode,
-        }
-
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/#{postcode.tr(' ', '+')}.json")
-          .to_return(body: response.to_json, status: 200)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/#{postcode.split(' ').first}.json")
-          .to_return(body: response.to_json, status: 200)
-      end
-
-      def stub_mapit_has_a_postcode_and_areas(postcode, coords, areas)
-        response = {
-          "wgs84_lat" => coords.first,
-          "wgs84_lon" => coords.last,
-          "postcode" => postcode,
-        }
-
-        area_response = Hash[areas.map.with_index do |area, i|
-          [i,
-           {
-             "codes" => {
-               "ons" => area["ons"],
-               "gss" => area["gss"],
-               "govuk_slug" => area["govuk_slug"],
-             },
-             "name" => area["name"],
-             "type" => area["type"],
-             "country_name" => area["country_name"],
-           }]
-        end]
-
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/#{postcode.tr(' ', '+')}.json")
-          .to_return(body: response.merge("areas" => area_response).to_json, status: 200)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/#{postcode.split(' ').first}.json")
-          .to_return(body: response.to_json, status: 200)
-      end
-
-      def stub_mapit_has_a_postcode_and_country_name(postcode, coords, country_name)
-        response = {
-          "wgs84_lat" => coords.first,
-          "wgs84_lon" => coords.last,
-          "postcode" => postcode,
-          "country_name" => country_name,
-        }
-
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/#{postcode.tr(' ', '+')}.json")
-          .to_return(body: response.to_json, status: 200)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/#{postcode.split(' ').first}.json")
-          .to_return(body: response.to_json, status: 200)
-      end
-
-      def stub_mapit_does_not_have_a_postcode(postcode)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/#{postcode.tr(' ', '+')}.json")
-          .to_return(body: { "code" => 404, "error" => "No Postcode matches the given query." }.to_json, status: 404)
-      end
-
-      def stub_mapit_does_not_have_a_bad_postcode(postcode)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/#{postcode.tr(' ', '+')}.json")
-          .to_return(body: { "code" => 400, "error" => "Postcode '#{postcode}' is not valid." }.to_json, status: 400)
-      end
-
-      def stub_mapit_has_areas(area_type, areas)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/areas/#{area_type}.json")
-          .to_return(body: areas.to_json, status: 200)
-      end
-
-      def stub_mapit_does_not_have_areas(area_type)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/areas/#{area_type}.json")
-          .to_return(body: [].to_json, status: 200)
-      end
-
-      def stub_mapit_has_area_for_code(code_type, code, area)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/code/#{code_type}/#{code}.json")
-          .to_return(body: area.to_json, status: 200)
-      end
-
-      def stub_mapit_does_not_have_area_for_code(code_type, code)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/code/#{code_type}/#{code}.json")
-        .to_return(body: { "code" => 404, "error" => "No areas were found that matched code #{code_type} = #{code}." }.to_json, status: 404)
-      end
-    end
-  end
-end