gds-api-adapters 33.1.0 → 33.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f9ef7bf8f91e52adc8dace6dd8a83c354241a2
-  data.tar.gz: bef2b694c6c916177cc89c64c8c472334785fe16
+  metadata.gz: 3557af538323da5b11bc0f7cab83c990838837ed
+  data.tar.gz: ce61e653825ad488bedf28631ac9b830eaaf6c00
 SHA512:
-  metadata.gz: 496fe45e9c5fb9c6eb2bebd9f2b74330facf5ab538ffc617a4aaef3205999671ad27722d9c55849f2f6a65cd0a0dbf9a40d9339b578dbcb9707f61782d75d272
-  data.tar.gz: 5a6b15ea7bd76ac302ae70f47843c76b1755c831c9bd90a7d6ea99800a8ff4724de63ac37defb659ec30490363cb213f6a61e8baa71c159042dbce458dd270f1
+  metadata.gz: f579fa8cfdfdaf6d8fd0b8fb2e9c19d03baa958dbe662d2e04de15cf0469e89e08a010f70205b15219bfc84038dca5660a811ecaa620ed935043aa6a53598268
+  data.tar.gz: dc15adf200f8b9c77b738982fa87ed0ac6a8d0d7d5c5a97235bd35b6fcdb099b2daf92f2f27260cdb0131e84b4711ae8552f0ba6aa918ef59c81b043225db0be

data/lib/gds_api/json_client.rb

@@ -272,13 +272,10 @@ module GdsApi
       logger.error loggable.merge(status: 'refused', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::EndpointNotFound.new("Could not connect to #{url}")
 
-    rescue RestClient::RequestTimeout => e
+    rescue RestClient::Exceptions::Timeout => e
       logger.error loggable.merge(status: 'timeout', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::TimedOutException.new
 
-    rescue RestClient::MaxRedirectsReached => e
-      raise GdsApi::TooManyRedirects
-
     rescue RestClient::Exception => e
       # Log the error here, since we have access to loggable, but raise the
       # exception up to the calling method to deal with

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '33.1.0'
+  VERSION = '33.2.0'
 end

data/test/json_client_test.rb

@@ -477,7 +477,7 @@ class JsonClientTest < MiniTest::Spec
     failure = lambda { |request| flunk("Request called too many times") }
     stub_request(:get, url).to_return(redirect).times(11).then.to_return(failure)
 
-    assert_raises GdsApi::TooManyRedirects do
+    assert_raises GdsApi::HTTPErrorResponse do
       @client.get_json(url)
     end
   end
@@ -502,7 +502,7 @@ class JsonClientTest < MiniTest::Spec
     stub_request(:get, first_url).to_return(first_redirect).times(6).then.to_return(failure)
     stub_request(:get, second_url).to_return(second_redirect).times(6).then.to_return(failure)
 
-    assert_raises GdsApi::TooManyRedirects do
+    assert_raises GdsApi::HTTPErrorResponse do
       @client.get_json(first_url)
     end
   end
@@ -768,7 +768,10 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_post_multipart_responses
     url = "http://some.endpoint/some.json"
     stub_request(:post, url).
-      with(:body => %r{Content\-Disposition: form\-data; name="a"\r\n\r\n123}, :headers => {'Content-Type' => %r{multipart/form-data; boundary=\d+}}).
+      with(:body => %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
+           :headers => {
+             'Content-Type' => %r{multipart/form-data; boundary=----RubyFormBoundary\w+}
+           }).
       to_return(:body => '{"b": "1"}', :status => 200)
 
     response = @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
@@ -797,7 +800,10 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_put_multipart_responses
     url = "http://some.endpoint/some.json"
     stub_request(:put, url).
-      with(:body => %r{Content\-Disposition: form\-data; name="a"\r\n\r\n123}, :headers => {'Content-Type' => %r{multipart/form-data; boundary=\d+}}).
+      with(:body => %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
+           :headers => {
+             'Content-Type' => %r{multipart/form-data; boundary=----RubyFormBoundary\w+}
+           }).
       to_return(:body => '{"b": "1"}', :status => 200)
 
     response = @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 33.1.0
+  version: 33.2.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -475,56 +475,56 @@ signing_key:
 specification_version: 4
 summary: Adapters to work with GDS APIs
 test_files:
-- test/support_api_test.rb
-- test/mapit_test.rb
-- test/publishing_api_test.rb
-- test/publishing_api_v2/lookup_test.rb
-- test/publishing_api_v2/get_links_test.rb
-- test/publishing_api_v2/get_expanded_links_test.rb
-- test/whitehall_admin_api_test.rb
-- test/pp_data_in_test.rb
-- test/local_links_manager_api_test.rb
+- test/panopticon_registerer_test.rb
 - test/publishing_api/special_route_publisher_test.rb
-- test/need_api_test.rb
-- test/publisher_api_test.rb
-- test/rummager_helpers_test.rb
+- test/asset_manager_test.rb
+- test/list_response_test.rb
 - test/support_test.rb
-- test/test_helpers/publishing_api_test.rb
+- test/publisher_api_test.rb
+- test/gov_uk_delivery_test.rb
+- test/helpers_test.rb
+- test/test_helper.rb
+- test/panopticon_test.rb
+- test/content_store_test.rb
+- test/publishing_api_v2/get_links_test.rb
+- test/publishing_api_v2/lookup_test.rb
+- test/publishing_api_v2/get_expanded_links_test.rb
+- test/external_link_tracker_test.rb
+- test/imminence_api_test.rb
+- test/gds_api_base_test.rb
+- test/router_test.rb
+- test/publishing_api_test.rb
+- test/licence_application_api_test.rb
 - test/test_helpers/pact_helper.rb
 - test/test_helpers/panopticon_test.rb
+- test/test_helpers/publishing_api_test.rb
 - test/test_helpers/email_alert_api_test.rb
 - test/test_helpers/publishing_api_v2_test.rb
-- test/licence_application_api_test.rb
-- test/gov_uk_delivery_test.rb
-- test/maslow_test.rb
+- test/local_links_manager_api_test.rb
 - test/govuk_headers_test.rb
-- test/helpers_test.rb
-- test/panopticon_registerer_test.rb
-- test/panopticon_test.rb
-- test/middleware/govuk_header_sniffer_test.rb
-- test/rummager_test.rb
-- test/json_client_test.rb
-- test/email_alert_api_test.rb
-- test/content_api_test.rb
-- test/response_test.rb
+- test/business_support_api_test.rb
+- test/rummager_helpers_test.rb
+- test/support_api_test.rb
 - test/organisations_api_test.rb
-- test/imminence_api_test.rb
-- test/content_store_test.rb
-- test/asset_manager_test.rb
-- test/fixtures/hello.txt
-- test/fixtures/new_policies_for_dwp.json
-- test/fixtures/world_organisations_australia.json
+- test/maslow_test.rb
+- test/json_client_test.rb
+- test/need_api_test.rb
+- test/fixtures/sub_sector_organisations.json
 - test/fixtures/no_services_and_info_data_found_fixture.json
+- test/fixtures/finder_api/cma-case-schema.json
+- test/fixtures/world_organisations_australia.json
 - test/fixtures/old_policies_for_dwp.json
 - test/fixtures/services_and_info_fixture.json
-- test/fixtures/sub_sector_organisations.json
-- test/fixtures/finder_api/cma-case-schema.json
-- test/router_test.rb
-- test/list_response_test.rb
-- test/external_link_tracker_test.rb
-- test/gds_api_base_test.rb
+- test/fixtures/new_policies_for_dwp.json
+- test/fixtures/hello.txt
+- test/response_test.rb
 - test/worldwide_api_test.rb
-- test/test_helper.rb
+- test/pp_data_in_test.rb
+- test/middleware/govuk_header_sniffer_test.rb
+- test/content_api_test.rb
+- test/email_alert_api_test.rb
 - test/publishing_api_v2_test.rb
-- test/business_support_api_test.rb
+- test/rummager_test.rb
+- test/mapit_test.rb
+- test/whitehall_admin_api_test.rb
 has_rdoc: