Change service error to simplify parsing.

piotrmurach · piotrmurach · commit 42ecefc2190f · 2016-05-22T15:45:09.000+01:00
diff --git a/lib/github_api/error/service_error.rb b/lib/github_api/error/service_error.rb
@@ -6,26 +6,25 @@ module Github
   # Raised when GitHub returns any of the HTTP status codes
   module Error
     class ServiceError < GithubError
-
       attr_reader :http_headers, :body, :status
 
       MIN_BODY_LENGTH = 2
 
       def initialize(response)
         @http_headers = response[:response_headers]
-        message       = parse_response(response)
-        super(message)
+        @body         = parse_body(response[:body])
+        @status       = response[:status]
+
+        super(create_message(response))
       end
 
-      def parse_response(response)
-        @body   = parse_body(response[:body])
-        @status = response[:status]
-        "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{@status} #{@body}"
+      def create_message(response)
+        "#{response[:method].to_s.upcase} #{response[:url]}: #{@status} #{@body}"
       end
 
       def decode_body(body)
         if body.respond_to?(:to_str) && body.length >= MIN_BODY_LENGTH
-           JSON.parse(body, symbolize_names: true)
+          JSON.parse(body, symbolize_names: true)
         else
           body
         end
@@ -40,11 +39,7 @@ def parse_body(body)
           body[:error]
         elsif body[:errors]
           error = Array(body[:errors]).first
-          if error.kind_of?(Hash)
-            error[:message]
-          else
-            error
-          end
+          error.is_a?(Hash) ? error[:message] : error
         elsif body[:message]
           body[:message]
         else
diff --git a/spec/github/error/service_error/parse_response_spec.rb b/spec/github/error/service_error/parse_response_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Github::Error::ServiceError, 'parse_response' do
+RSpec.describe Github::Error::ServiceError, '#new' do
   let(:message) { 'Requires authentication' }
   let(:url)     { 'https://api.github.com/user/repos' }
   let(:body)    { "{\"message\":\"#{message}\"}" }
@@ -15,24 +15,27 @@
     url: url
   }}
 
-  let(:object) { described_class.new(response) }
-
-  subject { object.parse_response(response) }
-
   it "parses body" do
-    expect(object).to receive(:parse_body).with(body)
-    subject
+    error = described_class.new(response)
+
+    expect(error.body).to eq(message)
   end
 
   it "parses http headers" do
-    expect(object.http_headers).to eql(response_headers)
+    error = described_class.new(response)
+
+    expect(error.http_headers).to eq(response_headers)
   end
 
   it "parses status" do
-    expect(object.status).to eql(status)
+    error = described_class.new(response)
+
+    expect(error.status).to eq(status)
   end
 
   it "assembles error message" do
-    expect(subject).to eql(" #{url}: #{status} #{message}")
+    error = described_class.new(response)
+
+    expect(error.message).to eql(" #{url}: #{status} #{message}")
   end
 end # Github::Error::ServiceError
