gds-api-adapters 14.5.0 → 14.6.0

data/lib/gds_api/exceptions.rb

@@ -21,10 +21,17 @@ module GdsApi
     end
   end
 
-  class HTTPNotFound < HTTPErrorResponse
+  class HTTPClientError < HTTPErrorResponse
   end
 
-  class HTTPGone < HTTPErrorResponse; end
+  class HTTPServerError < HTTPErrorResponse
+  end
+
+  class HTTPNotFound < HTTPClientError
+  end
+
+  class HTTPGone < HTTPClientError
+  end
 
   class NoBearerToken < BaseError; end
 
@@ -38,5 +45,23 @@ module GdsApi
     def ignoring_missing(&block)
       ignoring([HTTPNotFound, HTTPGone], &block)
     end
+
+    def build_specific_http_error(error, url, details = nil)
+      message = "url: #{url}\n#{error.http_body}"
+      code = error.http_code
+
+      case code
+      when 404
+        GdsApi::HTTPNotFound.new(code, message, details)
+      when 410
+        GdsApi::HTTPGone.new(code, message, details)
+      when (400..499)
+        GdsApi::HTTPClientError.new(code, message, details)
+      when (500..599)
+        GdsApi::HTTPServerError.new(code, message, details)
+      else
+        GdsApi::HTTPErrorResponse.new(code, message, details)
+      end
+    end
   end
 end

data/lib/gds_api/json_client.rb

@@ -109,15 +109,8 @@ module GdsApi
     private
     def do_raw_request(method, url, params = nil)
       response = do_request(method, url, params)
-
-    rescue RestClient::ResourceNotFound => e
-      raise GdsApi::HTTPNotFound.new(e.http_code, "url: #{url}")
-
-    rescue RestClient::Gone => e
-      raise GdsApi::HTTPGone.new(e.http_code, "url: #{url}")
-
     rescue RestClient::Exception => e
-      raise GdsApi::HTTPErrorResponse.new(e.response.code.to_i, "url: #{url}\n#{e.response.body}")
+      raise build_specific_http_error(e, url)
     end
 
     # method: the symbolic name of the method to use, e.g. :get, :post
@@ -130,13 +123,6 @@ module GdsApi
 
       begin
         response = do_request_with_cache(method, url, (params.to_json if params), additional_headers)
-
-      rescue RestClient::ResourceNotFound => e
-        raise GdsApi::HTTPNotFound.new(e.http_code, "url: #{url}")
-
-      rescue RestClient::Gone => e
-        raise GdsApi::HTTPGone.new(e.http_code, "url: #{url}")
-
       rescue RestClient::Exception => e
         # Attempt to parse the body as JSON if possible
         error_details = begin
@@ -144,7 +130,7 @@ module GdsApi
         rescue JSON::ParserError
           nil
         end
-        raise GdsApi::HTTPErrorResponse.new(e.http_code, "url: #{url}\n#{e.http_body}", error_details)
+        raise build_specific_http_error(e, url, error_details)
       end
 
       # If no custom response is given, just instantiate Response

data/lib/gds_api/mapit.rb

@@ -8,7 +8,7 @@ class GdsApi::Mapit < GdsApi::Base
     return Location.new(response) unless response.nil?
   rescue GdsApi::HTTPErrorResponse => e
     # allow 400 errors, as they can be invalid postcodes people have entered
-    raise GdsApi::HTTPErrorResponse.new(e.code) unless e.code == 400
+    raise e unless e.code == 400
   end
 
   def areas_for_type(type)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '14.5.0'
+  VERSION = '14.6.0'
 end

data/test/content_api_test.rb

