gds-api-adapters 67.0.1 → 68.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98cbc4b338641aff5589875074e2fb2d6ef4227a004f04855cfffbf9c0eb5348
-  data.tar.gz: 5934de7d813457a5cf01c026ff91bed99445492a43df9c9704abc123db140c7d
+  metadata.gz: d65f642d5b2a1a78b79cada08224db09ac522eed4c6f2a096916ae076f0c6328
+  data.tar.gz: 314f7be8b8aea542036199fae93de9b9c7c7f3e18b1d5234b0872c26c3ae35f8
 SHA512:
-  metadata.gz: 00bab1a4b50de5937794758bbdca11c093d3d58c147fed73cb1c3ad89c0c1a9c8d4e2cac2691a31540d9d5c1f92de9a413c25b339a1430dbc367e7f5649afe08
-  data.tar.gz: 14a690b77a277f543b800d48da87cac0c78e6edaf2ced0e04a5f9244104707b3f3cf34e77f9cba0cd39e3fca0c53a2672659a17b00611d575d28c43bd25d236b
+  metadata.gz: 8269a099df5843b9bc45dabad688a59461b9fcb7b50c876b69981ee8fc919db8e318421a9ac478dacff2f4bb0a73e0675589686bfaf878e024f06a17117d351d
+  data.tar.gz: 426d5db6c08678e134ecbd84b315f2cb22df30a5fcbcb3e1de89ff980d5edebcd75b229e6cb4ef95c4a7f86c78f3909452246376a7fb5750ec63fcaf1d4d3831

data/lib/gds_api/email_alert_api.rb

@@ -24,7 +24,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     document_type = attributes["document_type"]
     email_document_supertype = attributes["email_document_supertype"]
     government_document_supertype = attributes["government_document_supertype"]
-    gov_delivery_id = attributes["gov_delivery_id"]
     combine_mode = attributes["combine_mode"]
 
     if tags && links
@@ -38,7 +37,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     params[:document_type] = document_type if document_type
     params[:email_document_supertype] = email_document_supertype if email_document_supertype
     params[:government_document_supertype] = government_document_supertype if government_document_supertype
-    params[:gov_delivery_id] = gov_delivery_id if gov_delivery_id
     params[:combine_mode] = combine_mode if combine_mode
 
     query_string = nested_query_string(params)
@@ -116,12 +114,13 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   # Subscribe
   #
   # @return [Hash] subscription_id
-  def subscribe(subscriber_list_id:, address:, frequency: "immediately")
+  def subscribe(subscriber_list_id:, address:, frequency: "immediately", skip_confirmation_email: false)
     post_json(
       "#{endpoint}/subscriptions",
       subscriber_list_id: subscriber_list_id,
       address: address,
       frequency: frequency,
+      skip_confirmation_email: skip_confirmation_email,
     )
   end
 
@@ -130,7 +129,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   # @return [Hash] subscriber_list: {
   #  id
   #  title
-  #  gov_delivery_id
   #  created_at
   #  updated_at
   #  document_type
@@ -224,16 +222,14 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   #
   # @param [string]       address       Address to send verification email to
   # @param [string]       destination   Path on GOV.UK that subscriber will be emailed
-  # @param [string, nil]  redirect      Path on GOV.UK to be encoded into the token for redirecting
   #
   # @return [Hash]  subscriber
   #
-  def send_subscriber_verification_email(address:, destination:, redirect: nil)
+  def send_subscriber_verification_email(address:, destination:)
     post_json(
       "#{endpoint}/subscribers/auth-token",
       address: address,
       destination: destination,
-      redirect: redirect,
     )
   end
 

data/lib/gds_api/publishing_api/special_route_publisher.rb

@@ -12,6 +12,9 @@ module GdsApi
       def publish(options)
         logger.info("Publishing #{options.fetch(:type)} route #{options.fetch(:base_path)}, routing to #{options.fetch(:rendering_app)}")
 
+        update_type = options.fetch(:update_type, "major")
+        locale = options.fetch(:locale, "en")
+
         put_content_response = publishing_api.put_content(
           options.fetch(:content_id),
           base_path: options.fetch(:base_path),
@@ -19,7 +22,7 @@ module GdsApi
           schema_name: options.fetch(:schema_name, "special_route"),
           title: options.fetch(:title),
           description: options.fetch(:description, ""),
-          locale: "en",
+          locale: locale,
           details: {},
           routes: [
             {
@@ -30,11 +33,11 @@ module GdsApi
           publishing_app: options.fetch(:publishing_app),
           rendering_app: options.fetch(:rendering_app),
           public_updated_at: time.now.iso8601,
-          update_type: options.fetch(:update_type, "major"),
+          update_type: update_type,
         )
 
         publishing_api.patch_links(options.fetch(:content_id), links: options[:links]) if options[:links]
-        publishing_api.publish(options.fetch(:content_id))
+        publishing_api.publish(options.fetch(:content_id), update_type, locale: locale)
         put_content_response
       end
 

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -98,9 +98,9 @@ module GdsApi
         subscriptions.each do |id, params|
           latest_id, latest_params = get_latest_matching(params, subscriptions)
           stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions/#{id}")
-            .to_return(status: 200, body: get_subscription_response(id, params).to_json)
+            .to_return(status: 200, body: get_subscription_response(id, **params).to_json)
           stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions/#{id}/latest")
-            .to_return(status: 200, body: get_subscription_response(latest_id, latest_params).to_json)
+            .to_return(status: 200, body: get_subscription_response(latest_id, **latest_params).to_json)
         end
       end
 
@@ -218,24 +218,41 @@ module GdsApi
           .to_return(status: 404)
       end
 
-      def stub_email_alert_api_creates_a_subscription(subscriber_list_id, address, frequency, returned_subscription_id)
-        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions")
-          .with(
-            body: { subscriber_list_id: subscriber_list_id, address: address, frequency: frequency }.to_json,
-          ).to_return(status: 201, body: { subscription_id: returned_subscription_id }.to_json)
-      end
+      def stub_email_alert_api_creates_a_subscription(
+        subscriber_list_id: nil,
+        address: nil,
+        frequency: nil,
+        returned_subscription_id: nil,
+        skip_confirmation_email: false,
+        subscriber_id: nil
+      )
+        response = get_subscription_response(
+          returned_subscription_id,
+          frequency: frequency,
+          subscriber_list_id: subscriber_list_id,
+          subscriber_id: subscriber_id,
+        )
+
+        request_params = {
+          subscriber_list_id: subscriber_list_id,
+          address: address,
+          frequency: frequency,
+          skip_confirmation_email: skip_confirmation_email,
+        }
 
-      def stub_email_alert_api_creates_an_existing_subscription(subscriber_list_id, address, frequency, returned_subscription_id)
         stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions")
-          .with(
-            body: { subscriber_list_id: subscriber_list_id, address: address, frequency: frequency }.to_json,
-          ).to_return(status: 200, body: { subscription_id: returned_subscription_id }.to_json)
+          .with(body: hash_including(request_params.compact))
+          .to_return(status: 200, body: response.to_json)
       end
 
       def stub_email_alert_api_refuses_to_create_subscription(subscriber_list_id, address, frequency)
         stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions")
           .with(
-            body: { subscriber_list_id: subscriber_list_id, address: address, frequency: frequency }.to_json,
+            body: hash_including(
+              subscriber_list_id: subscriber_list_id,
+              address: address,
+              frequency: frequency,
+            ),
           ).to_return(status: 422)
       end
 
@@ -381,7 +398,6 @@ module GdsApi
           document_type = attributes["document_type"]
           email_document_supertype = attributes["email_document_supertype"]
           government_document_supertype = attributes["government_document_supertype"]
-          gov_delivery_id = attributes["gov_delivery_id"]
           content_purpose_supergroup = attributes["content_purpose_supergroup"]
           combine_mode = attributes["combine_mode"]
 
@@ -391,7 +407,6 @@ module GdsApi
           params[:document_type] = document_type if document_type
           params[:email_document_supertype] = email_document_supertype if email_document_supertype
           params[:government_document_supertype] = government_document_supertype if government_document_supertype
-          params[:gov_delivery_id] = gov_delivery_id if gov_delivery_id
           params[:content_purpose_supergroup] = content_purpose_supergroup if content_purpose_supergroup
           params[:combine_mode] = combine_mode if combine_mode
 

data/lib/gds_api/test_helpers/publishing_api.rb

@@ -394,9 +394,11 @@ module GdsApi
       # Stub GET /v2/content/:content_id to return a 404 response
       #
       # @param content_id [UUID]
-      def stub_publishing_api_does_not_have_item(content_id)
+      def stub_publishing_api_does_not_have_item(content_id, params = {})
         url = PUBLISHING_API_V2_ENDPOINT + "/content/" + content_id
-        stub_request(:get, url).to_return(status: 404, body: resource_not_found(content_id, "content item").to_json, headers: {})
+        stub_request(:get, url)
+          .with(query: hash_including(params))
+          .to_return(status: 404, body: resource_not_found(content_id, "content item").to_json, headers: {})
       end
 
       # Stub a request to links endpoint

data/lib/gds_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 67.0.1
+  version: 68.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Adapters to work with GDS APIs