alephant-publisher-request 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636d57a2d11137dff5db768d01ca82ecb182d16b
-  data.tar.gz: 967fcecc92c5208f88247ee5b9ea3f32c23336b4
+  metadata.gz: 212638793ae63c57e1e7884d4b9734a366e2a87c
+  data.tar.gz: d1150ed44ef1be7842248ebb986c29eca9e85e35
 SHA512:
-  metadata.gz: 39927e50459406de2270cac19444387d5964d19f51f075268a0cadb8dde2341a1d1dad1656a00d7f444a996b08ed724de89f498a30750a93da83b9d04f1de7e8
-  data.tar.gz: c56b87f5bbe539d9f3beac9284ba9eb524a02fcec128ce89bb1a2d4ec7f594bccf3e9fb3dee561298230d4f401d21a06492f8b5c01c7f9cb792f322d35b8a88e
+  metadata.gz: 14e04aac1d08505fdfceb01d1752eb3f19d390400a0770d6ffa77c80fa414708988554afecafe90f9a70cd0aeb8291da100c9c44bb7b394f4ede71b4daa342f8
+  data.tar.gz: 15796375af93d17e6922f02e602819e787ea16d1ae655eab6782eb34dfc9ed6981575d11d8a89557d8ab2db192e9537b7ce2c6fd2ad6501f4a2ce8ecd47e55d8

data/lib/alephant/publisher/request.rb

@@ -42,6 +42,8 @@ module Alephant
           end
 
           response.finish
+        rescue InvalidApiStatus => e
+          error_response(e, e.status)
         rescue ApiError, ConnectionFailed => e
           error_response(e, 502)
         rescue InvalidComponent => e

data/lib/alephant/publisher/request/data_mapper.rb

@@ -23,8 +23,8 @@ module Alephant
         def get(uri)
           before = Time.new
           response = connection.get(uri)
-          raise InvalidApiResponse, "Status: #{response.status}" unless response.status == 200
           logger.metric(:name => "PublisherRequestDataMapperRequestHTTPTime", :unit => 'Seconds', :value => Time.new - before)
+          raise InvalidApiStatus, response.status unless response.status == 200
           JSON::parse(response.body, :symbolize_names => true)
         rescue Faraday::ConnectionFailed
           logger.metric(:name => "PublisherRequestDataMapperConnectionFailed", :unit => "Count", :value => 1)
@@ -32,11 +32,13 @@ module Alephant
         rescue JSON::ParserError
           logger.metric(:name => "PublisherRequestDataMapperInvalidApiResponse", :unit => "Count", :value => 1)
           raise InvalidApiResponse, "JSON parsing error: #{response.body}"
+        rescue InvalidApiStatus => e
+          logger.metric(:name => "PublisherRequestDataMapperInvalidStatus#{e.status}", :unit => "Count", :value => 1)
+          raise e
         rescue StandardError => e
           logger.metric(:name => "PublisherRequestDataMapperApiError", :unit => "Count", :value => 1)
           raise ApiError, e.message
         end
-
       end
     end
   end

data/lib/alephant/publisher/request/error.rb

@@ -9,6 +9,15 @@ module Alephant
       class InvalidComponentBasePath < InvalidComponent; end
       class InvalidComponentName < InvalidComponent; end
       class InvalidComponentClassName < InvalidComponent; end
+      class InvalidApiStatus < ApiError
+        attr_accessor :status
+
+        def initialize(status)
+          @status = status
+          super("Status: #{status}")
+        end
+
+      end
     end
   end
 end

data/lib/alephant/publisher/request/version.rb

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Request
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/spec/data_mapper_spec.rb

@@ -35,7 +35,19 @@ describe FooMapper do
         allow(connection).to receive(:get).and_raise(faraday_exception)
       end
 
-      specify { expect{ subject.data }.to raise_error expected_exception }
+      specify { expect { subject.data }.to raise_error expected_exception }
     end
+
+    context "invalid status code" do
+      let (:status_code) { 503 }
+      let (:expected_exception) { Alephant::Publisher::Request::InvalidApiStatus }
+      before(:each) do
+        allow(connection).to receive(:get).and_return(OpenStruct.new(:status => status_code))
+      end
+
+      specify { expect { subject.data }.to raise_error expected_exception }
+    end
+
+
   end
 end

data/spec/integration/rack_server_spec.rb

@@ -47,14 +47,26 @@ describe Alephant::Publisher::Request do
         specify { expect(last_response.status).to eq 404 }
       end
 
+      context "with an invalid status code" do
+        let (:status_code) { 503 }
+        let (:expected_exception) { Alephant::Publisher::Request::InvalidApiStatus.new(status_code) }
+        before(:each) do
+          allow(connection).to receive(:get).and_raise expected_exception
+          get "/component/#{component_id}"
+        end
+
+        specify { expect(last_response.status).to eq status_code }
+      end
+
       context "with an invalid API endpoint" do
+        let (:status_code) { 502 }
         let (:expected_exception) { Alephant::Publisher::Request::InvalidApiResponse }
         before(:each) do
           allow(connection).to receive(:get).and_raise expected_exception
           get "/component/#{component_id}"
         end
 
-        specify { expect(last_response.status).to eq 502 }
+        specify { expect(last_response.status).to eq status_code }
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-request
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Integralist
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler