Merge pull request #9 from sportngin/fix_url_handling

Better use the provided url when proxying requests

Author: ehlertij

VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

lib/rack/reverse_proxy.rb

@@ -37,7 +37,7 @@ def proxy(env, source_request, matcher)
       options = @global_options.dup.merge(matcher.options)
 
       # Initialize request
-      target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(source_request.fullpath)
+      target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(uri.request_uri)
 
       # Setup headers
       target_request_headers = extract_http_request_headers(source_request.env)

lib/rack/reverse_proxy_matcher.rb

@@ -26,10 +26,10 @@ def get_uri(path,env)
         match_path(path).to_a.each_with_index { |m, i| _url.gsub!("$#{i.to_s}", m) }
         URI(_url)
       else
-        _url.include?(path) ? URI.parse(_url) : URI.join(_url, path)
+        default_url.nil? ? URI.parse(_url) : URI.join(_url, path)
       end
     end
-    
+
     def to_s
       %Q("#{matcher.to_s}" => "#{url}")
     end

rack-reverse-proxy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-reverse-proxy}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Swope"]

spec/rack/reverse_proxy_spec.rb

@@ -148,7 +148,7 @@ def app
       end
 
       it "should support subcaptures" do
-        stub_request(:get, 'http://example.com/test/path').to_return({:body => "Proxied App"})
+        stub_request(:get, 'http://example.com/path').to_return({:body => "Proxied App"})
         get '/test/path'
         last_response.body.should == "Proxied App"
       end
@@ -233,9 +233,9 @@ def self.match(path)
 
         def url(path)
           if path.include?("user")
-            'http://users-example.com/'
+            'http://users-example.com' + path
           else
-            'http://example.com/'
+            'http://example.com' + path
           end
         end
       end
@@ -271,7 +271,7 @@ def self.match(path, headers)
         end
 
         def url(path)
-          'http://example.com/'
+          'http://example.com' + path
         end
       end