gds-api-adapters 53.2.0 → 54.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28fdb9aa5f03109f651caa65a00eefcbf488473ae40a0a5ca671a4bb49506c0b
-  data.tar.gz: daf953f3e6f81eb98c61198cd25611378f0ee86f95bc82980b1f442637c2bf30
+  metadata.gz: eb06e96900e7260378d6eb0ce9164993bfe4979273494f4ef415c55897b7d0bd
+  data.tar.gz: f2d65f90b0f193705dd5d3d68550f29f19226b903b3c55da48736230732b5fc4
 SHA512:
-  metadata.gz: e3dcc1d0b4e5cc2f37d0dc70b179a5523add55295a3713fe4214417f416c494ddb99c439dc329af764be9af3f00185e0126ae6770a48f5b126950703e58f2daf
-  data.tar.gz: fd4c5bbdff4794567c2aadf420e1e7f30eb2e22a583570d911968fe7678525b7bbd6e8545a8d99fef8b305262db47dc5185ca16321a128290ca486203937ed59
+  metadata.gz: f05d27784ba25acccd2a17234a2e7c99caa164920f1a42cb30d83a255a654f8d9d75defe0b1d0581b2621d2732cacd45d82112bc6f9840508c3ebaa07d646823
+  data.tar.gz: f773e4c3a7d296567a043dd7ca306d169b58788eb9f1ead5a6c036ff2b5ffee09a7e1fec0d3aecc29f5eee8b923b41e800d5a52e53e636f2bdacea425c29a1eb

data/lib/gds_api/test_helpers/organisations.rb

@@ -8,8 +8,7 @@ module GdsApi
     module Organisations
       include GdsApi::TestHelpers::CommonResponses
 
-      ORGANISATIONS_API_ENDPOINT = Plek.current.find('whitehall-admin')
-      PUBLIC_HOST = Plek.current.find('www')
+      WEBSITE_ROOT = Plek.new.website_root
 
       def organisations_api_has_organisations(organisation_slugs)
         bodies = organisation_slugs.map { |slug| organisation_for_slug(slug) }
@@ -41,9 +40,9 @@ module GdsApi
             "page_size" => 20,
             "start_index" => i * 20 + 1)
 
-          links = { self: "#{ORGANISATIONS_API_ENDPOINT}/api/organisations?page=#{i + 1}" }
-          links[:next] = "#{ORGANISATIONS_API_ENDPOINT}/api/organisations?page=#{i + 2}" if pages[i + 1]
-          links[:previous] = "#{ORGANISATIONS_API_ENDPOINT}/api/organisations?page=#{i}" unless i == 0
+          links = { self: "#{WEBSITE_ROOT}/api/organisations?page=#{i + 1}" }
+          links[:next] = "#{WEBSITE_ROOT}/api/organisations?page=#{i + 2}" if pages[i + 1]
+          links[:previous] = "#{WEBSITE_ROOT}/api/organisations?page=#{i}" unless i.zero?
           page_details["_response_info"]["links"] = []
           link_headers = []
           links.each do |rel, href|
@@ -62,18 +61,18 @@ module GdsApi
 
         if pages.empty?
           # If there are no pages - and so no organisations specified - then stub /api/organisations.
-          stub_request(:get, "#{ORGANISATIONS_API_ENDPOINT}/api/organisations").to_return(status: 200, body: plural_response_base.to_json, headers: {})
+          stub_request(:get, "#{WEBSITE_ROOT}/api/organisations").to_return(status: 200, body: plural_response_base.to_json, headers: {})
         end
       end
 
       def organisations_api_has_organisation(organisation_slug, details = nil)
         details ||= organisation_for_slug(organisation_slug)
-        stub_request(:get, "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{organisation_slug}").
+        stub_request(:get, "#{WEBSITE_ROOT}/api/organisations/#{organisation_slug}").
           to_return(status: 200, body: details.to_json)
       end
 
       def organisations_api_does_not_have_organisation(organisation_slug)
-        stub_request(:get, "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{organisation_slug}").to_return(status: 404)
+        stub_request(:get, "#{WEBSITE_ROOT}/api/organisations/#{organisation_slug}").to_return(status: 404)
       end
 
       def organisation_for_slug(slug)
@@ -86,11 +85,11 @@ module GdsApi
       # otherwise it will be set to 'Executive agency'
       def organisation_details_for_slug(slug, content_id = SecureRandom.uuid)
         {
-          "id" => "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{slug}",
+          "id" => "#{WEBSITE_ROOT}/api/organisations/#{slug}",
           "title" => titleize_slug(slug, title_case: true),
           "format" => (slug =~ /ministry/ ? "Ministerial department" : "Executive agency"),
           "updated_at" => "2013-03-25T13:06:42+00:00",
-          "web_url" => "#{PUBLIC_HOST}/government/organisations/#{slug}",
+          "web_url" => "#{WEBSITE_ROOT}/government/organisations/#{slug}",
           "details" => {
             "slug" => slug,
             "abbreviation" => acronymize_slug(slug),
@@ -103,14 +102,14 @@ module GdsApi
           },
           "parent_organisations" => [
             {
-              "id" => "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{slug}-parent-1",
-              "web_url" => "#{PUBLIC_HOST}/government/organisations/#{slug}-parent-1"
+              "id" => "#{WEBSITE_ROOT}/api/organisations/#{slug}-parent-1",
+              "web_url" => "#{WEBSITE_ROOT}/government/organisations/#{slug}-parent-1"
             },
           ],
           "child_organisations" => [
             {
-              "id" => "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{slug}-child-1",
-              "web_url" => "#{PUBLIC_HOST}/government/organisations/#{slug}-child-1"
+              "id" => "#{WEBSITE_ROOT}/api/organisations/#{slug}-child-1",
+              "web_url" => "#{WEBSITE_ROOT}/government/organisations/#{slug}-child-1"
             },
           ],
         }

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '53.2.0'.freeze
+  VERSION = '54.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 53.2.0
+  version: 54.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable