gds-api-adapters 99.1.0 → 99.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f02f36082cca349576ca453b3ae3ebe326b5ebe3ca57de8689bb9717bba927
-  data.tar.gz: 70c451f9cc60fe6d6f8152f195c6cf98eed99cbcb828e6f2a48244220c951602
+  metadata.gz: 151ca2f0d20627efd16cc8a75b6fda8794c5eb3156fc4cbd663f337681b43663
+  data.tar.gz: 71e676f9970e9372f8497bdd5173b3e374455b76b4d24518d07e51fe811c7d55
 SHA512:
-  metadata.gz: 8e100510c435857c1ee2eec2e4c90eeb4356ccd97990522d8d2cc02eb83a5c3fb2ad0e5fc2b1f23e058d2b364bffa38089bf9f6ac7af26245af85eb948d3fec4
-  data.tar.gz: ce47e501dd2b8d32031e29f4f458099fc71d28695294da93ba5e8aadf59749b7351b2bffe3e87d9f52ed1599bbf16ccaa9dedcd5e49a36b4907d23d60d101d0e
+  metadata.gz: 75372afcd8ab785b65e224f1125573a8643a47b57233dc5ca369d3f62bbce12c8967260879a0adb1d2f782647f407393efaffc1060ad47184a72e8b504097385
+  data.tar.gz: 04f9ab32db73b2e54f25588a3262572702d4ddaadc761c7e6d28fc2be3e30e5f58531002bfa5b0fa3e5957876ce97ef6c8654b98eb5d6a39f20dbeec68a0c2be

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

@@ -612,7 +612,19 @@ class GdsApi::PublishingApi < GdsApi::Base
   # @return [GdsApi::Response] A response with the result of the GraphQL query formatted like a Content Store content item.
   def graphql_content_item(query)
     create_response = proc do |r|
-      updated_body = JSON.parse(r.body).dig("data", "edition")
+      parsed_body = JSON.parse(r.body)
+
+      updated_body = if parsed_body["errors"] && (unpublished_error = parsed_body["errors"].find { |error| error["message"] == "Edition has been unpublished" })
+                       if unpublished_error.dig("extensions", "schema_name") == "gone" &&
+                           (unpublished_error.dig("extensions", "details").nil? || unpublished_error.dig("extensions", "details").values.compact.reject(&:empty?).empty?)
+                         raise GdsApi::HTTPGone.new(410, nil, unpublished_error["extensions"])
+                       end
+
+                       unpublished_error["extensions"]
+                     else
+                       parsed_body.dig("data", "edition")
+                     end
+
       updated_response = RestClient::Response.create(
         updated_body.to_json,
         r.net_http_res,
@@ -624,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.1.0".freeze
+  VERSION = "99.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 99.1.0
+  version: 99.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -267,14 +267,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.1.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.1.18
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -399,7 +399,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: []