gds-api-adapters 99.2.0 → 100.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b556dd9d3c693a4ec8e39553d52775880ac1012907ff339d8688b632d1a61f
-  data.tar.gz: 56908ef8260c2201338640dd4f215c31a3d527f9e2e1aa4505b2f5e00ce23100
+  metadata.gz: a97f28eec3d867d6b785d0f21be19bee59e5f554bdd8e8e8f560144c44adb3de
+  data.tar.gz: 7159ed4dcbe4373a8ff071ccfce1c48a49b701925a06b0842a8f6333529e5b4f
 SHA512:
-  metadata.gz: 0cc21fc6e390640d4cb9f302d1c5a8ba9d666770a2bfebf7ae48d20fdef7943dfa801da523d53d696acc15f08335b58f7665a51ca2de2a35f903307bd1fe3775
-  data.tar.gz: 2cbf538c940fc4e7ae9bfbe5f7585f4d9e2e0d82788b40eb4747091ac2cc02c7e8a9ec29c27a15241a3a92fe1614d218fad27607b40a20eea1008a7e75ed5aca
+  metadata.gz: 25ce95b7d3dfc469b4bb27442648e4cd38287a0ab9e8e56b202f4ffb0b99e26236f6dcef3d908a462e4d0f9d4e8a3c338fa2d4e8efba3338ae250422bfca19e2
+  data.tar.gz: 7c5cfb799ee20f8c632ebd508e31b28cd5a7c05233bcc661a7677b3c212741362c9607b0ae10b9f148fe16458276994d38afbfaa9c53e4f6e4e2b626e8784649

data/lib/gds_api/base.rb

@@ -8,6 +8,12 @@ class GdsApi::Base
   class InvalidAPIURL < StandardError
   end
 
+  class ItemNotFound < GdsApi::HTTPNotFound
+    def self.build_from(http_error)
+      new(http_error.code, http_error.message, http_error.error_details)
+    end
+  end
+
   extend Forwardable
 
   def client

data/lib/gds_api/content_store.rb

@@ -4,12 +4,6 @@ require_relative "base"
 require_relative "exceptions"
 
 class GdsApi::ContentStore < GdsApi::Base
-  class ItemNotFound < GdsApi::HTTPNotFound
-    def self.build_from(http_error)
-      new(http_error.code, http_error.message, http_error.error_details)
-    end
-  end
-
   def content_item(base_path)
     get_json(content_item_url(base_path))
   rescue GdsApi::HTTPNotFound => e

data/lib/gds_api/publishing_api.rb

@@ -636,6 +636,15 @@ class GdsApi::PublishingApi < GdsApi::Base
     post_json("#{endpoint}/graphql", query:, &create_response)
   end
 
+  # Get the live content item using GraphQL
+  #
+  # @return [GdsApi::Response] A response with the result of the GraphQL query formatted like a Content Store content item.
+  def graphql_live_content_item(base_path)
+    get_json("#{endpoint}/graphql/content#{base_path}")
+  rescue GdsApi::HTTPNotFound => e
+    raise ItemNotFound.build_from(e)
+  end
+
 private
 
   def content_url(content_id, params = {})

data/lib/gds_api/test_helpers/publishing_api.rb

@@ -214,6 +214,31 @@ module GdsApi
         stub_request(:post, url).with(body: { query: }).to_return(response)
       end
 
+      # Stub a GET /graphql/content/:base_path request
+      def stub_publishing_api_graphql_has_item(base_path, body = content_item_for_base_path(base_path), options = {})
+        max_age = options.fetch(:max_age, 900)
+        body = body.to_json unless body.is_a?(String)
+
+        stub_request(:get, "#{PUBLISHING_API_ENDPOINT}/graphql/content#{base_path}").to_return(
+          status: 200,
+          body:,
+          headers: {
+            cache_control: "public, max-age=#{max_age}",
+            date: Time.now.httpdate,
+          },
+        )
+      end
+
+      # Stub a GET /graphql/content/:base_path request returns 404 not found
+      def stub_publishing_api_graphql_does_not_have_item(base_path)
+        stub_request(:get, "#{PUBLISHING_API_ENDPOINT}/graphql/content#{base_path}").to_return(status: 404, headers: {})
+      end
+
+      # Stub a GET /graphql/content/:base_path request returns 410 gone
+      def stub_publishing_api_graphql_has_gone_item(base_path)
+        stub_request(:get, "#{PUBLISHING_API_ENDPOINT}/graphql/content#{base_path}").to_return(status: 410, headers: {})
+      end
+
       # Assert that a draft was saved and published, and links were updated.
       # - PUT /v2/content/:content_id
       # - POST /v2/content/:content_id/publish
@@ -1048,6 +1073,10 @@ module GdsApi
       def content_item_for_publishing_api(base_path, publishing_app = "publisher")
         content_item_for_base_path(base_path).merge("publishing_app" => publishing_app)
       end
+
+      def content_item_for_base_path(base_path)
+        super.merge("base_path" => base_path)
+      end
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "99.2.0".freeze
+  VERSION = "100.0.0".freeze
 end

data/lib/gds_api.rb

@@ -11,7 +11,6 @@ require "gds_api/licence_application"
 require "gds_api/link_checker_api"
 require "gds_api/local_links_manager"
 require "gds_api/locations_api"
-require "gds_api/maslow"
 require "gds_api/organisations"
 require "gds_api/publishing_api"
 require "gds_api/search"
@@ -123,16 +122,6 @@ module GdsApi
     GdsApi::LocationsApi.new(Plek.find("locations-api"), options)
   end
 
-  # Creates a GdsApi::Maslow adapter
-  #
-  # It's set to use an external url as an endpoint as the Maslow adapter is
-  # used to generate external links
-  #
-  # @return [GdsApi::Maslow]
-  def self.maslow(options = {})
-    GdsApi::Maslow.new(Plek.new.external_url_for("maslow"), options)
-  end
-
   # Creates a GdsApi::Organisations adapter for accessing Whitehall
   # APIs through the origin, where the requests will be handled by
   # Collections frontend.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 99.2.0
+  version: 100.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -267,14 +267,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.1.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.1.19
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +342,6 @@ files:
 - lib/gds_api/list_response.rb
 - lib/gds_api/local_links_manager.rb
 - lib/gds_api/locations_api.rb
-- lib/gds_api/maslow.rb
 - lib/gds_api/middleware/govuk_header_sniffer.rb
 - lib/gds_api/organisations.rb
 - lib/gds_api/places_manager.rb
@@ -399,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Adapters to work with GDS APIs
 test_files: []

data/lib/gds_api/maslow.rb

@@ -1,5 +0,0 @@
-class GdsApi::Maslow < GdsApi::Base
-  def need_page_url(content_id)
-    "#{endpoint}/needs/#{content_id}"
-  end
-end