@@ -628,7 +628,7 @@ describe GdsApi::ContentApi do
       stub_request(:get, %r{\A#{@base_api_url}/business_support_schemes.json}).
         to_return(:status => 503, :body => "Gateway timeout")
 
-      assert_raises GdsApi::HTTPErrorResponse do
+      assert_raises GdsApi::HTTPServerError do
         @api.business_support_schemes(['foo', 'bar'])
       end
     end
@@ -682,7 +682,7 @@ describe GdsApi::ContentApi do
       stub_request(:get, %r[\A#{@base_api_url}/licences]).
         to_return(:status => [503, "Service temporarily unabailable"])
 
-      assert_raises GdsApi::HTTPErrorResponse do
+      assert_raises GdsApi::HTTPServerError do
         @api.licences_for_ids([123,124])
       end
     end

data/test/fact_cave_test.rb

@@ -4,7 +4,7 @@ require "gds_api/fact_cave"
 describe GdsApi::FactCave do
   it "should raise an exception if the service at the fact cave URI returns a 500" do
     stub_request(:get, /example.com\/facts/).to_return(status: [500, "Internal Server Error"])
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPServerError) do
       GdsApi::FactCave.new("http://example.com").fact("foo")
     end
   end
@@ -22,7 +22,7 @@ describe GdsApi::FactCave do
   end
 
   it "should return the fact deserialized from json" do
-    fact_cave_result = {"id" => "vat-rate", "title" => "VAT rate", "details" => { 
+    fact_cave_result = {"id" => "vat-rate", "title" => "VAT rate", "details" => {
       "value" => "20%", "description" => "Value Added Tax rate" }}
     stub_request(:get, "http://example.com/facts/vat-rate").to_return(body: fact_cave_result.to_json)
     result = GdsApi::FactCave.new("http://example.com").fact("vat-rate")

data/test/json_client_test.rb

@@ -341,7 +341,7 @@ class JsonClientTest < MiniTest::Spec
   def test_get_should_raise_error_if_non_404_non_410_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(:body => "{}", :status => 500)
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       @client.get_json(url)
     end
   end
@@ -452,7 +452,7 @@ class JsonClientTest < MiniTest::Spec
   def test_post_should_raise_error_if_non_404_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
     stub_request(:post, url).to_return(:body => "{}", :status => 500)
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       @client.post_json(url, {})
     end
   end
@@ -479,7 +479,7 @@ class JsonClientTest < MiniTest::Spec
   def test_put_should_raise_error_if_non_404_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
     stub_request(:put, url).to_return(:body => "{}", :status => 500)
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       @client.put_json(url, {})
     end
   end
@@ -690,7 +690,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:post, url).to_return(:body => '', :status => 500)
 
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
     end
   end
@@ -719,7 +719,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:put, url).to_return(:body => '', :status => 500)
 
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
     end
   end

data/test/licence_application_api_test.rb

@@ -183,7 +183,7 @@ EOS
   def test_should_raise_exception_on_api_error
     licence_returns_error("866-5-1")
 
-    assert_raises GdsApi::HTTPErrorResponse do
+    assert_raises GdsApi::HTTPServerError do
       api.details_for_licence("866-5-1")
     end
   end

data/test/pp_data_in_test.rb

@@ -42,7 +42,7 @@ describe GdsApi::PerformancePlatform::DataIn do
 
   it "throws an exception when the support app isn't available" do
     stub_pp_isnt_available
-    assert_raises(GdsApi::HTTPErrorResponse) { @api.submit_service_feedback_day_aggregate("doesnt_matter", {}) }
+    assert_raises(GdsApi::HTTPServerError) { @api.submit_service_feedback_day_aggregate("doesnt_matter", {}) }
   end
 
   it "throws an exception when the the bucket for that slug hasn't been defined" do

data/test/rummager_test.rb

@@ -10,7 +10,7 @@ describe GdsApi::Rummager do
 
   it "should raise an exception if the service at the search URI returns a 500" do
     stub_request(:get, /example.com\/search/).to_return(status: [500, "Internal Server Error"])
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPServerError) do
       GdsApi::Rummager.new("http://example.com").search("query")
     end
   end
@@ -87,7 +87,7 @@ describe GdsApi::Rummager do
 
   it "#advanced_search should raise an exception if the service at the search URI returns a 500" do
     stub_request(:get, /example.com\/advanced_search/).to_return(status: [500, "Internal Server Error"])
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPServerError) do
       GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
     end
   end
@@ -145,7 +145,7 @@ describe GdsApi::Rummager do
 
   it "#unified_search should raise an exception if the service at the search URI returns a 500" do
     stub_request(:get, /example.com\/unified_search.json/).to_return(status: [500, "Internal Server Error"])
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPServerError) do
       GdsApi::Rummager.new("http://example.com").unified_search(q: "query")
     end
   end
@@ -162,7 +162,7 @@ describe GdsApi::Rummager do
       status: [400, "Bad Request"],
       body: %q("error":"Filtering by \"coffee\" is not allowed"),
     )
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPClientError) do
       GdsApi::Rummager.new("http://example.com").unified_search(q: "query", filter_coffee: "tea")
     end
   end
@@ -172,7 +172,7 @@ describe GdsApi::Rummager do
       status: [422, "Bad Request"],
       body: %q("error":"Filtering by \"coffee\" is not allowed"),
     )
