some refactoring, and giving each matcher it's options

Author: Peter Schrammel

lib/rack/reverse_proxy.rb

@@ -5,24 +5,25 @@ module Rack
   class ReverseProxy
     def initialize(app = nil, &b)
       @app = app || lambda { [404, [], []] }
-      @paths = {}
-      @opts = {:preserve_host => false}
+      @matchers = []
+      @global_options = {}
       instance_eval &b if block_given?
     end
 
     def call(env)
       rackreq = Rack::Request.new(env)
-      matcher, url = get_matcher_and_url rackreq.fullpath
+      matcher = get_matcher rackreq.fullpath
       return @app.call(env) if matcher.nil?
 
-      uri = get_uri(url, matcher, rackreq.fullpath) 
+      uri = matcher.get_uri(rackreq.fullpath)
+      all_opts = matcher.options #TODO: merge with global opts
       headers = Rack::Utils::HeaderHash.new
       env.each { |key, value|
         if key =~ /HTTP_(.*)/
           headers[$1] = value
         end
       }
-			headers['HOST'] = uri.host if @opts[:preserve_host]
+			headers['HOST'] = uri.host if all_opts[:preserve_host]
 
 			session = Net::HTTP.new(uri.host, uri.port)
 			session.use_ssl = (uri.scheme == 'https')
@@ -32,10 +33,10 @@ def call(env)
         case m
         when "GET", "HEAD", "DELETE", "OPTIONS", "TRACE"
           req = Net::HTTP.const_get(m.capitalize).new(uri.request_uri, headers)
-          req.basic_auth @opts[:username], @opts[:password] if @opts[:username] and @opts[:password]
+          req.basic_auth all_opts[:username], all_opts[:password] if all_opts[:username] and all_opts[:password]
         when "PUT", "POST"
           req = Net::HTTP.const_get(m.capitalize).new(uri.request_uri, headers)
-          req.basic_auth @opts[:username], @opts[:password] if @opts[:username] and @opts[:password]
+          req.basic_auth all_opts[:username], all_opts[:password] if all_opts[:username] and all_opts[:password]
           req.content_length = rackreq.body.length
           req.body_stream = rackreq.body
         else
@@ -55,17 +56,17 @@ def call(env)
 
     private
 
-    def get_matcher_and_url path
-      matches = @paths.select do |matcher, url|
-        match_path(path, matcher)
+    def get_matcher path
+      matches = @matchers.select do |matcher|
+        matcher.match?(path)
       end
 
       if matches.length < 1
         nil
       elsif matches.length > 1
         raise AmbiguousProxyMatch.new(path, matches)
       else
-        matches.first.map{|a| a.dup}
+        matches.first
       end
     end
 
@@ -79,27 +80,10 @@ def create_response_headers http_response
       response_headers
     end
 
-    def match_path(path, matcher)
-      if matcher.is_a?(Regexp)
-        path.match(matcher)
-      else
-        path.match(/^#{matcher.to_s}/)
-      end
-    end
-
-    def get_uri(url, matcher, path)
-      if url =~/\$\d/
-        match_path(path, matcher).to_a.each_with_index { |m, i| url.gsub!("$#{i.to_s}", m) }
-        URI(url)
-      else
-        URI.join(url, path)
-      end
-    end
 
     def reverse_proxy matcher, url, opts={}
       raise GenericProxyURI.new(url) if matcher.is_a?(String) && URI(url).class == URI::Generic
-      @paths.merge!(matcher => url)
-      @opts.merge!(opts)
+      @matchers << ReverseProxyMatcher.new(matcher,url,opts)
     end
   end
 
@@ -129,8 +113,40 @@ def to_s
     private
 
     def formatted_matches
-      matches.map {|m| %Q("#{m[0].to_s}" => "#{m[1]}")}.join(', ')
+      matches.map {|matcher| matcher.to_s}.join(', ')
     end
   end
 
+  class ReverseProxyMatcher
+    def initialize(matching,url,options)
+      @matching=matching
+      @url=url
+      @options={:preserve_host => false}.merge(options)
+      @matching_regexp= matching.kind_of?(Regexp) ? matching : /^#{matching.to_s}/
+    end
+
+    attr_reader :matching,:matching_regexp,:url,:options
+
+    def match?(path)
+      match_path(path) ? true : false
+    end
+
+    def get_uri(path)
+      if url =~/\$\d/
+        match_path(path).to_a.each_with_index { |m, i| url.gsub!("$#{i.to_s}", m) }
+        URI(url)
+      else
+        URI.join(url, path)
+      end
+    end
+    def to_s
+      %Q("#{matching.to_s}" => "#{url}")
+    end
+    private
+    def match_path(path)
+      path.match(matching_regexp)
+    end
+
+
+  end
 end