gds-api-adapters 90.0.0 → 91.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cffcf9f91e4d6d0e06af47378331cc2b6e3cd346c2c9248813d7741d2af80e1
-  data.tar.gz: 9cd9b674ae9b9cd287aadd7c1454c33b2638827c74efc8d5161ebfbcc579c3f9
+  metadata.gz: b228bbfeb3c6670abced9b88f27ff26a2ac8f202c65b4815e7e7bf095bb2f357
+  data.tar.gz: dc1d051288ca8e31105dbb25c19f1c822c438b7b15c10a789f4f663fc8d39fa8
 SHA512:
-  metadata.gz: ac0d0eabb70dec4d134e7df7ce6d9fafbb4fa667f847094d4edefe1948b436eb344fe3813f676976547f9b45e28fe917fd534e59119457a4b9319df93677e517
-  data.tar.gz: 20e424eb1c426c9fdda45f674d406f261d22dbd99bdee56cd98d902eeac9e2954b52b08aec061eda2ca334b35eec763045e148578d99d6a0beacb0f641a55166
+  metadata.gz: ea46e87d73ad2440115c91e91d73c8aeeb018eca04b0c430bd9c2c5dba7e2041fcc18b62efc0b17631fd8b39cbc9b29098722e8e8404945cf584baef463a0368
+  data.tar.gz: caf48a8612c247ac0f6c6e77d0bcf480f77aa74e15fe8ca63316411f818c5a66b36cddc15eb894068e5dfefbe4376b8d9023ae06e0a5b8a5aba5e7a10a623747

data/lib/gds_api/account_api.rb

@@ -107,35 +107,6 @@ class GdsApi::AccountApi < GdsApi::Base
     patch_json("#{endpoint}/api/attributes", { attributes: attributes }, auth_headers(govuk_account_session))
   end
 
-  # Get the details of an account-linked email subscription.
-  #
-  # @param [String] name Name of the subscription
-  # @param [String] govuk_account_session Value of the session header
-  #
-  # @return [Hash] Details of the subscription, if it exists.
-  def get_email_subscription(name:, govuk_account_session:)
-    get_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", auth_headers(govuk_account_session))
-  end
-
-  # Create or update an account-linked email subscription.
-  #
-  # @param [String] name Name of the subscription
-  # @param [String] topic_slug The email-alert-api topic slug to subscribe to
-  # @param [String] govuk_account_session Value of the session header
-  #
-  # @return [Hash] Details of the newly created subscription.
-  def put_email_subscription(name:, topic_slug:, govuk_account_session:)
-    put_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", { topic_slug: topic_slug }, auth_headers(govuk_account_session))
-  end
-
-  # Unsubscribe and delete an account-linked email subscription.
-  #
-  # @param [String] name Name of the subscription
-  # @param [String] govuk_account_session Value of the session header
-  def delete_email_subscription(name:, govuk_account_session:)
-    delete_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", {}, auth_headers(govuk_account_session))
-  end
-
 private
 
   def nested_query_string(params)

data/lib/gds_api/asset_manager.rb

@@ -239,6 +239,18 @@ class GdsApi::AssetManager < GdsApi::Base
     get_raw("#{base_url}/#{uri_encode(legacy_url_path)}")
   end
 
+  # Fetches an asset given the id and filename
+  #
+  # @param id [String] The asset identifier.
+  # @param filename [String] Filename of the asset.
+  # @return [GdsApi::Response] A response object containing the raw asset.
+  #   If the asset cannot be found, +GdsApi::HTTPNotFound+ will be raised.
+  #
+  # @raise [HTTPErrorResponse] if the request returns an error
+  def media(id, filename)
+    get_raw("#{base_url}/media/#{id}/#{filename}")
+  end
+
 private
 
   def base_url

data/lib/gds_api/search_api_v2.rb

@@ -0,0 +1,8 @@
+module GdsApi
+  class SearchApiV2 < Base
+    def search(args, additional_headers = {})
+      request_url = "#{endpoint}/search.json?#{Rack::Utils.build_nested_query(args)}"
+      get_json(request_url, additional_headers)
+    end
+  end
+end

data/lib/gds_api/test_helpers/account_api.rb

@@ -172,100 +172,6 @@ module GdsApi
         )
       end
 
