gds-api-adapters 87.0.0 → 88.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e981660988eed87b9cc48de790fe7d569e3f87f23d517f02b3de113dca5b54cb
-  data.tar.gz: 29cc9f3064a3af6ea39fa0c58552577b092aa52a3549e2d2a268e9a601e018f8
+  metadata.gz: 0fa52b3b12ddcdccdb616cec115476df62b8fc6867e57af88f5f548cb4329980
+  data.tar.gz: d17c3037dff01c916b918f540b148dce2ee32bca682892575cc40edc9fe4e98f
 SHA512:
-  metadata.gz: 5d0c4b0d21493fa6f352bd86bdfe181f0994e8803b60fd7233cf43848dc87389ce313042c8aa1499684f87496231267eb61bb0bd069b5c208ca596d4a203064b
-  data.tar.gz: 91ee52e953390ec47e4b6e507c5b6591476acb4de98fa683a39ef4423ba3c9cf5fd3b02ec245eebe199467f4d277934e868e22e1523fbdcb8e437f45919b460c
+  metadata.gz: ca21816f3109d107bf3997ccdd4024a9d0e9734196335585cffef04ee6f9d30e9a0b52dae76648671c766fb2a653499165ba2bcd92874e6112cfb8d2643f438a
+  data.tar.gz: 1012911579e99a24ce46ac7eb71d12c376ea42ba715240b61730ea262cb0a25de6767daef720f16780f8e59e935f09af5fe269d3e2ee567f8b877425c49e926b

data/lib/gds_api/router.rb

@@ -21,14 +21,20 @@ class GdsApi::Router < GdsApi::Base
     get_json("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}")
   end
 
-  def add_route(path, type, backend_id, options = {})
-    response = put_json("#{endpoint}/routes", route: { incoming_path: path, route_type: type, handler: "backend", backend_id: backend_id })
-    commit_routes if options[:commit]
-    response
+  def add_route(path, type, backend_id)
+    put_json(
+      "#{endpoint}/routes",
+      route: {
+        incoming_path: path,
+        route_type: type,
+        handler: "backend",
+        backend_id: backend_id,
+      },
+    )
   end
 
   def add_redirect_route(path, type, destination, redirect_type = "permanent", options = {})
-    response = put_json(
+    put_json(
       "#{endpoint}/routes",
       route: {
         incoming_path: path,
@@ -39,27 +45,19 @@ class GdsApi::Router < GdsApi::Base
         segments_mode: options[:segments_mode],
       },
     )
-
-    commit_routes if options[:commit]
-    response
   end
 
-  def add_gone_route(path, type, options = {})
-    response = put_json("#{endpoint}/routes", route: { incoming_path: path, route_type: type, handler: "gone" })
-    commit_routes if options[:commit]
-    response
+  def add_gone_route(path, type)
+    put_json(
+      "#{endpoint}/routes",
+      route: { incoming_path: path, route_type: type, handler: "gone" },
+    )
   end
 
-  def delete_route(path, hard_delete: false, commit: false)
+  def delete_route(path, hard_delete: false)
     url = "#{endpoint}/routes?incoming_path=#{CGI.escape(path)}"
     url += "&hard_delete=true" if hard_delete
 
-    response = delete_json(url)
-    commit_routes if commit
-    response
-  end
-
-  def commit_routes
-    post_json("#{endpoint}/routes/commit", {})
+    delete_json(url)
   end
 end

data/lib/gds_api/test_helpers/local_links_manager.rb

@@ -5,11 +5,11 @@ module GdsApi
     module LocalLinksManager
       LOCAL_LINKS_MANAGER_ENDPOINT = Plek.find("local-links-manager")
 
-      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England", status: "ok", snac: "00AG", local_custodian_code: nil)
+      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England", status: "ok", snac: "00AG", gss: "EE06000063", local_custodian_code: nil)
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
-            "snac" => snac,
+            "gss" => gss,
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
             "country_name" => country_name,
@@ -22,6 +22,7 @@ module GdsApi
             "status" => status,
           },
         }
+        response["local_authority"]["snac"] = snac if snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/link")
           .with(query: { authority_slug: authority_slug, lgsl: lgsl, lgil: lgil })
@@ -34,17 +35,18 @@ module GdsApi
         end
       end
 
-      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:, country_name: "England", snac: "00AG", local_custodian_code: nil)
+      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:, country_name: "England", snac: "00AG", gss: "EE06000063", local_custodian_code: nil)
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
-            "snac" => snac,
+            "gss" => gss,
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
             "country_name" => country_name,
             "slug" => authority_slug,
           },
         }
+        response["local_authority"]["snac"] = snac if snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/link")
           .with(query: { authority_slug: authority_slug, lgsl: lgsl, lgil: lgil })
@@ -57,17 +59,18 @@ module GdsApi
         end
       end
 
-      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:, country_name: "England", snac: "00AG", local_custodian_code: nil)
+      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:, country_name: "England", snac: "00AG", gss: "EE06000063", local_custodian_code: nil)
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
-            "snac" => snac,
+            "gss" => gss,
             "tier" => "unitary",
             "homepage_url" => nil,
             "country_name" => country_name,
             "slug" => authority_slug,
           },
         }
