http.rb in hyperresource-0.1.9.4

- old
+ new

@@ -1,23 +1,47 @@
 require 'faraday'
 require 'uri'
 require 'json'
 
-module HyperResource::Modules
-  module HTTP
+class HyperResource
+  module Modules; module HTTP
 
     ## Loads and returns the resource pointed to by +href+.  The returned
     ## resource will be blessed into its "proper" class, if
     ## +self.class.namespace != nil+.
     def get
       self.response = faraday_connection.get(self.href || '')
       finish_up
     end
 
-    ## Returns a per-thread Faraday connection for this object.
+    def create(*args); post(*args) end
+    def post(params=nil)
+      params ||= self.attributes
+      self.response = faraday_connection.post do |req|
+        req.body = adapter.serialize(params)
+      end
+      finish_up
+    end
+
+    def update(*args); put(*args) end
+    def put(params=nil)
+      params ||= self.attributes.changed_attributes
+      self.response = faraday_connection.put do |req|
+        req.body = adapter.serialize(params)
+      end
+      finish_up
+    end
+
+    def delete
+      self.response = faraday_connection.delete
+      finish_up
+    end
+
+    ## Returns a raw Faraday connection to this resource's URL, with proper
+    ## headers (including auth).
     def faraday_connection(url=nil)
-      url ||= self.root
+      url ||= URI.join(self.root, self.href)
       key = "faraday_connection_#{url}"
       return Thread.current[key] if Thread.current[key]
 
       fc = Faraday.new(:url => url)
       fc.headers.merge!('User-Agent' => "HyperResource #{HyperResource::VERSION}")
@@ -31,11 +55,11 @@
   private
 
     def finish_up
       begin
         self.response_object = self.adapter.deserialize(self.response.body)
-      rescue Exception => e
+      rescue StandardError => e
         raise HyperResource::ResponseError.new(
           "Error when deserializing response body",
           :response => self.response,
           :cause => e
         )
@@ -49,18 +73,23 @@
         return to_response_class
       elsif status / 100 == 3
         ## TODO redirect logic?
       elsif status / 100 == 4
         raise HyperResource::ClientError.new(status.to_s,
-                                             :response => self.response)
+                                             :response => self.response,
+                                             :response_object => self.response_object)
       elsif status / 100 == 5
         raise HyperResource::ServerError.new(status.to_s,
-                                             :response => self.response)
+                                             :response => self.response,
+                                             :response_object => self.response_object)
+
       else ## 1xx? really?
         raise HyperResource::ResponseError.new("Got status #{status}, wtf?",
-                                               :response => self.response)
+                                               :response => self.response,
+                                               :response_object => self.response_object)
+
       end
     end
 
-  end
+  end end
 end
 