Merge pull request #9 from mreinsch/save-request

Nathan Sutton · Nathan Sutton · commit 1c8e5c2f3f09 · 2014-04-02T16:47:47.000-07:00
Save the request, so it can be inspected in case it fails.
diff --git a/README.markdown b/README.markdown
@@ -83,6 +83,7 @@ response.code         # => 200
 response.body         # => the JSON-parsed body or raw body if unparseable
 response.raw_body     # => the body pre-JSON-parsing
 response.raw_response # => the raw Net::HTTP or Typhoeus response (see below for how to use Typhoeus)
+response.request      # => the request object, you can inspect it if you need details on the request to debug it
 ```
 
 ### Parameters
diff --git a/lib/zencoder/http.rb b/lib/zencoder/http.rb
@@ -75,11 +75,15 @@ def default_options
       self.class.default_options
     end
 
+    def inspect
+      "#{method.to_s.upcase} #{url}\nOptions: " + options.inspect
+    end
 
   protected
 
     def process(http_response)
       response = Response.new
+      response.request = self
       response.code = http_response.code
 
       begin
diff --git a/lib/zencoder/http/net_http.rb b/lib/zencoder/http/net_http.rb
@@ -7,12 +7,12 @@ class NetHTTP
       def initialize(method, url, options)
         @method          = method
         @url             = url
-        @body            = options.delete(:body)
-        @params          = options.delete(:params)
-        @headers         = options.delete(:headers)
-        @timeout         = options.delete(:timeout)
-        @skip_ssl_verify = options.delete(:skip_ssl_verify)
-        @options         = options
+        @options         = options.dup
+        @body            = @options.delete(:body)
+        @params          = @options.delete(:params)
+        @headers         = @options.delete(:headers)
+        @timeout         = @options.delete(:timeout)
+        @skip_ssl_verify = @options.delete(:skip_ssl_verify)
       end
 
       def self.post(url, options={})
diff --git a/lib/zencoder/http/typhoeus.rb b/lib/zencoder/http/typhoeus.rb
@@ -19,6 +19,7 @@ def self.delete(url, options={})
       end
 
       def self.perform(method, url, options={})
+        options = options.dup
         if options.delete(:skip_ssl_verify)
           options[:disable_ssl_peer_verification] = true
         end
diff --git a/lib/zencoder/response.rb b/lib/zencoder/response.rb
@@ -1,7 +1,7 @@
 module Zencoder
   class Response
 
-    attr_accessor :code, :body, :raw_body, :raw_response
+    attr_accessor :request, :code, :body, :raw_body, :raw_response
 
     def initialize(options={})
       options.each do |k, v|
