Simplify error checking, explicitly require Hashie::Mash

Author: toastercup

lib/cortex/connection.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'addressable/uri'
+require 'hashie/mash'
 
 require 'cortex/faraday_middleware/response_failures'
 
@@ -20,8 +21,6 @@ def connection
 
       Faraday::Utils.default_uri_parser = Addressable::URI
       Faraday.new options do |conn|
-        # Hello, temporal coupling. Order matters here.
-
         ## Request middleware first:
         conn.use ::FaradayMiddleware::OAuth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
 

lib/cortex/result.rb

@@ -11,7 +11,7 @@ def initialize(body, headers, status)
     end
 
     def is_error?
-      @status >= 400 || (@contents.is_a?(Hash) && @contents.has_key?('errors'))
+      @status >= 400 || (@contents.is_a?(Hash) && @contents.errors?)
     end
 
     private
@@ -32,19 +32,20 @@ def parse_headers(headers)
     end
 
     def find_errors
+      errors = nil
       if is_error?
         if @contents.is_a?(Hash)
-          if @contents.has_key?('errors')
-            Array(@contents['errors'])
+          if @contents.errors?
+            errors = @contents.errors
           else
-            Array(@contents['message'])
+            errors = @contents.message
           end
         else
-          Array(@contents)
+          errors = @contents
         end
-      else
-        Array(nil)
       end
+
+      Array(errors)
     end
   end
 end