Merge pull request #10 from markbates/proxy-by-lambda

Add Rack request to Matcher class

Author: ehlertij

Gemfile

@@ -2,4 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rack-proxy", :git => 'https://github.com/tstmedia/rack-proxy.git'
+gem "rack-proxy", :git => 'https://github.com/tstmedia/rack-proxy.git'
+gem 'rb-fsevent'
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-shell'
+gem 'guard-bundler'
+gem 'terminal-notifier-guard'

Gemfile.lock

@@ -8,19 +8,61 @@ GIT
 PATH
   remote: .
   specs:
-    rack-reverse-proxy (0.6.0)
+    rack-reverse-proxy (0.7.0)
       rack (>= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.2.6)
+    coderay (1.0.9)
     crack (0.1.8)
+    ffi (1.9.0)
+    ffi (1.9.0-java)
+    formatador (0.2.4)
+    guard (1.8.1)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-bundler (1.0.0)
+      bundler (~> 1.0)
+      guard (~> 1.1)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
+    guard-shell (0.5.1)
+      guard (>= 1.1.0)
+    listen (1.2.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
+    method_source (0.8.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12.2-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rack (1.4.1)
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rspec (1.3.2)
+    slop (3.4.5)
+    spoon (0.0.4)
+      ffi
+    terminal-notifier-guard (1.5.3)
+    thor (0.18.1)
     webmock (1.5.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
@@ -30,9 +72,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  guard
+  guard-bundler
+  guard-rspec
+  guard-shell
   rack-proxy!
   rack-reverse-proxy!
   rack-test (~> 0.5.7)
   rake (~> 0.8.7)
+  rb-fsevent
   rspec (~> 1.3.2)
+  terminal-notifier-guard
   webmock (~> 1.5.0)

Guardfile

@@ -0,0 +1,31 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+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{^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" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+
+
+# Add files and commands to this file, like the example:
+#   watch(%r{file/path}) { `command(s)` }
+#
+guard 'shell' do
+  watch(/(.*).txt/) {|m| `tail #{m[0]}` }
+end

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]
@@ -34,6 +34,9 @@ def call(env)
 
     def proxy(env, source_request, matcher)
       uri = matcher.get_uri(source_request.fullpath,env)
+      if uri.nil?
+        return @app.call(env)
+      end
       options = @global_options.dup.merge(matcher.options)
 
       # Initialize request
@@ -97,9 +100,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,11 +16,12 @@ 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)
+      return nil if url.nil?
       _url=(url.respond_to?(:call) ? url.call(env) : url.clone)
       if _url =~/\$\d/
         match_path(path).to_a.each_with_index { |m, i| _url.gsub!("$#{i.to_s}", m) }
@@ -35,11 +36,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,49 @@ 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
+          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://users-example.com/users?user=omer').to_return({:body => "User App"})
+        get '/test', user: "mark"
+        last_response.body.should == "Dummy 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)