atum 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8721a2e924867278cb533cb3034412667102f1
-  data.tar.gz: f4dd36f0ac22cd6c40f297b74ba46fc66c0db9f7
+  metadata.gz: c3ec782d60dbd540d0640fc4d5535050fef5ae94
+  data.tar.gz: cd781717a286a356f74511d3d9a0e2d5f1eb3ac7
 SHA512:
-  metadata.gz: 95faf13627b0272502c1cfcdf818e900e85888aa23a14ccdb86ab80118b56049d4d1d34d6557aebbd9f8eb6f9861843d4afb1abe6e76cd6272806151d259d99c
-  data.tar.gz: 42a6b15d34aeaceda47f6704d82675deaf9c4add347b6c5c225b9425600d4832b6cf293c626bfda68447d9e16b5889f0fbe9583af2c86b47bd43b28a052e8b60
+  metadata.gz: 9536862348f70cfbcf9e76afb1136d5f6b466fff4fee998d06b327aa4281646ebbc051b2b7284a448e43837cf3c05b3e18e1c08fec55b70210c80130f63b8565
+  data.tar.gz: 59f9189fdcc9fdad55fba4be7bf5fc7e6ff384eccbb5fdc40b0e866e54643cb298d0df1caddee4fac3fb416b8545934ac1d76cfe2a0fe98bf2bbc756ab3eae60

data/atum.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'rubocop', '~> 0.26'
+  spec.add_development_dependency 'rubocop', '~> 0.27.0'
   spec.add_development_dependency 'guard', '~> 2.6'
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
   spec.add_development_dependency 'guard-rubocop', '~> 1.1'

data/lib/atum/core/errors.rb

@@ -5,14 +5,34 @@ module Atum
     class ResponseError < StandardError; end
 
     class ApiError < StandardError
-      attr_reader :error
+      attr_reader :request, :response
 
-      def initialize(error)
+      def initialize(request: request, response: response)
+        @request = request
+        @response = response
         @error = error
-        if @error.key?('documentation_url')
-          super("#{@error['message']}, see #{@error['documentation_url']}")
+      end
+
+      def error
+        @error ||=
+          if response.json?
+            response.body['error']
+          else
+            {
+              'message' => "Something went wrong with this raw request\n" \
+              "status: #{response.status}\n" \
+              "headers: #{response.headers}\n" \
+              "body: #{response.body}"
+            }
+          end
+      end
+
+      def message
+        return "Unknown error: #{response.body}" unless error
+        if error.key?('documentation_url')
+          "#{error['message']}, see #{error['documentation_url']}"
         else
-          super("#{@error['message']}")
+          "#{error['message']}"
         end
       end
     end

data/lib/atum/core/request.rb

@@ -13,6 +13,8 @@ module Atum
 
       def request
         response = Response.new(make_request)
+        raise(ApiError, request: options, response: response) if response.error?
+
         return response.body unless response.json?
 
         if response.limit.nil?

data/lib/atum/core/response.rb

@@ -6,7 +6,15 @@ module Atum
       end
 
       def body
-        json? ? handle_json : handle_raw
+        json? ? json_body : raw_body
+      end
+
+      def status
+        @response.status
+      end
+
+      def headers
+        @response.headers
       end
 
       def json?
@@ -40,20 +48,6 @@ module Atum
       def raw_body
         @response.body
       end
-
-      def handle_json
-        error? ? raise(ApiError, json_body['error']) : json_body
-      end
-
-      def handle_raw
-        default_raw_message = {
-          'message' => "Something went wrong with this raw request\n" \
-          "status: #{@response.status}\n" \
-          "headers: #{@response.headers}\n" \
-          "body: #{@response.body}"
-        }
-        error? ? raise(ApiError, default_raw_message) : raw_body
-      end
     end
   end
 end

data/lib/atum/version.rb

@@ -1,3 +1,3 @@
 module Atum
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/atum/core/errors_spec.rb

@@ -4,16 +4,43 @@ describe Atum::Core::ApiError do
   let(:message) { 'Foo failed' }
   let(:url) { 'http://example.com/how-to-fix' }
 
-  subject { described_class.new(error).message }
+  subject { described_class.new(request: nil, response: response).message }
 
-  context 'without a documentation url' do
-    let(:error) { { 'message' => message } }
-    it { is_expected.to eq(message) }
+  let(:response) { Atum::Core::Response.new(json_response) }
+  let(:json_response) do
+    double(headers: { 'Content-Type' => content_type },
+           body: response_body,
+           status: 500)
   end
 
-  context 'with a documentation url' do
-    let(:error) { { 'message' => message, 'documentation_url' => url } }
-    it { is_expected.to include(message) }
-    it { is_expected.to include(url) }
+  context 'with a json response' do
+    let(:content_type) { 'application/json' }
+
+    context 'without an error envelope' do
+      let(:response_body) { { 'thing' => { 'message' => message } }.to_json }
+      it { is_expected.to include('Unknown error') }
+      it { is_expected.to include('thing') }
+    end
+
+    context 'without a documentation url' do
+      let(:response_body) { { 'error' => { 'message' => message } }.to_json }
+      it { is_expected.to eq(message) }
+    end
+
+    context 'with a documentation url' do
+      let(:response_body) do
+        {
+          'error' => { 'message' => message, 'documentation_url' => url }
+        }.to_json
+      end
+      it { is_expected.to include(message) }
+      it { is_expected.to include(url) }
+    end
+  end
+
+  context 'with a raw response' do
+    let(:content_type) { 'application/text' }
+    let(:response_body) { 'FOOBAR' }
+    it { is_expected.to include(response_body) }
   end
 end

data/spec/atum/core/request_spec.rb

@@ -56,6 +56,21 @@ describe Atum::Core::Request do
       end
     end
 
+    context 'when the response is an error' do
+      let(:response) { 'ABCDEFGH' }
+      let(:stub) do
+        stub_request(:get, full_path)
+          .with(query: query)
+          .to_return(body: response,
+                     status: 500,
+                     headers: { 'Content-Type' => 'application/text' })
+      end
+
+      it 'raises an ApiError' do
+        expect { make_request.call }.to raise_error(Atum::Core::ApiError)
+      end
+    end
+
     context 'when the response is not JSON' do
       let(:response) { 'ABCDEFGH' }
       let(:stub) do

data/spec/atum/core/response_spec.rb

@@ -28,18 +28,6 @@ describe Atum::Core::Response do
       it 'should come through raw' do
         expect(body).to eq(response_body)
       end
-
-      context 'when the response is an error' do
-        let(:response) do
-          double(headers: { 'Content-Type' => 'application/text' },
-                 body: 'FOOBARBAZ', status: 400)
-        end
-
-        it 'should raise an error' do
-          expect { api_response.body }.to raise_error(Atum::Core::ApiError,
-                                                      /FOOBARBAZ/)
-        end
-      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atum
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - isaacseymour
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement