gds-api-adapters 68.0.0 → 69.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65f642d5b2a1a78b79cada08224db09ac522eed4c6f2a096916ae076f0c6328
-  data.tar.gz: 314f7be8b8aea542036199fae93de9b9c7c7f3e18b1d5234b0872c26c3ae35f8
+  metadata.gz: 294f4287f0eb5a9fad08a2732fba69502b5622e5a8ebbc8bef4acc54a98b5c71
+  data.tar.gz: a9ecd5e2dbaf5e0fe31f678330300256b629e9ecd7b53c6f25b7c0e5ddaa4180
 SHA512:
-  metadata.gz: 8269a099df5843b9bc45dabad688a59461b9fcb7b50c876b69981ee8fc919db8e318421a9ac478dacff2f4bb0a73e0675589686bfaf878e024f06a17117d351d
-  data.tar.gz: 426d5db6c08678e134ecbd84b315f2cb22df30a5fcbcb3e1de89ff980d5edebcd75b229e6cb4ef95c4a7f86c78f3909452246376a7fb5750ec63fcaf1d4d3831
+  metadata.gz: 76d12236b2395137708802139460673ef5cb8e2634e84dfb29066dc69cfa2dbba08c049554cc74f363e2e9c22ce7b4d924b06e498704666c3c8fd60a4a0adfc4
+  data.tar.gz: c1186893c71cd5daa83f62d52c0849954f1fc3395e224b934372bba08696691478553ce2c0a5ec25f2ba53ff7b5a7f08b936aee7bdf5160ad13604d3e09d19a8

data/lib/gds_api/asset_manager.rb

@@ -7,12 +7,13 @@ class GdsApi::AssetManager < GdsApi::Base
   #
   # Makes a +POST+ request to the asset manager api to create an asset.
   #
-  # The asset must be provided as a +Hash+ with a single +file+ attribute that
+  # The asset must be provided as a +Hash+ with a +file+ attribute that
   # behaves like a +File+ object. 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
+  # subsequently serve will be based 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.
+  # be ignored. To provide a +content-type+ directly you must be specify it
+  # as a +content_type+ attribute of the hash.
   #
   # @param asset [Hash] The attributes for the asset to send to the api. Must
   #   contain +file+, which behaves like a +File+. All other attributes will be
@@ -143,12 +144,10 @@ class GdsApi::AssetManager < GdsApi::Base
   #
   # Makes a +PUT+ request to the asset manager api to update an asset.
   #
-  # The asset must be provided as a +Hash+ with a single +file+ attribute that
-  # behaves like a +File+ object. 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 asset must be provided as a +Hash+ with a +file+ attribute that
+  # behaves like a +File+ object. The +content-type+ of the file will be based
+  # on the files extension unless you specify a +content_type+ attribute of
+  # the hash to set it.
   #
   # @param id [String] The asset identifier (a UUID).
   # @param asset [Hash] The attributes for the asset to send to the api. Must

data/lib/gds_api/email_alert_api.rb

@@ -10,44 +10,20 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   #
   # @param attributes [Hash] document_type, links, tags used to search existing subscriber lists
   def find_or_create_subscriber_list(attributes)
-    find_subscriber_list(attributes)
-  rescue GdsApi::HTTPNotFound
-    create_subscriber_list(attributes)
-  end
-
-  # Get a subscriber list
-  #
-  # @param attributes [Hash] document_type, links, tags used to search existing subscriber lists
-  def find_subscriber_list(attributes)
-    tags = attributes["tags"]
-    links = attributes["links"]
-    document_type = attributes["document_type"]
-    email_document_supertype = attributes["email_document_supertype"]
-    government_document_supertype = attributes["government_document_supertype"]
-    combine_mode = attributes["combine_mode"]
-
-    if tags && links
+    if attributes["tags"] && attributes["links"]
       message = "please provide either tags or links (or neither), but not both"
       raise ArgumentError, message
     end
 
-    params = {}
-    params[:tags] = tags if tags
-    params[:links] = links if links
-    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[:combine_mode] = combine_mode if combine_mode
-
-    query_string = nested_query_string(params)
-    get_json("#{endpoint}/subscriber-lists?" + query_string)
+    post_json("#{endpoint}/subscriber-lists", attributes)
   end
 
-  # Post a subscriber list
+  # Get a subscriber list
   #
   # @param attributes [Hash] document_type, links, tags used to search existing subscriber lists
-  def create_subscriber_list(attributes)
-    post_json("#{endpoint}/subscriber-lists", attributes)
+  def find_subscriber_list(attributes)
+    query_string = nested_query_string(attributes)
+    get_json("#{endpoint}/subscriber-lists?" + query_string)
   end
 
   # Post a content change
@@ -64,24 +40,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     post_json("#{endpoint}/messages", message, headers)
   end
 
-  # Send email
-  #
-  # @param email_params [Hash] address, subject, body
-  def create_email(email_params)
-    post_json("#{endpoint}/emails", email_params)
-  end
-
-  # Unpublishing alert
-  #
-  # @param message [Hash] content_id
-  #
-  # Used by email-alert-service to send a message to email-alert-api
-  # when an unpublishing message is put on the Rabbitmq queue by
-  # publishing-api
-  def send_unpublish_message(message)
-    post_json("#{endpoint}/unpublish-messages", message)
-  end
-
   # Get topic matches
   #
   # @param attributes [Hash] tags, links, document_type,

data/lib/gds_api/exceptions.rb

@@ -40,6 +40,7 @@ module GdsApi
   class HTTPForbidden < HTTPClientError; end
   class HTTPConflict < HTTPClientError; end
   class HTTPUnprocessableEntity < HTTPClientError; end
+  class HTTPBadRequest < HTTPClientError; end
   class HTTPTooManyRequests < HTTPIntermittentClientError; end
 
   # Superclass & fallback for all 5XX errors
@@ -60,6 +61,8 @@ module GdsApi
 
     def error_class_for_code(code)
       case code
+      when 400
+        GdsApi::HTTPBadRequest
       when 401
         GdsApi::HTTPUnauthorized
       when 403

data/lib/gds_api/mapit.rb

@@ -37,6 +37,10 @@ class GdsApi::Mapit < GdsApi::Base
     def postcode
       @response["postcode"]
     end
+
+    def country_name
+      @response["country_name"]
+    end
   end
 
 private

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -124,6 +124,14 @@ module GdsApi
         matching.last
       end
 
+      def stub_email_alert_api_creates_subscriber_list(attributes)
+        stub_request(:post, build_subscriber_lists_url)
+          .to_return(
+            status: 201,
+            body: get_subscriber_list_response(attributes).to_json,
+          )
+      end
+
       def stub_email_alert_api_has_subscriber_list(attributes)
         stub_request(:get, build_subscriber_lists_url(attributes))
           .to_return(
@@ -137,24 +145,11 @@ module GdsApi
           .to_return(status: 404)
       end
 
-      def stub_email_alert_api_creates_subscriber_list(attributes)
-        stub_request(:post, build_subscriber_lists_url)
-          .to_return(
-            status: 201,
-            body: get_subscriber_list_response(attributes).to_json,
-          )
-      end
-
       def stub_email_alert_api_refuses_to_create_subscriber_list
         stub_request(:post, build_subscriber_lists_url)
           .to_return(status: 422)
       end
 
-      def stub_email_alert_api_accepts_unpublishing_message
-        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/unpublish-messages")
-          .to_return(status: 202, body: {}.to_json)
-      end
-
       def stub_email_alert_api_accepts_content_change
         stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/content-changes")
           .to_return(status: 202, body: {}.to_json)

data/lib/gds_api/test_helpers/local_links_manager.rb

@@ -5,13 +5,14 @@ module GdsApi
     module LocalLinksManager
       LOCAL_LINKS_MANAGER_ENDPOINT = Plek.current.find("local-links-manager")
 
-      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:)
+      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
+            "country_name" => country_name,
           },
           "local_interaction" => {
             "lgsl_code" => lgsl,
@@ -25,13 +26,14 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
-      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:)
+      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
+            "country_name" => country_name,
           },
         }
 
@@ -40,13 +42,14 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
-      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:)
+      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => nil,
+            "country_name" => country_name,
           },
         }
 
@@ -82,6 +85,7 @@ module GdsApi
             {
               "name" => authority_slug.capitalize,
               "homepage_url" => "http://#{authority_slug}.example.com",
+              "country_name" => "England",
               "tier" => "unitary",
             },
           ],
@@ -98,11 +102,13 @@ module GdsApi
             {
               "name" => district_slug.capitalize,
               "homepage_url" => "http://#{district_slug}.example.com",
+              "country_name" => "England",
               "tier" => "district",
             },
             {
               "name" => county_slug.capitalize,
               "homepage_url" => "http://#{county_slug}.example.com",
+              "country_name" => "England",
               "tier" => "county",
             },
           ],
@@ -131,6 +137,7 @@ module GdsApi
             {
               "name" => authority_slug.capitalize,
               "homepage_url" => "",
+              "country_name" => "England",
               "tier" => "unitary",
             },
           ],

data/lib/gds_api/test_helpers/mapit.rb

@@ -43,6 +43,20 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
+      def stub_mapit_has_a_postcode_and_country_name(postcode, coords, country_name)
+        response = {
+          "wgs84_lat" => coords.first,
+          "wgs84_lon" => coords.last,
+          "postcode" => postcode,
+          "country_name" => country_name,
+        }
+
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
+          .to_return(body: response.to_json, status: 200)
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/" + postcode.split(" ").first + ".json")
+          .to_return(body: response.to_json, status: 200)
+      end
+
       def stub_mapit_does_not_have_a_postcode(postcode)
         stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
           .to_return(body: { "code" => 404, "error" => "No Postcode matches the given query." }.to_json, status: 404)

data/lib/gds_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 68.0.0
+  version: 69.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable