lib/hyper_resource/modules/http.rb in hyperresource-0.1.9 vs lib/hyper_resource/modules/http.rb in hyperresource-0.1.9.2

@@ -28,24 +28,36 @@
   end
 
 private
 
   def finish_up
-    self.loaded = true
-    self.response_object = self.adapter.deserialize(self.response.body)
+    begin
+      self.response_object = self.adapter.deserialize(self.response.body)
+    rescue Exception => e
+      raise HyperResource::ResponseError.new(
+        "Error when deserializing response body",
+        :response => self.response,
+        :cause => e
+      )
+    end
+
     self.adapter.apply(self.response_object, self)
+    self.loaded = true
 
     status = self.response.status
     if status / 100 == 2
       return self.to_response_class
     elsif status / 100 == 3
       ## TODO redirect logic?
     elsif status / 100 == 4
-      raise HyperResource::ClientError, status.to_s
+      raise HyperResource::ClientError.new(status.to_s,
+                                           :response => self.response)
     elsif status / 100 == 5
-      raise HyperResource::ServerError, status.to_s
+      raise HyperResource::ServerError.new(status.to_s,
+                                           :response => self.response)
     else ## 1xx? really?
-      raise HyperResource::ResponseError, "Got status #{status}, wtf?"
+      raise HyperResource::ResponseError.new("Got status #{status}, wtf?",
+                                             :response => self.response)
     end
   end
 
 end