-    assert_raises(GdsApi::HTTPErrorResponse) do
+    assert_raises(GdsApi::HTTPClientError) do
       GdsApi::Rummager.new("http://example.com").unified_search(q: "query", filter_coffee: "tea")
     end
   end

data/test/support_api_test.rb

@@ -25,6 +25,6 @@ describe GdsApi::SupportApi do
   it "throws an exception when the support app isn't available" do
     support_api_isnt_available
 
-    assert_raises(GdsApi::HTTPErrorResponse) { @api.create_service_feedback({}) }
+    assert_raises(GdsApi::HTTPServerError) { @api.create_service_feedback({}) }
   end
 end

data/test/support_test.rb

@@ -25,7 +25,7 @@ describe GdsApi::Support do
   it "throws an exception when the support app isn't available" do
     support_isnt_available
 
-    assert_raises(GdsApi::HTTPErrorResponse) { @api.create_foi_request({}) }
+    assert_raises(GdsApi::HTTPServerError) { @api.create_foi_request({}) }
   end
 
   it "can report a problem" do
@@ -67,7 +67,7 @@ describe GdsApi::Support do
   it "throws an exception when the support app isn't available" do
     support_isnt_available
 
-    assert_raises(GdsApi::HTTPErrorResponse) { @api.create_problem_report({}) }
+    assert_raises(GdsApi::HTTPServerError) { @api.create_problem_report({}) }
   end
 
   it "can pass service feedback" do
@@ -85,7 +85,7 @@ describe GdsApi::Support do
   it "throws an exception when the support app isn't available" do
     support_isnt_available
 
-    assert_raises(GdsApi::HTTPErrorResponse) { @api.create_service_feedback({}) }
+    assert_raises(GdsApi::HTTPServerError) { @api.create_service_feedback({}) }
   end
 
   it "gets the correct feedback URL" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 14.5.0
+  version: 14.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &12009420 !ruby/object:Gem::Requirement
+  requirement: &9869000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12009420
+  version_requirements: *9869000
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &12008540 !ruby/object:Gem::Requirement
+  requirement: &9868020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12008540
+  version_requirements: *9868020
 - !ruby/object:Gem::Dependency
   name: link_header
-  requirement: &12007360 !ruby/object:Gem::Requirement
+  requirement: &9867040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12007360
+  version_requirements: *9867040
 - !ruby/object:Gem::Dependency
   name: lrucache
-  requirement: &12006380 !ruby/object:Gem::Requirement
+  requirement: &9866000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *12006380
+  version_requirements: *9866000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &12003620 !ruby/object:Gem::Requirement
+  requirement: &9863120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *12003620
+  version_requirements: *9863120
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &12003060 !ruby/object:Gem::Requirement
+  requirement: &9862600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12003060
+  version_requirements: *9862600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12013840 !ruby/object:Gem::Requirement
+  requirement: &9874660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *12013840
+  version_requirements: *9874660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12043140 !ruby/object:Gem::Requirement
+  requirement: &9871020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *12043140
+  version_requirements: *9871020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &12042300 !ruby/object:Gem::Requirement
+  requirement: &9869460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *12042300
+  version_requirements: *9869460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &12041580 !ruby/object:Gem::Requirement
+  requirement: &9902240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.12.4
   type: :development
   prerelease: false
-  version_requirements: *12041580
+  version_requirements: *9902240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12040900 !ruby/object:Gem::Requirement
+  requirement: &9901480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *12040900
+  version_requirements: *9901480
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12040220 !ruby/object:Gem::Requirement
+  requirement: &9901000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12040220
+  version_requirements: *9901000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12039660 !ruby/object:Gem::Requirement
+  requirement: &9900100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12039660
+  version_requirements: *9900100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12037700 !ruby/object:Gem::Requirement
+  requirement: &9897660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *12037700
+  version_requirements: *9897660
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &12051840 !ruby/object:Gem::Requirement
+  requirement: &9911680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12051840
+  version_requirements: *9911680
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &12050540 !ruby/object:Gem::Requirement
+  requirement: &9910020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *12050540
+  version_requirements: *9910020
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &12048920 !ruby/object:Gem::Requirement
+  requirement: &9908540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,7 +197,7 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *12048920
+  version_requirements: *9908540
 description: A set of adapters providing easy access to the GDS GOV.UK APIs
 email:
 - jystewart@gmail.com
@@ -328,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3837904856260471642
+      hash: -3268475085695861388
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3837904856260471642
+      hash: -3268475085695861388
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11