gds-api-adapters 91.1.0 → 92.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b228bbfeb3c6670abced9b88f27ff26a2ac8f202c65b4815e7e7bf095bb2f357
-  data.tar.gz: dc1d051288ca8e31105dbb25c19f1c822c438b7b15c10a789f4f663fc8d39fa8
+  metadata.gz: 203960b7b78fe1527269cf50d08575639f7c051d05abc344c6a5dfe8f0eddd7c
+  data.tar.gz: cf6e7acc03b5e039ec901ea6dcfa1feefa8c7e0f60da0a8ad3c56b98d2f60aec
 SHA512:
-  metadata.gz: ea46e87d73ad2440115c91e91d73c8aeeb018eca04b0c430bd9c2c5dba7e2041fcc18b62efc0b17631fd8b39cbc9b29098722e8e8404945cf584baef463a0368
-  data.tar.gz: caf48a8612c247ac0f6c6e77d0bcf480f77aa74e15fe8ca63316411f818c5a66b36cddc15eb894068e5dfefbe4376b8d9023ae06e0a5b8a5aba5e7a10a623747
+  metadata.gz: 5e846253e545b8640a6cabb3ec4aec9cc66e6db5a05041b58527bd13499cece67be7998ee699d7ffc94197cbee532297dddff1040d4e9e709b3de991ddf8766f
+  data.tar.gz: b0460fa6b98bda9ba3540712c9d59fc895c8bf481b86a4d083385075b147db3a401d1273219281b094b1d5618e45d85631ee4008695c5b1ce1279a1ff94899df

data/lib/gds_api/asset_manager.rb

@@ -48,98 +48,6 @@ class GdsApi::AssetManager < GdsApi::Base
     post_multipart("#{base_url}/assets", asset: asset)
   end
 
-  # Creates a Whitehall asset given a hash with +file+ & +legacy_url_path+
-  # (required) and +legacy_etag+ & +legacy_last_modified+ (optional) attributes
-  #
-  # Makes a +POST+ request to the asset manager api to create a Whitehall asset.
-  #
-  # The asset must be provided as a +Hash+ with a +file+ attribute that behaves
-  # like a +File+ object and a +legacy_url_path+ attribute. The +content-type+
-  # that the asset manager will subsequently serve will be based *only* on the
-  # file's extension (derived from +#path+). If you supply a +content-type+ via,
-  # for example +ActionDispatch::Http::UploadedFile+ or another multipart
-  # wrapper, it will be ignored.
-  #
-  # The +legacy_url_path+ attribute is used to specify the public URL path at
-  # which the asset should be served by the Asset Manager. This differs from
-  # `#create_asset` where Asset Manager itself determines the public URL path to
-  # be used and returns that to the publishing app in the response. This
-  # endpoint is intended to be an interim measure which will help us migrate
-  # assets from Whitehall into Asset Manager without needing to change the URLs.
-  # The end goal is for Asset Manager to determine the public URL path for all
-  # assets including Whitehall assets. At that point this endpoint will become
-  # redundant and should be removed.
-  #
-  # There may be restrictions on the format of the `legacy_url_path`. If the
-  # supplied path is not valid, a `GdsApi::HTTPUnprocessableEntity` exception
-  # will be raised.
-  #
-  # The optional +legacy_etag+ & +legacy_last_modified+ attributes allow the
-  # client to specify the values that should be used in the `ETag` &
-  # `Last-Modified` response headers when the asset is requested via its public
-  # URL. They are only intended to be used for migrating existing Whitehall
-  # assets to Asset Manager so that we can avoid wholesale cache invalidation.
-  # New Whitehall assets should not specify values for these attributes; Asset
-  # Manager will generate suitable values.
-  #
-  # Note: this endpoint should only be used by the Whitehall Admin app and not
-  # by any other publishing apps.
-  #
-  # @param asset [Hash] The attributes for the asset to send to the api. Must
-  #   contain +file+, which behaves like a +File+, and +legacy_url_path+, a
-  #   +String+. May contain +legacy_etag+, a +String+, and
-  #   +legacy_last_modified+, a +Time+ object. All other attributes will be
-  #   ignored.
-  #
-  # @return [GdsApi::Response] The wrapped http response from the api. Behaves
-  #   both as a +Hash+ and an +OpenStruct+, and responds to the following:
-  #     :id           the URL of the asset
-  #     :name         the filename of the asset that will be served
-  #     :content_type the content_type of the asset
-  #     :file_url     the URL from which the asset will be served when it has
-  #                   passed a virus scan
-  #     :state        One of 'unscanned', 'clean', or 'infected'. Unless the state is
-  #                   'clean' the asset at the :file_url will redirect to a
-  #                   placeholder
-  #
-  # @raise [HTTPErrorResponse] if the request returns an error
-  #
-  # @example Upload a file from disk
-  #   response = asset_manager.create_asset(
-  #     file: File.new('image.jpg', 'r'),
-  #     legacy_url_path: '/government/uploads/path/to/image.jpg'
-  #   )
-  #   response['id']           #=> "http://asset-manager.dev.gov.uk/assets/576bbc52759b74196b000012"
-  #   response['content_type'] #=> "image/jpeg"
-  # @example Upload a file from a Rails param, (typically a multipart wrapper)
-  #    params[:file] #=> #<ActionDispatch::Http::UploadedFile:0x007fc60b43c5c8
-  #                      # @content_type="application/foofle",
-  #                      # @original_filename="cma_case_image.jpg",
-  #                      # @tempfile="spec/support/images/cma_case_image.jpg">
-  #
-  #    # Though we sent a file with a +content_type+ of 'application/foofle',
-  #    # this was ignored
-  #    response = asset_manager.create_asset(
-  #      file: params[:file]
-  #      legacy_url_path: '/government/uploads/path/to/cma_case_image.jpg'
-  #    )
-  #    response['content_type'] #=> "image/jpeg"
-  def create_whitehall_asset(asset)
-    post_multipart("#{base_url}/whitehall_assets", asset: asset)
-  end
-
-  # Fetches a Whitehall asset's metadata given the legacy URL path
-  #
-  # @param legacy_url_path [String] The Whitehall asset identifier.
-  # @return [GdsApi::Response] A response object containing the parsed JSON
-  #   response. If the asset cannot be found, +GdsApi::HTTPNotFound+ will be
-  #   raised.
-  #
-  # @raise [HTTPErrorResponse] if the request returns an error
-  def whitehall_asset(legacy_url_path)
-    get_json("#{base_url}/whitehall_assets/#{uri_encode(legacy_url_path)}")
-  end
-
   # Updates an asset given a hash with one +file+ attribute
   #
   # Makes a +PUT+ request to the asset manager api to update an asset.

