gds-api-adapters 63.4.0 → 67.0.1

data/lib/gds_api/test_helpers/search.rb

@@ -17,11 +17,11 @@ module GdsApi
       end
 
       def assert_search_posted_item(attributes, index: nil, **options)
-        if index
-          url = SEARCH_ENDPOINT + "/#{index}/documents"
-        else
-          url = SEARCH_ENDPOINT + "/documents"
-        end
+        url = if index
+                SEARCH_ENDPOINT + "/#{index}/documents"
+              else
+                SEARCH_ENDPOINT + "/documents"
+              end
 
         assert_requested(:post, url, **options) do |req|
           data = JSON.parse(req.body)

data/lib/gds_api/test_helpers/support.rb

@@ -1,9 +1,6 @@
-require "gds_api/test_helpers/alias_deprecated"
-
 module GdsApi
   module TestHelpers
     module Support
-      extend AliasDeprecated
       SUPPORT_ENDPOINT = Plek.current.find("support")
 
       def stub_support_foi_request_creation(request_details = nil)
@@ -21,8 +18,6 @@ module GdsApi
       def stub_support_isnt_available
         stub_request(:post, /#{SUPPORT_ENDPOINT}\/.*/).to_return(status: 503)
       end
-
-      alias_deprecated :support_isnt_available, :stub_support_isnt_available
     end
   end
 end

data/lib/gds_api/test_helpers/support_api.rb

@@ -1,11 +1,9 @@
-require "gds_api/test_helpers/alias_deprecated"
 require "cgi"
 require "plek"
 
 module GdsApi
   module TestHelpers
     module SupportApi
-      extend AliasDeprecated
       SUPPORT_API_ENDPOINT = Plek.current.find("support-api")
 
       def stub_support_api_problem_report_creation(request_details = nil)
@@ -65,9 +63,9 @@ module GdsApi
       end
 
       def stub_support_api_problem_reports(params, response_body = {})
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/problem-reports").
-          with(query: params).
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/problem-reports")
+          .with(query: params)
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_mark_reviewed_for_spam(request_details = nil, response_body = {})
@@ -89,8 +87,8 @@ module GdsApi
       def stub_support_api_anonymous_feedback_organisation_summary(slug, ordering = nil, response_body = {})
         uri = "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/organisations/#{slug}"
         uri << "?ordering=#{ordering}" if ordering
-        stub_http_request(:get, uri).
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, uri)
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_organisations_list(response_body = nil)
@@ -111,8 +109,8 @@ module GdsApi
           },
         ]
 
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/organisations").
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/organisations")
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_organisation(slug = "cabinet-office", response_body = nil)
@@ -124,22 +122,22 @@ module GdsApi
           govuk_status: "live",
         }
 
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/organisations/#{slug}").
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/organisations/#{slug}")
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_document_type_list(response_body = nil)
-        response_body ||= %w(case_study detailed_guide smart_answer)
+        response_body ||= %w[case_study detailed_guide smart_answer]
 
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/document-types").
-            to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/document-types")
+            .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_anonymous_feedback_doc_type_summary(document_type, ordering = nil, response_body = nil)
         uri = "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/document-types/#{document_type}"
         uri << "?ordering=#{ordering}" if ordering
-        stub_http_request(:get, uri).
-            to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, uri)
+            .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_feedback_export_request(id, response_body = nil)
@@ -148,15 +146,13 @@ module GdsApi
           ready: true,
         }
 
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/export-requests/#{id}").
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback/export-requests/#{id}")
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_any_support_api_call
         stub_request(:any, %r{\A#{SUPPORT_API_ENDPOINT}})
       end
-
-      alias_deprecated :support_api_isnt_available, :stub_support_api_isnt_available
     end
   end
 end

data/lib/gds_api/test_helpers/worldwide.rb

@@ -1,14 +1,12 @@
-require "gds_api/test_helpers/alias_deprecated"
 require "gds_api/test_helpers/json_client_helper"
 require "gds_api/test_helpers/common_responses"
 
 module GdsApi
   module TestHelpers
     module Worldwide
-      extend AliasDeprecated
       include GdsApi::TestHelpers::CommonResponses
 
-      WORLDWIDE_API_ENDPOINT = Plek.current.find("whitehall-frontend")
+      WORLDWIDE_API_ENDPOINT = Plek.new.website_root
 
       # Sets up the index endpoints for the given country slugs
       # The stubs are setup to paginate in chunks of 20
@@ -23,12 +21,14 @@ module GdsApi
         end
 
         pages.each_with_index do |page, i|
-          page_details = plural_response_base.merge("results" => page,
+          page_details = plural_response_base.merge(
+            "results" => page,
             "total" => location_slugs.size,
             "pages" => pages.size,
             "current_page" => i + 1,
             "page_size" => 20,
-            "start_index" => i * 20 + 1)
+            "start_index" => i * 20 + 1,
+          )
 
           links = { self: "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i + 1}" }
           links[:next] = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i + 2}" if pages[i + 1]
@@ -40,32 +40,59 @@ module GdsApi
             link_headers << "<#{href}>; rel=\"#{rel}\""
           end
 
-          stub_request(:get, links[:self]).
-            to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
+          stub_request(:get, links[:self])
+            .to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
 
-          if i.zero?
-            # First page exists at URL with and without page param
-            stub_request(:get, links[:self].sub(/\?page=1/, "")).
-              to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
-          end
+          next unless i.zero?
+
+          # First page exists at URL with and without page param
+          stub_request(:get, links[:self].sub(/\?page=1/, ""))
+            .to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
         end
       end
 
       def stub_worldwide_api_has_selection_of_locations
-        stub_worldwide_api_has_locations %w(
-          afghanistan angola australia bahamas belarus brazil brunei cambodia chad
-          croatia denmark eritrea france ghana iceland japan laos luxembourg malta
-          micronesia mozambique nicaragua panama portugal sao-tome-and-principe singapore
-          south-korea sri-lanka uk-delegation-to-council-of-europe
+        stub_worldwide_api_has_locations %w[
+          afghanistan
+          angola
+          australia
+          bahamas
+          belarus
+          brazil
+          brunei
+          cambodia
+          chad
+          croatia
+          denmark
+          eritrea
+          france
+          ghana
+          iceland
+          japan
+          laos
+          luxembourg
+          malta
+          micronesia
+          mozambique
+          nicaragua
+          panama
+          portugal
+          sao-tome-and-principe
+          singapore
+          south-korea
+          sri-lanka
+          uk-delegation-to-council-of-europe
           uk-delegation-to-organization-for-security-and-co-operation-in-europe
-          united-kingdom venezuela vietnam
-        )
+          united-kingdom
+          venezuela
+          vietnam
+        ]
       end
 
       def stub_worldwide_api_has_location(location_slug, details = nil)
         details ||= world_location_for_slug(location_slug)
-        stub_request(:get, "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}").
-          to_return(status: 200, body: details.to_json)
+        stub_request(:get, "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}")
+          .to_return(status: 200, body: details.to_json)
       end
 
       def stub_worldwide_api_does_not_have_location(location_slug)
@@ -75,15 +102,15 @@ module GdsApi
       def stub_worldwide_api_has_organisations_for_location(location_slug, json_or_hash)
         json = json_or_hash.is_a?(Hash) ? json_or_hash.to_json : json_or_hash
         url = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}/organisations"
-        stub_request(:get, url).
-          to_return(status: 200, body: json, headers: { "Link" => "<#{url}; rel\"self\"" })
+        stub_request(:get, url)
+          .to_return(status: 200, body: json, headers: { "Link" => "<#{url}; rel\"self\"" })
       end
 
       def stub_worldwide_api_has_no_organisations_for_location(location_slug)
         details = { "results" => [], "total" => 0, "_response_info" => { "status" => "ok" } }
         url = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}/organisations"
-        stub_request(:get, url).
-          to_return(status: 200, body: details.to_json, headers: { "Link" => "<#{url}; rel\"self\"" })
+        stub_request(:get, url)
+          .to_return(status: 200, body: details.to_json, headers: { "Link" => "<#{url}; rel\"self\"" })
       end
 
       def world_location_for_slug(slug)
@@ -112,13 +139,6 @@ module GdsApi
           "content_id" => "content_id_for_#{slug}",
         }
       end
-
-      alias_deprecated :worldwide_api_has_locations, :stub_worldwide_api_has_locations
-      alias_deprecated :worldwide_api_has_selection_of_locations, :stub_worldwide_api_has_selection_of_locations
-      alias_deprecated :worldwide_api_has_location, :stub_worldwide_api_has_location
-      alias_deprecated :worldwide_api_has_does_not_have_location, :stub_worldwide_api_does_not_have_location
-      alias_deprecated :worldwide_api_has_organisations_for_location, :stub_worldwide_api_has_organisations_for_location
-      alias_deprecated :worldwide_api_has_no_organisations_for_location, :stub_worldwide_api_has_no_organisations_for_location
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "63.4.0".freeze
+  VERSION = "67.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 63.4.0
+  version: 67.0.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: pact
   requirement: !ruby/object:Gem::Requirement
@@ -179,47 +165,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.20'
 - !ruby/object:Gem::Dependency
-  name: pact-consumer-minitest
+  name: pact_broker-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: pact-mock_service
+  name: pact-consumer-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pact_broker-client
+  name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -406,14 +392,12 @@ files:
 - 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/publishing_api_v2.rb
 - lib/gds_api/railtie.rb
 - lib/gds_api/response.rb
 - lib/gds_api/router.rb
 - lib/gds_api/search.rb
 - lib/gds_api/support.rb
 - lib/gds_api/support_api.rb
-- lib/gds_api/test_helpers/alias_deprecated.rb
 - lib/gds_api/test_helpers/asset_manager.rb
 - lib/gds_api/test_helpers/calendars.rb
 - lib/gds_api/test_helpers/common_responses.rb
@@ -430,7 +414,6 @@ files:
 - 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/publishing_api_v2.rb
 - lib/gds_api/test_helpers/router.rb
 - lib/gds_api/test_helpers/search.rb
 - lib/gds_api/test_helpers/support.rb
@@ -457,7 +440,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/gds_api/publishing_api_v2.rb

@@ -1,14 +0,0 @@
-require_relative "publishing_api"
-
-# Adapter for the Publishing API.
-#
-# @see https://github.com/alphagov/publishing-api
-# @see https://github.com/alphagov/publishing-api/blob/master/doc/publishing-application-examples.md
-# @see https://github.com/alphagov/publishing-api/blob/master/doc/model.md
-# @api documented
-class GdsApi::PublishingApiV2 < GdsApi::PublishingApi
-  def initialize(*args)
-    warn "GdsApi::PublishingApiV2 is deprecated.  Use GdsApi::PublishingApi instead."
-    super
-  end
-end

data/lib/gds_api/test_helpers/alias_deprecated.rb

@@ -1,13 +0,0 @@
-module GdsApi
-  module TestHelpers
-    module AliasDeprecated
-      def alias_deprecated(deprecated_method, replacement_method)
-        class_name = self.name
-        define_method(deprecated_method) do |*args, &block|
-          warn "##{deprecated_method} is deprecated on #{class_name} and will be removed in a future version. Use ##{replacement_method} instead"
-          public_send(replacement_method, *args, &block)
-        end
-      end
-    end
-  end
-end

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -1,13 +0,0 @@
-require "gds_api/test_helpers/publishing_api"
-
-module GdsApi
-  module TestHelpers
-    module PublishingApiV2
-      include PublishingApi
-
-      def self.included(_base)
-        warn "GdsApi::TestHelpers::PublishingApiV2 is deprecated.  Use GdsApi::TestHelpers::PublishingApi instead."
-      end
-    end
-  end
-end