-      ####################################
-      # GET /api/email-subscriptions/:name
-      ####################################
-      def stub_account_api_get_email_subscription(name:, topic_slug: "slug", email_alert_api_subscription_id: "12345", **options)
-        stub_account_api_request(
-          :get,
-          "/api/email-subscriptions/#{name}",
-          response_body: {
-            email_subscription: {
-              name: name,
-              topic_slug: topic_slug,
-              email_alert_api_subscription_id: email_alert_api_subscription_id,
-            },
-          },
-          **options,
-        )
-      end
-
-      def stub_account_api_get_email_subscription_does_not_exist(name:, **options)
-        stub_account_api_request(
-          :get,
-          "/api/email-subscriptions/#{name}",
-          response_status: 404,
-          **options,
-        )
-      end
-
-      def stub_account_api_unauthorized_get_email_subscription(name:, **options)
-        stub_account_api_request(
-          :get,
-          "/api/email-subscriptions/#{name}",
-          response_status: 401,
-          **options,
-        )
-      end
-
-      ####################################
-      # PUT /api/email-subscriptions/:name
-      ####################################
-      def stub_account_api_put_email_subscription(name:, topic_slug: nil, **options)
-        stub_account_api_request(
-          :put,
-          "/api/email-subscriptions/#{name}",
-          with: { body: hash_including({ topic_slug: topic_slug }.compact) },
-          response_body: {
-            email_subscription: {
-              name: name,
-              topic_slug: topic_slug || "slug",
-            },
-          },
-          **options,
-        )
-      end
-
-      def stub_account_api_unauthorized_put_email_subscription(name:, topic_slug: nil, **options)
-        stub_account_api_request(
-          :put,
-          "/api/email-subscriptions/#{name}",
-          with: { body: hash_including({ topic_slug: topic_slug }.compact) },
-          response_status: 401,
-          **options,
-        )
-      end
-
-      #######################################
-      # DELETE /api/email-subscriptions/:name
-      #######################################
-      def stub_account_api_delete_email_subscription(name:, **options)
-        stub_account_api_request(
-          :delete,
-          "/api/email-subscriptions/#{name}",
-          response_status: 204,
-          **options,
-        )
-      end
-
-      def stub_account_api_delete_email_subscription_does_not_exist(name:, **options)
-        stub_account_api_request(
-          :delete,
-          "/api/email-subscriptions/#{name}",
-          response_status: 404,
-          **options,
-        )
-      end
-
-      def stub_account_api_unauthorized_delete_email_subscription(name:, **options)
-        stub_account_api_request(
-          :delete,
-          "/api/email-subscriptions/#{name}",
-          response_status: 401,
-          **options,
-        )
-      end
-
       #####################
       # GET /api/attributes
       #####################

data/lib/gds_api/test_helpers/asset_manager.rb

@@ -21,11 +21,14 @@ module GdsApi
           .to_return(body: body.to_json, status: 200)
       end
 
-      def stub_asset_manager_has_an_asset(id, atts)
+      def stub_asset_manager_has_an_asset(id, atts, filename = "")
         response = atts.merge("_response_info" => { "status" => "ok" })
 
         stub_request(:get, "#{ASSET_MANAGER_ENDPOINT}/assets/#{id}")
           .to_return(body: response.to_json, status: 200)
+
+        stub_request(:get, "#{ASSET_MANAGER_ENDPOINT}/media/#{id}/#{filename}")
+          .to_return(body: "Some file content", status: 200)
       end
 
       def stub_asset_manager_has_a_whitehall_asset(legacy_url_path, atts)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "90.0.0".freeze
+  VERSION = "91.1.0".freeze
 end

data/lib/gds_api.rb

@@ -16,6 +16,7 @@ require "gds_api/organisations"
 require "gds_api/publishing_api"
 require "gds_api/router"
 require "gds_api/search"
+require "gds_api/search_api_v2"
 require "gds_api/support"
 require "gds_api/support_api"
 require "gds_api/worldwide"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 90.0.0
+  version: 91.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -367,6 +367,7 @@ files:
 - lib/gds_api/response.rb
 - lib/gds_api/router.rb
 - lib/gds_api/search.rb
+- lib/gds_api/search_api_v2.rb
 - lib/gds_api/support.rb
 - lib/gds_api/support_api.rb
 - lib/gds_api/test_helpers/account_api.rb
@@ -416,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs