Change service error class method to resolve conflict in reference to issue piotrmurach#273

piotrmurach · piotrmurach · commit 1968f2328686 · 2016-07-15T22:09:58.000+02:00
diff --git a/lib/github_api/error/service_error.rb b/lib/github_api/error/service_error.rb
@@ -21,9 +21,11 @@ def self.http_status_code(code)
       # @return [Hash[Integer, Object]]
       #
       # @api public
-      def self.errors
-        @errors ||= Hash[
-          descendants.map { |klass| [klass.new({}).http_status_code, klass] }
+      def self.error_mapping
+        @error_mapping ||= Hash[
+          descendants.map do |klass|
+            [klass.new({}).http_status_code, klass]
+          end
         ]
       end
 
diff --git a/lib/github_api/response/raise_error.rb b/lib/github_api/response/raise_error.rb
@@ -5,14 +5,17 @@
 
 module Github
   class Response::RaiseError < Faraday::Response::Middleware
-
+    # Check if status code requires raising a ServiceError
+    #
+    # @api private
     def on_complete(env)
       status_code   = env[:status].to_i
       service_error = Github::Error::ServiceError
-      error_class = service_error.errors[status_code]
-      error_class = service_error if !error_class and (400...600) === status_code
+      error_class = service_error.error_mapping[status_code]
+      if !error_class and (400...600) === status_code
+        error_class = service_error
+      end
       raise error_class.new(env) if error_class
     end
-
   end # Response::RaiseError
 end # Github
diff --git a/spec/unit/error/service_error/errors_spec.rb b/spec/unit/error/service_error/errors_spec.rb
@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe Github::Error::ServiceError, '::errors' do
+RSpec.describe Github::Error::ServiceError, '::error_mapping' do
   it "matches error codes to error types" do
-    expect(described_class.errors).to include({
+    expect(described_class.error_mapping).to include({
       400 => Github::Error::BadRequest,
       401 => Github::Error::Unauthorized,
       403 => Github::Error::Forbidden,
diff --git a/spec/unit/error/service_error_spec.rb b/spec/unit/error/service_error_spec.rb
@@ -38,6 +38,4 @@ def test_request(body='')
       Github.repos.branches user, repo
     }.to raise_error(Github::Error::NotFound, /key is already in use/)
   end
-
-
 end # Github::Error::ServiceError

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,11 @@ def self.http_status_code(code)`
`21`	`21`	`# @return [Hash[Integer, Object]]`
`22`	`22`	`#`
`23`	`23`	`# @api public`
`24`		`- def self.errors`
`25`		`- @errors \|\|= Hash[`
`26`		`- descendants.map { \|klass\| [klass.new({}).http_status_code, klass] }`
	`24`	`+ def self.error_mapping`
	`25`	`+ @error_mapping \|\|= Hash[`
	`26`	`+ descendants.map do \|klass\|`
	`27`	`+ [klass.new({}).http_status_code, klass]`
	`28`	`+ end`
`27`	`29`	`]`
`28`	`30`	`end`
`29`	`31`