lib/redbooth-ruby/request/validator.rb in redbooth-ruby-0.0.4 vs lib/redbooth-ruby/request/validator.rb in redbooth-ruby-0.0.5

@@ -13,13 +13,11 @@
       #
       # param incoming_response [] http response object
       # return [RedboothRuby::Request::Response]
       def validated_response_for(incoming_response)
         self.raw_response = incoming_response
-        @response = RedboothRuby::Request::Response.new(headers: raw_response.headers,
-                                                        body: raw_response.body,
-                                                        status: raw_response.status.to_i)
+        @response = response_from_raw
         verify_response_code
         info.data = response.data
         validate_response_data
         response
       end
@@ -28,11 +26,11 @@
 
       # Verifies the response status code in case it fails with the dessired error
       # and message
       #
       def verify_response_code
-        status = raw_response.status.to_i
+        status = response.status
         case
         when status == 401
           verify_authentication_header
           fail AuthenticationError
         when status >= 500
@@ -77,9 +75,39 @@
                 when 2000        then AuthenticationError.new(message)
                 else
                   APIError.new(message)
                 end
         fail error
+      end
+
+      # Builds response object from raw received response
+      #
+      # @return [RedboothRuby::Request::Response]
+      def response_from_raw
+        case raw_response
+        when Net::HTTPResponse
+          response_from_http
+        else
+          response_from_rest_client
+        end
+      end
+
+      # Builds response object form RestClient::Response object
+      #
+      # @return [RedboothRuby::Request::Response]
+      def response_from_rest_client
+        RedboothRuby::Request::Response.new(headers: raw_response.headers,
+                                            body: raw_response.body,
+                                            status: raw_response.status.to_i)
+      end
+
+      # Builds response object form Http::Response object
+      #
+      # @return [RedboothRuby::Request::Response]
+      def response_from_http
+        RedboothRuby::Request::Response.new(headers: raw_response.to_hash,
+                                            body: raw_response.body,
+                                            status: raw_response.code.to_i)
       end
     end
   end
 end