data/lib/gds_api/email_alert_api.rb

@@ -94,6 +94,19 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     get_json("#{endpoint}/subscriber-lists/#{uri_encode(slug)}")
   end
 
+  # Get a Subscriber List
+  #
+  # @param [path] path of page for subscriber list
+  #
+  # @return [Hash] {
+  #  subscriber_list_count
+  #  all_notify_count
+  # }
+
+  def get_subscriber_list_metrics(path:)
+    get_json("#{endpoint}/subscriber-lists/metrics#{path}")
+  end
+
   # Get a Subscription
   #
   # @return [Hash] subscription: {

data/lib/gds_api/govuk_headers.rb

@@ -6,7 +6,7 @@ module GdsApi
       end
 
       def headers
-        header_data.reject { |_k, v| (v.nil? || v.empty?) }
+        header_data.reject { |_k, v| v.nil? || v.empty? }
       end
 
       def clear_headers

data/lib/gds_api/test_helpers/asset_manager.rb

@@ -31,14 +31,9 @@ module GdsApi
           .to_return(body: "Some file content", status: 200)
       end
 
-      def stub_asset_manager_has_a_whitehall_asset(legacy_url_path, atts)
-        response = atts.merge("_response_info" => { "status" => "ok" })
-
-        stub_request(:get, "#{ASSET_MANAGER_ENDPOINT}/whitehall_assets/#{legacy_url_path}")
-          .to_return(body: response.to_json, status: 200)
-
+      def stub_asset_manager_has_a_whitehall_media_asset(legacy_url_path, content)
         stub_request(:get, "#{ASSET_MANAGER_ENDPOINT}/#{legacy_url_path}")
-          .to_return(body: "Some file content", status: 200)
+          .to_return(body: content, status: 200)
       end
 
       def stub_asset_manager_does_not_have_an_asset(id)
@@ -50,15 +45,6 @@ module GdsApi
           .to_return(body: response.to_json, status: 404)
       end
 
-      def stub_asset_manager_does_not_have_a_whitehall_asset(legacy_url_path)
-        response = {
-          "_response_info" => { "status" => "not found" },
-        }
-
-        stub_request(:get, "#{ASSET_MANAGER_ENDPOINT}/whitehall_assets/#{legacy_url_path}")
-          .to_return(body: response.to_json, status: 404)
-      end
-
       # This can take a string of an exact url or a hash of options
       #
       # with a string:

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -164,6 +164,16 @@ module GdsApi
         stub_request(:any, %r{\A#{EMAIL_ALERT_API_ENDPOINT}})
       end
 
+      def stub_get_subscriber_list_metrics(path:, response:)
+        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscriber-lists/metrics#{path}")
+          .to_return(status: 200, body: response)
+      end
+
+      def stub_get_subscriber_list_metrics_not_found(path:)
+        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscriber-lists/metrics#{path}")
+          .to_return(status: 404)
+      end
+
       def assert_email_alert_api_content_change_created(attributes = nil)
         if attributes
           matcher = lambda do |request|

data/lib/gds_api/test_helpers/local_links_manager.rb

@@ -97,7 +97,7 @@ module GdsApi
 
       def convert_to_query_string_params(parameters)
         # convert nil to an empty string, otherwise query param is not expressed correctly
-        parameters.each { |key, _value| parameters[key] = "" if parameters[key].nil? }
+        parameters.each_key { |key| parameters[key] = "" if parameters[key].nil? }
         parameters
       end
 

data/lib/gds_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 91.1.0
+  version: 92.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs