gds-api-adapters 69.2.0 → 71.2.0

data/lib/gds_api/test_helpers/calendars.rb

@@ -4,7 +4,7 @@ module GdsApi
       def calendars_endpoint(in_division: nil)
         endpoint = "#{Plek.new.website_root}/bank-holidays"
         endpoint += "/#{in_division}" unless in_division.nil?
-        endpoint + ".json"
+        "#{endpoint}.json"
       end
 
       def stub_calendars_has_no_bank_holidays(in_division: nil)

data/lib/gds_api/test_helpers/content_store.rb

@@ -7,7 +7,7 @@ module GdsApi
     module ContentStore
       include ContentItemHelpers
 
-      def content_store_endpoint(draft = false)
+      def content_store_endpoint(draft: false)
         draft ? Plek.current.find("draft-content-store") : Plek.current.find("content-store")
       end
 
@@ -21,10 +21,10 @@ module GdsApi
       def stub_content_store_has_item(base_path, body = content_item_for_base_path(base_path), options = {})
         max_age = options.fetch(:max_age, 900)
         visibility = options[:private] ? "private" : "public"
-        url = content_store_endpoint(options[:draft]) + "/content" + base_path
         body = body.to_json unless body.is_a?(String)
 
-        stub_request(:get, url).to_return(
+        endpoint = content_store_endpoint(draft: options[:draft])
+        stub_request(:get, "#{endpoint}/content#{base_path}").to_return(
           status: 200,
           body: body,
           headers: {
@@ -35,11 +35,9 @@ module GdsApi
       end
 
       def stub_content_store_does_not_have_item(base_path, options = {})
-        url = content_store_endpoint(options[:draft]) + "/content" + base_path
-        stub_request(:get, url).to_return(status: 404, headers: {})
-
-        url = content_store_endpoint(options[:draft]) + "/incoming-links" + base_path
-        stub_request(:get, url).to_return(status: 404, headers: {})
+        endpoint = content_store_endpoint(draft: options[:draft])
+        stub_request(:get, "#{endpoint}/content#{base_path}").to_return(status: 404, headers: {})
+        stub_request(:get, "#{endpoint}/incoming-links#{base_path}").to_return(status: 404, headers: {})
       end
 
       # Content store has gone item
@@ -67,10 +65,9 @@ module GdsApi
       #     "details" => {}
       #   }
       def stub_content_store_has_gone_item(base_path, body = gone_content_item_for_base_path(base_path), options = {})
-        url = content_store_endpoint(options[:draft]) + "/content" + base_path
         body = body.to_json unless body.is_a?(String)
-
-        stub_request(:get, url).to_return(
+        endpoint = content_store_endpoint(draft: options[:draft])
+        stub_request(:get, "#{endpoint}/content#{base_path}").to_return(
           status: 410,
           body: body,
           headers: {},
@@ -86,7 +83,7 @@ module GdsApi
       end
 
       def stub_content_store_has_incoming_links(base_path, links)
-        url = content_store_endpoint + "/incoming-links" + base_path
+        url = "#{content_store_endpoint}/incoming-links#{base_path}"
         body = links.to_json
 
         stub_request(:get, url).to_return(body: body)

data/lib/gds_api/test_helpers/link_checker_api.rb

@@ -72,23 +72,6 @@ module GdsApi
             headers: { "Content-Type" => "application/json" },
           )
       end
-
-      def stub_link_checker_api_upsert_resource_monitor(app:, reference:, links:)
-        response_body = { id: 1 }.to_json
-
-        request_body = {
-          links: links,
-          app: app,
-          reference: reference,
-        }.to_json
-
-        stub_request(:post, "#{LINK_CHECKER_API_ENDPOINT}/monitor")
-          .with(body: request_body)
-          .to_return(
-            body: response_body,
-            headers: { "Content-Type" => "application/json" },
-          )
-      end
     end
   end
 end

data/lib/gds_api/test_helpers/local_links_manager.rb

@@ -5,7 +5,7 @@ module GdsApi
     module LocalLinksManager
       LOCAL_LINKS_MANAGER_ENDPOINT = Plek.current.find("local-links-manager")
 
-      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England")
+      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England", status: "ok")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
@@ -18,6 +18,7 @@ module GdsApi
             "lgsl_code" => lgsl,
             "lgil_code" => lgil,
             "url" => url,
+            "status" => status,
           },
         }
 

data/lib/gds_api/test_helpers/mapit.rb

@@ -10,9 +10,9 @@ module GdsApi
           "postcode" => postcode,
         }
 
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
+        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")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/#{postcode.split(' ').first}.json")
           .to_return(body: response.to_json, status: 200)
       end
 
@@ -37,9 +37,9 @@ module GdsApi
            }]
         end]
 
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
+        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")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/#{postcode.split(' ').first}.json")
           .to_return(body: response.to_json, status: 200)
       end
 
@@ -51,29 +51,29 @@ module GdsApi
           "country_name" => country_name,
         }
 
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
+        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")
+        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")
+        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")
+        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")
+        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")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/areas/#{area_type}.json")
           .to_return(body: [].to_json, status: 200)
       end
 

data/lib/gds_api/test_helpers/publishing_api.rb

@@ -8,7 +8,7 @@ module GdsApi
     module PublishingApi
       include ContentItemHelpers
 
-      PUBLISHING_API_V2_ENDPOINT = Plek.current.find("publishing-api") + "/v2"
+      PUBLISHING_API_V2_ENDPOINT = "#{Plek.current.find('publishing-api')}/v2".freeze
       PUBLISHING_API_ENDPOINT = Plek.current.find("publishing-api")
 
       # Stub a PUT /v2/content/:content_id request with the given content id and request body.
@@ -213,7 +213,7 @@ module GdsApi
       # @param attributes_or_matcher [Object]
       # @param times [Integer]
       def assert_publishing_api_put_content(content_id, attributes_or_matcher = nil, times = 1)
-        url = PUBLISHING_API_V2_ENDPOINT + "/content/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/content/#{content_id}"
         assert_publishing_api(:put, url, attributes_or_matcher, times)
       end
 
@@ -243,7 +243,7 @@ module GdsApi
       # @param attributes_or_matcher [Object]
       # @param times [Integer]
       def assert_publishing_api_patch_links(content_id, attributes_or_matcher = nil, times = 1)
-        url = PUBLISHING_API_V2_ENDPOINT + "/links/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/links/#{content_id}"
         assert_publishing_api(:patch, url, attributes_or_matcher, times)
       end
 
@@ -308,7 +308,7 @@ module GdsApi
       # @param items [Array]
       # @param params [Hash]
       def stub_publishing_api_has_content(items, params = {})
-        url = PUBLISHING_API_V2_ENDPOINT + "/content"
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/content"
 
         if params.respond_to? :fetch
           per_page = params.fetch(:per_page, 50)
@@ -369,7 +369,7 @@ module GdsApi
       # @param item [Hash]
       def stub_publishing_api_has_item(item, params = {})
         item = deep_transform_keys(item, &:to_sym)
-        url = PUBLISHING_API_V2_ENDPOINT + "/content/" + item[:content_id]
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/content/#{item[:content_id]}"
         stub_request(:get, url)
           .with(query: hash_including(params))
           .to_return(status: 200, body: item.to_json, headers: {})
@@ -380,7 +380,7 @@ module GdsApi
       # @param items [Array]
       def stub_publishing_api_has_item_in_sequence(content_id, items)
         items = items.each { |item| deep_transform_keys(item, &:to_sym) }
-        url = PUBLISHING_API_V2_ENDPOINT + "/content/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/content/#{content_id}"
         calls = -1
 
         stub_request(:get, url).to_return do |_request|
@@ -395,7 +395,7 @@ module GdsApi
       #
       # @param content_id [UUID]
       def stub_publishing_api_does_not_have_item(content_id, params = {})
-        url = PUBLISHING_API_V2_ENDPOINT + "/content/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/content/#{content_id}"
         stub_request(:get, url)
           .with(query: hash_including(params))
           .to_return(status: 404, body: resource_not_found(content_id, "content item").to_json, headers: {})
@@ -433,7 +433,7 @@ module GdsApi
       #      }
       def stub_publishing_api_has_links(links)
         links = deep_transform_keys(links, &:to_sym)
-        url = PUBLISHING_API_V2_ENDPOINT + "/links/" + links[:content_id]
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/links/#{links[:content_id]}"
         stub_request(:get, url).to_return(status: 200, body: links.to_json, headers: {})
       end
 
@@ -497,7 +497,7 @@ module GdsApi
         request_params["with_drafts"] = false unless with_drafts
         request_params["generate"] = true if generate
 
-        url = PUBLISHING_API_V2_ENDPOINT + "/expanded-links/" + links[:content_id]
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/expanded-links/#{links[:content_id]}"
         stub_request(:get, url)
           .with(query: request_params)
           .to_return(status: 200, body: links.to_json, headers: {})
@@ -528,7 +528,7 @@ module GdsApi
       #         }
       #       }
       def stub_publishing_api_has_links_for_content_ids(links)
-        url = PUBLISHING_API_V2_ENDPOINT + "/links/by-content-id"
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/links/by-content-id"
         stub_request(:post, url).with(body: { content_ids: links.keys }).to_return(status: 200, body: links.to_json, headers: {})
       end
 
@@ -536,7 +536,7 @@ module GdsApi
       #
       # @param content_id [UUID]
       def stub_publishing_api_does_not_have_links(content_id)
-        url = PUBLISHING_API_V2_ENDPOINT + "/links/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/links/#{content_id}"
         stub_request(:get, url).to_return(status: 404, body: resource_not_found(content_id, "link set").to_json, headers: {})
       end
 
@@ -552,7 +552,7 @@ module GdsApi
       #   })
       #
       def stub_publishing_api_has_lookups(lookup_hash)
-        url = PUBLISHING_API_ENDPOINT + "/lookup-by-base-path"
+        url = "#{PUBLISHING_API_ENDPOINT}/lookup-by-base-path"
         stub_request(:post, url).to_return(body: lookup_hash.to_json)
       end
 
@@ -605,7 +605,7 @@ module GdsApi
       # @param items [Array]
       # @param params [Hash]
       def stub_publishing_api_get_editions(editions, params = {})
-        url = PUBLISHING_API_V2_ENDPOINT + "/editions"
+        url = "#{PUBLISHING_API_V2_ENDPOINT}/editions"
 
         results = editions.map do |edition|
           next edition unless params[:fields]
@@ -670,7 +670,7 @@ module GdsApi
       end
 
       def stub_publishing_api_destroy_intent(base_path)
-        url = PUBLISHING_API_ENDPOINT + "/publish-intent" + base_path
+        url = "#{PUBLISHING_API_ENDPOINT}/publish-intent#{base_path}"
         stub_request(:delete, url).to_return(status: 200, body: "{}", headers: { "Content-Type" => "application/json; charset=utf-8" })
       end
 
@@ -679,7 +679,7 @@ module GdsApi
       end
 
       def assert_publishing_api_put_intent(base_path, attributes_or_matcher = {}, times = 1)
-        url = PUBLISHING_API_ENDPOINT + "/publish-intent" + base_path
+        url = "#{PUBLISHING_API_ENDPOINT}/publish-intent#{base_path}"
         assert_publishing_api_put(url, attributes_or_matcher, times)
       end
 
@@ -792,8 +792,7 @@ module GdsApi
       def stub_publishing_api_returns_path_reservation_validation_error_for(base_path, error_fields = {})
         error_fields = { "base_path" => ["Computer says no"] } if error_fields.empty?
 
-        message = error_fields.keys.first.to_s.capitalize.gsub(/_/, " ") + " " +
-          error_fields.values.flatten.first
+        message = "#{error_fields.keys.first.to_s.capitalize.gsub(/_/, ' ')} #{error_fields.values.flatten.first}"
 
         error = { code: 422, message: message, fields: error_fields }
 
@@ -817,7 +816,7 @@ module GdsApi
         response_hash = { status: 200, body: "{}", headers: { "Content-Type" => "application/json; charset=utf-8" } }
         response_hash.merge!(override_response_hash)
         response_hash[:body] = response_hash[:body].to_json if response_hash[:body].is_a?(Hash)
-        url = PUBLISHING_API_V2_ENDPOINT + resource_path + "/" + content_id
+        url = "#{PUBLISHING_API_V2_ENDPOINT}#{resource_path}/#{content_id}"
         stub_request(method, url).with(body: body).to_return(response_hash)
       end
 
@@ -858,7 +857,7 @@ module GdsApi
       end
 
       def stub_publishing_api_unreserve_path_with_code(base_path, publishing_app, code)
-        url = PUBLISHING_API_ENDPOINT + "/paths" + base_path
+        url = "#{PUBLISHING_API_ENDPOINT}/paths#{base_path}"
         body = { publishing_app: publishing_app }
         stub_request(:delete, url).with(body: body).to_return(status: code, body: "{}", headers: { "Content-Type" => "application/json; charset=utf-8" })
       end

data/lib/gds_api/test_helpers/search.rb

@@ -20,7 +20,7 @@ module GdsApi
         url = if index
                 SEARCH_ENDPOINT + "/#{index}/documents"
               else
-                SEARCH_ENDPOINT + "/documents"
+                "#{SEARCH_ENDPOINT}/documents"
               end
 
         assert_requested(:post, url, **options) do |req|

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "69.2.0".freeze
+  VERSION = "71.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 69.2.0
+  version: 71.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -266,16 +266,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0.pre.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0.pre.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +371,7 @@ files:
 - Rakefile
 - lib/gds-api-adapters.rb
 - lib/gds_api.rb
+- lib/gds_api/account_api.rb
 - lib/gds_api/asset_manager.rb
 - lib/gds_api/base.rb
 - lib/gds_api/calendars.rb
@@ -388,8 +389,6 @@ files:
 - lib/gds_api/maslow.rb
 - lib/gds_api/middleware/govuk_header_sniffer.rb
 - lib/gds_api/organisations.rb
-- lib/gds_api/performance_platform/data_in.rb
-- lib/gds_api/performance_platform/data_out.rb
 - lib/gds_api/publishing_api.rb
 - lib/gds_api/publishing_api/special_route_publisher.rb
 - lib/gds_api/railtie.rb
@@ -398,6 +397,7 @@ files:
 - lib/gds_api/search.rb
 - lib/gds_api/support.rb
 - lib/gds_api/support_api.rb
+- lib/gds_api/test_helpers/account_api.rb
 - lib/gds_api/test_helpers/asset_manager.rb
 - lib/gds_api/test_helpers/calendars.rb
 - lib/gds_api/test_helpers/common_responses.rb
@@ -411,8 +411,6 @@ files:
 - lib/gds_api/test_helpers/local_links_manager.rb
 - lib/gds_api/test_helpers/mapit.rb
 - lib/gds_api/test_helpers/organisations.rb
-- lib/gds_api/test_helpers/performance_platform/data_in.rb
-- lib/gds_api/test_helpers/performance_platform/data_out.rb
 - lib/gds_api/test_helpers/publishing_api.rb
 - lib/gds_api/test_helpers/router.rb
 - lib/gds_api/test_helpers/search.rb
@@ -440,7 +438,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/gds_api/performance_platform/data_in.rb

@@ -1,27 +0,0 @@
-require_relative "../base"
-
-module GdsApi
-  class PerformancePlatformDatasetNotConfigured < BaseError; end
-
-  module PerformancePlatform
-    class DataIn < GdsApi::Base
-      def submit_service_feedback_day_aggregate(slug, request_details)
-        post_json("#{endpoint}/data/#{slug}/customer-satisfaction", request_details)
-      rescue GdsApi::HTTPNotFound
-        raise PerformancePlatformDatasetNotConfigured, "Dataset for slug [#{slug}] not set up"
-      end
-
-      def corporate_content_problem_report_count(entries)
-        post_json("#{endpoint}/data/gov-uk-content/feedback-count", entries)
-      end
-
-      def corporate_content_urls_with_the_most_problem_reports(entries)
-        post_json("#{endpoint}/data/gov-uk-content/top-urls", entries)
-      end
-
-      def submit_problem_report_daily_totals(entries)
-        post_json("#{endpoint}/data/govuk-info/page-contacts", entries)
-      end
-    end
-  end
-end