+        response["local_authority"]["snac"] = snac if snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/link")
           .with(query: { authority_slug: authority_slug, lgsl: lgsl, lgil: lgil })
@@ -98,7 +101,7 @@ module GdsApi
         parameters
       end
 
-      def stub_local_links_manager_has_a_local_authority(authority_slug, country_name: "England", snac: "00AG", local_custodian_code: nil)
+      def stub_local_links_manager_has_a_local_authority(authority_slug, country_name: "England", snac: "00AG", gss: "EE06000063", local_custodian_code: nil)
         response = {
           "local_authorities" => [
             {
@@ -107,10 +110,11 @@ module GdsApi
               "country_name" => country_name,
               "tier" => "unitary",
               "slug" => authority_slug,
-              "snac" => snac,
+              "gss" => gss,
             },
           ],
         }
+        response["local_authorities"][0]["snac"] = snac if snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/local-authority")
           .with(query: { authority_slug: authority_slug })
@@ -123,7 +127,7 @@ module GdsApi
         end
       end
 
-      def stub_local_links_manager_has_a_district_and_county_local_authority(district_slug, county_slug, district_snac: "00AG", county_snac: "00LC", local_custodian_code: nil)
+      def stub_local_links_manager_has_a_district_and_county_local_authority(district_slug, county_slug, district_snac: "00AG", county_snac: "00LC", district_gss: "EE06000063", county_gss: "EE06000064", local_custodian_code: nil)
         response = {
           "local_authorities" => [
             {
@@ -132,7 +136,7 @@ module GdsApi
               "country_name" => "England",
               "tier" => "district",
               "slug" => district_slug,
-              "snac" => district_snac,
+              "gss" => district_gss,
             },
             {
               "name" => county_slug.capitalize,
@@ -140,10 +144,12 @@ module GdsApi
               "country_name" => "England",
               "tier" => "county",
               "slug" => county_slug,
-              "snac" => county_snac,
+              "gss" => county_gss,
             },
           ],
         }
+        response["local_authorities"][0]["snac"] = district_snac if district_snac
+        response["local_authorities"][1]["snac"] = county_snac if county_snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/local-authority")
           .with(query: { authority_slug: district_slug })
@@ -180,7 +186,7 @@ module GdsApi
           .to_return(body: {}.to_json, status: 404)
       end
 
-      def stub_local_links_manager_has_a_local_authority_without_homepage(authority_slug, country_name: "England", snac: "00AG", local_custodian_code: nil)
+      def stub_local_links_manager_has_a_local_authority_without_homepage(authority_slug, country_name: "England", snac: "00AG", gss: "EE06000063", local_custodian_code: nil)
         response = {
           "local_authorities" => [
             {
@@ -189,10 +195,11 @@ module GdsApi
               "country_name" => country_name,
               "tier" => "unitary",
               "slug" => authority_slug,
-              "snac" => snac,
+              "gss" => gss,
             },
           ],
         }
+        response["local_authorities"][0]["snac"] = snac if snac
 
         stub_request(:get, "#{LOCAL_LINKS_MANAGER_ENDPOINT}/api/local-authority")
           .with(query: { authority_slug: authority_slug })

data/lib/gds_api/test_helpers/router.rb

@@ -32,7 +32,6 @@ module GdsApi
       def stub_all_router_registration
         stub_request(:put, %r{\A#{ROUTER_API_ENDPOINT}/backends/[a-z0-9-]+\z})
         stub_request(:put, "#{ROUTER_API_ENDPOINT}/routes")
-        stub_request(:post, "#{ROUTER_API_ENDPOINT}/routes/commit")
       end
 
       def stub_router_backend_registration(backend_id, backend_url)
@@ -43,22 +42,18 @@ module GdsApi
       end
 
       def stub_route_registration(path, type, backend_id)
-        route = {
+        stub_route_put({
           route: {
             incoming_path: path,
             route_type: type,
             handler: "backend",
             backend_id: backend_id,
           },
-        }
-
-        register_stub = stub_route_put(route)
-        commit_stub = stub_router_commit
-        [register_stub, commit_stub]
+        })
       end
 
       def stub_redirect_registration(path, type, destination, redirect_type, segments_mode = nil)
-        redirect = {
+        stub_route_put({
           route: {
             incoming_path: path,
             route_type: type,
@@ -67,29 +62,17 @@ module GdsApi
             redirect_type: redirect_type,
             segments_mode: segments_mode,
           },
-        }
-
-        register_stub = stub_route_put(redirect)
-        commit_stub = stub_router_commit
-        [register_stub, commit_stub]
+        })
       end
 
       def stub_gone_route_registration(path, type)
-        route = {
+        stub_route_put({
           route: {
             incoming_path: path,
             route_type: type,
             handler: "gone",
           },
-        }
-
-        register_stub = stub_route_put(route)
-        commit_stub = stub_router_commit
-        [register_stub, commit_stub]
-      end
-
-      def stub_router_commit
-        stub_http_request(:post, "#{ROUTER_API_ENDPOINT}/routes/commit")
+        })
       end
 
     private

data/lib/gds_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 87.0.0
+  version: 88.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs