gds-api-adapters 85.0.1 → 87.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0dc3a7a3430d48165ca6e1b8720675dc9a1e5a94e8180d881d10f55af0c3a1
-  data.tar.gz: d12927fcfda065d8f8e9a51fbf01bcca3a4a8dd9e8b77550ed7cba34cb3b5145
+  metadata.gz: e981660988eed87b9cc48de790fe7d569e3f87f23d517f02b3de113dca5b54cb
+  data.tar.gz: 29cc9f3064a3af6ea39fa0c58552577b092aa52a3549e2d2a268e9a601e018f8
 SHA512:
-  metadata.gz: 7d3833134e981234ae2b3a9abc1c433b1f7e51c96fbc0b733f0e0ec325b515dea0513ae9fabcb7767c9a4a93117066429061aecd1a25a4d3ff50777655bfdaf7
-  data.tar.gz: d0774cdaa3d94aa927aa54c451434eb6036e2c4973864ee770186943f7fb106bbbf21e98756f11a274147c5e7568f22193781263fa20423876a3fb680ec983bd
+  metadata.gz: 5d0c4b0d21493fa6f352bd86bdfe181f0994e8803b60fd7233cf43848dc87389ce313042c8aa1499684f87496231267eb61bb0bd069b5c208ca596d4a203064b
+  data.tar.gz: 91ee52e953390ec47e4b6e507c5b6591476acb4de98fa683a39ef4423ba3c9cf5fd3b02ec245eebe199467f4d277934e868e22e1523fbdcb8e437f45919b460c

data/Rakefile

@@ -22,16 +22,14 @@ task default: %i[lint test]
 
 require "pact_broker/client/tasks"
 
-def configure_pact_broker_location(task)
+PactBroker::Client::PublicationTask.new do |task|
+  task.consumer_version = ENV.fetch("PACT_CONSUMER_VERSION")
   task.pact_broker_base_url = ENV.fetch("PACT_BROKER_BASE_URL")
-  if ENV["PACT_BROKER_USERNAME"]
-    task.pact_broker_basic_auth = { username: ENV["PACT_BROKER_USERNAME"], password: ENV["PACT_BROKER_PASSWORD"] }
-  end
-end
-
-PactBroker::Client::PublicationTask.new("branch") do |task|
-  task.consumer_version = ENV.fetch("PACT_TARGET_BRANCH")
-  configure_pact_broker_location(task)
+  task.pact_broker_basic_auth = {
+    username: ENV.fetch("PACT_BROKER_USERNAME"),
+    password: ENV.fetch("PACT_BROKER_PASSWORD"),
+  }
+  task.pattern = ENV["PACT_PATTERN"] if ENV["PACT_PATTERN"]
 end
 
 desc "Run the linter against changed files"

data/lib/gds_api/imminence.rb

@@ -2,55 +2,24 @@ require_relative "base"
 
 class GdsApi::Imminence < GdsApi::Base
   def api_url(type, params)
-    vals = %i[limit lat lng postcode].select { |p| params.include? p }
+    vals = %i[limit lat lng postcode local_authority_slug].select { |p| params.include? p }
     querystring = URI.encode_www_form(vals.map { |p| [p, params[p]] })
     "#{@endpoint}/places/#{type}.json?#{querystring}"
   end
 
   def places(type, lat, lon, limit = 5)
     url = api_url(type, lat: lat, lng: lon, limit: limit)
-    places = get_json(url) || []
-    places.map { |p| self.class.parse_place_hash(p) }
+    get_json(url)
   end
 
-  def places_for_postcode(type, postcode, limit = 5)
-    url = api_url(type, postcode: postcode, limit: limit)
-    places = get_json(url) || []
-    places.map { |p| self.class.parse_place_hash(p) }
-  end
-
-  def self.parse_place_hash(place_hash)
-    location = extract_location_hash(place_hash["location"])
-    address = extract_address_hash(place_hash)
-
-    place_hash.merge(location).merge(address)
+  def places_for_postcode(type, postcode, limit = 5, local_authority_slug = nil)
+    options = { postcode: postcode, limit: limit }
+    options.merge!(local_authority_slug: local_authority_slug) if local_authority_slug
+    url = api_url(type, options)
+    get_json(url) || []
   end
 
   def places_kml(type)
     get_raw("#{@endpoint}/places/#{type}.kml").body
   end
-
-  # @private
-  def self.extract_location_hash(location)
-    # Deal with all known location formats:
-    #   Old style: [latitude, longitude]; empty array for no location
-    #   New style: hash with keys "longitude", "latitude"; nil for no location
-    case location
-    when Array
-      { "latitude" => location[0], "longitude" => location[1] }
-    when Hash
-      location
-    when nil
-      { "latitude" => nil, "longitude" => nil }
-    end
-  end
-
-  # @private
-  def self.extract_address_hash(place_hash)
-    address_fields = [
-      place_hash["address1"],
-      place_hash["address2"],
-    ].reject { |a| a.nil? || a == "" }
-    { "address" => address_fields.map(&:strip).join(", ") }
-  end
 end

data/lib/gds_api/response.rb

@@ -21,7 +21,7 @@ module GdsApi
     include Enumerable
 
     class CacheControl < Hash
-      PATTERN = /([-a-z]+)(?:\s*=\s*([^,\s]+))?,?+/i.freeze
+      PATTERN = /([-a-z]+)(?:\s*=\s*([^,\s]+))?,?+/i
 
       def initialize(value = nil)
         super()

data/lib/gds_api/test_helpers/imminence.rb

@@ -9,12 +9,33 @@ module GdsApi
 
       def stub_imminence_has_places(latitude, longitude, details)
         query_hash = { "lat" => latitude, "lng" => longitude, "limit" => "5" }
-        stub_imminence_places_request(details["slug"], query_hash, details["details"])
+        response_data = {
+          status: "ok",
+          content: "places",
+          places: details["details"],
+        }
+        stub_imminence_places_request(details["slug"], query_hash, response_data)
       end
 
-      def stub_imminence_has_places_for_postcode(places, slug, postcode, limit)
+      def stub_imminence_has_multiple_authorities_for_postcode(addresses, slug, postcode, limit)
         query_hash = { "postcode" => postcode, "limit" => limit }
-        stub_imminence_places_request(slug, query_hash, places)
+        response_data = {
+          status: "address-information-required",
+          content: "addresses",
+          addresses: addresses,
+        }
+        stub_imminence_places_request(slug, query_hash, response_data)
+      end
+
+      def stub_imminence_has_places_for_postcode(places, slug, postcode, limit, local_authority_slug)
+        query_hash = { "postcode" => postcode, "limit" => limit }
+        query_hash.merge!(local_authority_slug: local_authority_slug) if local_authority_slug
+        response_data = {
+          status: "ok",
+          content: "places",
+          places: places,
+        }
+        stub_imminence_places_request(slug, query_hash, response_data)
       end
 
       def stub_imminence_places_request(slug, query_hash, return_data, status_code = 200)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "85.0.1".freeze
+  VERSION = "87.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 85.0.1
+  version: 87.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -410,14 +410,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs