gds-api-adapters 57.4.2 → 57.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176cd69c8f0105f3946d1ca1e22a88e09679f2e43e747942039f92ad58fa9960
-  data.tar.gz: f49d631e617d368153dfcad5a67ef4fa27a1e397d6deb6d1add70ba87d6fc7ff
+  metadata.gz: d790bf7e187109ce1f31d1ca428cd65493698bc72bbb5ebbf33eb60f38f0b66f
+  data.tar.gz: ff50c34b2405d4f1286df944e243857da924ef91a541b514810a2f7b41f38b33
 SHA512:
-  metadata.gz: 3835a509a30d7a29b25c6bee6ef56ee12bd10561956110d1f4b98ca91bcd5e648f09d86c54c58e11ba03f249e5ec938fb90dd5cdf7a649ae157432e5bd2c3e55
-  data.tar.gz: 900a8f7cfa7b6440edd0fcea3264f007ae8b64d756f0892c82dc213689f9683be447eb3260158119f913d5c149ad4ef69a20e318e9166004e029fb5d1827b93e
+  metadata.gz: 11ecc5a522a057ecb122889c5a7e88ecef23b4242784bc08e6ef7be94d7f1ce6611b238ace87b0e2449b9c6847377358f1bed66474e3d2cb010f6b3ec0cc55c2
+  data.tar.gz: 7f98a8869d10d02c99b20d1cc867285b82fbcd3320ef1ddfd46883a0d5b2736e26f2bf2a38445b569af635d19049213f4728364ec2d1a804cf7d07b015858eef

data/Rakefile

@@ -11,7 +11,7 @@ end
 Rake::TestTask.new("test") do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
+  t.warning = false
 end
 task default: :test
 

data/lib/gds_api/base.rb

@@ -23,7 +23,6 @@ class GdsApi::Base
                           :put_json,
                           :patch_json,
                           :delete_json,
-                          :delete_json_with_params!,
                           :get_raw, :get_raw!,
                           :put_multipart,
                           :post_multipart

data/lib/gds_api/email_alert_api.rb

@@ -26,7 +26,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     government_document_supertype = attributes["government_document_supertype"]
     gov_delivery_id = attributes["gov_delivery_id"]
     content_purpose_supergroup = attributes["content_purpose_supergroup"]
-    reject_content_purpose_supergroup = attributes["reject_content_purpose_supergroup"]
 
     if tags && links
       message = "please provide either tags or links (or neither), but not both"
@@ -41,7 +40,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     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[:reject_content_purpose_supergroup] = reject_content_purpose_supergroup if reject_content_purpose_supergroup
 
     query_string = nested_query_string(params)
     get_json("#{endpoint}/subscriber-lists?" + query_string)

data/lib/gds_api/json_client.rb

@@ -64,19 +64,7 @@ module GdsApi
       do_json_request(:patch, url, params, additional_headers)
     end
 
-    def delete_json(url, additional_headers = {})
-      do_json_request(:delete, url, nil, additional_headers)
-    end
-
-    def delete_json_with_params!(url, params, additional_headers = {})
-      warn <<-doc
-        DEPRECATION NOTICE: Delete requests should not include parameters.
-
-        Do not use this method as the ability to do this will be removed.
-
-        Called from: #{caller[2]}
-      doc
-
+    def delete_json(url, params = {}, additional_headers = {})
       do_json_request(:delete, url, params, additional_headers)
     end
 

data/lib/gds_api/publishing_api.rb

@@ -12,8 +12,17 @@ class GdsApi::PublishingApi < GdsApi::Base
     e
   end
 
+  def unreserve_path(base_path, publishing_app)
+    payload = { publishing_app: publishing_app }
+    delete_json(unreserve_url(base_path), payload)
+  end
+
 private
 
+  def unreserve_url(base_path)
+    "#{endpoint}/paths#{base_path}"
+  end
+
   def intent_url(base_path)
     "#{endpoint}/publish-intent#{base_path}"
   end

data/lib/gds_api/rummager.rb

@@ -19,6 +19,7 @@ module GdsApi
       def delete_document(type, id)
         delete_json(
           "#{documents_url}/#{id}",
+          nil,
           _type: type,
         )
       end

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -329,7 +329,6 @@ module GdsApi
           government_document_supertype = attributes["government_document_supertype"]
           gov_delivery_id = attributes["gov_delivery_id"]
           content_purpose_supergroup = attributes["content_purpose_supergroup"]
-          reject_content_purpose_supergroup = attributes["reject_content_purpose_supergroup"]
 
           params = {}
           params[:tags] = tags if tags
@@ -339,7 +338,6 @@ module GdsApi
           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[:reject_content_purpose_supergroup] = reject_content_purpose_supergroup if reject_content_purpose_supergroup
 
           query = Rack::Utils.build_nested_query(params)
         end

data/lib/gds_api/test_helpers/publishing_api.rb

@@ -11,6 +11,18 @@ module GdsApi
 
       PUBLISHING_API_ENDPOINT = Plek.current.find('publishing-api')
 
+      def stub_publishing_api_unreserve_path(base_path, publishing_app = /.*/)
+        stub_publishing_api_unreserve_path_with_code(base_path, publishing_app, 200)
+      end
+
+      def stub_publishing_api_unreserve_path_not_found(base_path, publishing_app = /.*/)
+        stub_publishing_api_unreserve_path_with_code(base_path, publishing_app, 404)
+      end
+
+      def stub_publishing_api_unreserve_path_invalid(base_path, publishing_app = /.*/)
+        stub_publishing_api_unreserve_path_with_code(base_path, publishing_app, 422)
+      end
+
       def stub_publishing_api_put_intent(base_path, body = intent_for_publishing_api(base_path))
         url = PUBLISHING_API_ENDPOINT + "/publish-intent" + base_path
         body = body.to_json unless body.is_a?(String)
@@ -101,6 +113,12 @@ module GdsApi
 
     private
 
+      def stub_publishing_api_unreserve_path_with_code(base_path, publishing_app, code)
+        url = PUBLISHING_API_ENDPOINT + "/paths" + base_path
+        body = { publishing_app: publishing_app }
+        stub_request(:delete, url).with(body: body).to_return(status: code, body: '{}', headers: { "Content-Type" => "application/json; charset=utf-8" })
+      end
+
       def values_match_recursively(expected_value, actual_value)
         case expected_value
         when Hash

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '57.4.2'.freeze
+  VERSION = '57.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 57.4.2
+  version: 57.5.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement