Added the ability to pass in the Rack request as an optional third argument to a Matcher class.

Author: markbates

Guardfile

@@ -1,19 +1,13 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'bundler' do
-  watch('Gemfile')
-  # Uncomment next line if Gemfile contain `gemspec' command
-  # watch(/^.+\.gemspec/)
-end
-
 guard 'rspec', :version => 1 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec" }
   watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }

lib/rack/reverse_proxy.rb

@@ -17,7 +17,7 @@ def initialize(app = nil, &b)
 
     def call(env)
       rackreq = Rack::Request.new(env)
-      matcher = get_matcher(rackreq.fullpath, extract_http_request_headers(rackreq.env))
+      matcher = get_matcher(rackreq.fullpath, extract_http_request_headers(rackreq.env), rackreq)
       return @app.call(env) if matcher.nil?
 
       if @global_options[:newrelic_instrumentation]
@@ -97,9 +97,9 @@ def reconstruct_header_name(name)
       name.sub(/^HTTP_/, "").gsub("_", "-")
     end
 
-    def get_matcher(path, headers)
+    def get_matcher(path, headers, rackreq)
       matches = @matchers.select do |matcher|
-        matcher.match?(path, headers)
+        matcher.match?(path, headers, rackreq)
       end
 
       if matches.length < 1

lib/rack/reverse_proxy_matcher.rb

@@ -16,8 +16,8 @@ def initialize(matcher,url=nil,options)
 
     attr_reader :matcher,:url, :default_url,:options
 
-    def match?(path, headers)
-      match_path(path, headers) ? true : false
+    def match?(path, *args)
+      match_path(path, *args) ? true : false
     end
 
     def get_uri(path,env)
@@ -35,11 +35,15 @@ def to_s
     end
 
     private
-    def match_path(path, headers=nil)
-      if @options[:accept_headers]
-        match = matcher.match(path, headers)
-      else
+    def match_path(path, *args)
+      headers = args[0]
+      rackreq = args[1]
+      arity = matcher.method(:match).arity
+      if arity == -1
         match = matcher.match(path)
+      else
+        params = [path, (@options[:accept_headers] ? headers : nil), rackreq]
+        match = matcher.match(*params[0..(arity - 1)])
       end
       @url = match.url(path) if match && default_url.nil?
       match

spec/rack/reverse_proxy_spec.rb

@@ -262,6 +262,52 @@ def app
       end
     end
 
+    describe "with a matching class" do
+      class RequestMatcher
+        attr_accessor :rackreq
+
+        def initialize(rackreq)
+          self.rackreq = rackreq
+        end
+
+        def self.match(path, headers, rackreq)
+          if path.match(/^\/(test|users)/)
+            RequestMatcher.new(rackreq)
+          end
+        end
+
+        def url(path)
+          if rackreq.params["user"] == 'omer'
+            'http://users-example.com' + path
+          else
+            'http://example.com' + path
+          end
+        end
+      end
+
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy RequestMatcher
+        end
+      end
+
+      it "should forward requests to the calling app when the path is not matched" do
+        get '/'
+        last_response.body.should == "Dummy App"
+        last_response.should be_ok
+      end
+
+      it "should proxy requests when a pattern is matched" do
+        stub_request(:get, 'http://example.com/test?user=mark').to_return({:body => "Proxied App"})
+        stub_request(:get, 'http://users-example.com/users?user=omer').to_return({:body => "User App"})
+        get '/test', user: "mark"
+        last_response.body.should == "Proxied App"
+        get '/users', user: 'omer'
+        last_response.body.should == "User App"
+      end
+    end
+
+
     describe "with a matching class that accepts headers" do
       class MatcherHeaders
         def self.match(path, headers)