http-request 1.1.3 → 1.1.4

data/lib/http-request/connection.rb

@@ -12,7 +12,7 @@ module HttpRequest
       @keep_alive     = options[:keep_alive].nil? ? true : options[:keep_alive]
 
       # Let's do this
-      @uri = Addressable::URI.parse(url)
+      @uri = parse_uri(url)
       open
     end
 
@@ -57,30 +57,29 @@ module HttpRequest
 
     def request(verb, path, headers={}, body=nil)
       if path =~ /^http/i
-        new_uri = Addressable::URI.parse(path)
+        new_uri = parse_uri(path)
         if new_uri.origin != uri.origin
           # TODO.. get an error class for this..
-          raise "Ummm... you're trying to talk to another server you duffis.."
+          raise "Ummm... you're trying to talk to another server"
         end
-        uri.path = new_uri.path
+        @uri = new_uri
+      else
+        # Update the path and query
+        # Note: also normalize the path in case its malformed.. dum dums
+        uri.join! parse_uri(path.gsub('//','/')).request_uri
       end
 
       # Open the connection if its closed or hasn't been started..
       open if closed?
 
-      # headers['Date'] = Time.now.httpdate # need this..?
+      # Default headers
       headers['User-Agent']     ||= user_agent
       headers['Connection']     ||= 'keep-alive' if keep_alive
       headers['Content-Length'] ||= body.bytesize.to_s if body
 
-      # TODO.. link traversal..
-      # ..will our host change tho... like the thing we actually connect to?
-      # it could very well... so we should check that out..
-      # maybe we have a "host" or "host_id" variable for this stuff..?
-
       # Build request
       req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)
-      req = req_klass.new([uri.path, uri.query].join('?'), headers)
+      req = req_klass.new(uri.request_uri, headers)
       req.body = body if !body.nil? && !body.empty?
 
       # Make the HTTP request
@@ -108,12 +107,20 @@ module HttpRequest
 
       # Handle URL Redirection
       if auto_redirect && raw_response.kind_of?(Net::HTTPRedirection) && !response.header['location'].nil?
-        @uri = Addressable::URI.parse(response.header['location'])
-        request(verb, path, headers, body)
+        @uri = parse_uri(response.header['location'])
+        close # close existing connection..
+        request(verb, uri.request_uri, headers, body)
       else
         response
       end
     end
 
+
+    private
+
+      def parse_uri(uri)
+        Addressable::URI.parse(Addressable::URI.encode(Addressable::URI.unencode(uri)))
+      end
+
   end
 end

data/lib/http-request/version.rb

@@ -1,3 +1,3 @@
 module HttpRequest
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-request
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors: