rack-reverse-proxy 0.3.0 → 0.4.0

data/README

@@ -0,0 +1,26 @@
+A Reverse Proxy for Rack
+
+This is a simple reverse proxy for Rack that pretty heavily rips off Rack Forwarder.  It is not meant for production systems (although it may work), as the webserver fronting your app is generally much better at this sort of thing.
+
+Matchers can be a regex or a string.  If a regex is used, you can use the subcaptures in your forwarding url by denoting them with a $.
+
+Right now if more than one matcher matches any given route, it throws an exception for an ambiguous match.  This will probably change later.  If no match is found, the call is forwarded to your application.
+
+Below is an example for configuring the middleware:
+
+require 'lib/rack/reverse_proxy'
+
+use Rack::ReverseProxy do 
+  # Forward the path /test* to http://example.com/test*
+  reverse_proxy '/test', 'http://example.com/'
+
+  # Forward the path /foo/* to http://example.com/bar/*
+  reverse_proxy /^\/foo(\/.*)$/, 'http://example.com/bar$1'
+end
+
+app = proc do |env|
+  [ 200, {'Content-Type' => 'text/plain'}, "b" ]
+end
+run app
+
+

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Jon Swope"]
     gem.add_development_dependency "rspec", ">= 0"
     gem.add_development_dependency "rack-test", ">= 0"
-    gem.add_development_dependency "webmock", ">= 0"
+    gem.add_development_dependency "webmock", "~> 1.5.0"
     gem.add_dependency "rack", ">= 1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rack/reverse_proxy.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 
 module Rack
   class ReverseProxy
@@ -20,8 +21,12 @@ module Rack
           headers[$1] = value
         end
       }
+			headers['HOST'] = uri.host
  
-      Net::HTTP.start(uri.host, uri.port) { |http|
+			session = Net::HTTP.new(uri.host, uri.port)
+			session.use_ssl = (uri.scheme == 'https')
+			session.verify_mode = OpenSSL::SSL::VERIFY_NONE
+			session.start { |http|
         m = rackreq.request_method
         case m
         when "GET", "HEAD", "DELETE", "OPTIONS", "TRACE"
@@ -40,7 +45,8 @@ module Rack
             body << segment
           end
         end
-        [res.code, Rack::Utils::HeaderHash.new(res.to_hash), [body]]
+
+        [res.code, create_response_headers(res), [body]]
       }
     end
     
@@ -60,6 +66,14 @@ module Rack
       end
     end
 
+    def create_response_headers http_response
+      response_headers = Rack::Utils::HeaderHash.new(http_response.to_hash)
+      # handled by Rack
+      response_headers.delete('status')
+      # TODO: Verify Content Length, and required Rack headers
+      response_headers
+    end
+
     def match_path(path, matcher)
       if matcher.is_a?(Regexp)
         path.match(matcher)

data/rack-reverse-proxy.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-reverse-proxy}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Swope"]
-  s.date = %q{2010-04-20}
+  s.date = %q{2010-11-07}
   s.description = %q{A Rack based reverse proxy for basic needs.  Useful for testing or in cases where webserver configuration is unavailable.}
   s.email = %q{jaswope@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
+     "README",
      "README.rdoc"
   ]
   s.files = [
@@ -32,32 +33,32 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jaswope/rack-reverse-proxy}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Simple Reverse Proxy for Rack}
   s.test_files = [
-    "spec/rack/reverse_proxy_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/rack/reverse_proxy_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.5.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<webmock>, ["~> 1.5.0"])
       s.add_dependency(%q<rack>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<webmock>, ["~> 1.5.0"])
     s.add_dependency(%q<rack>, [">= 1.0.0"])
   end
 end

data/spec/rack/reverse_proxy_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Rack::ReverseProxy do
   include Rack::Test::Methods
-  include WebMock
+  include WebMock::API
 
   def app
     Rack::ReverseProxy.new
@@ -31,6 +31,18 @@ describe Rack::ReverseProxy do
       last_response.body.should == "Proxied App"
     end
 
+		it "the response header should never contain Status" do
+			stub_request(:any, 'example.com/test/stuff').to_return(:headers => {'Status' => '200 OK'})
+			get '/test/stuff'
+			last_response.headers['Status'].should == nil
+		end
+
+		it "should set the Host header" do
+			stub_request(:any, 'example.com/test/stuff')
+			get '/test/stuff'
+			a_request(:get, 'http://example.com/test/stuff').with(:headers => {"Host" => "example.com"}).should have_been_made
+		end
+
     describe "with ambiguous routes" do
       def app
         Rack::ReverseProxy.new(dummy_app) do
@@ -58,6 +70,21 @@ describe Rack::ReverseProxy do
       end
     end
 
+		describe "with a https route" do
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy '/test', 'https://example.com'
+        end
+      end
+
+			it "should make a secure request" do
+        stub_request(:get, 'https://example.com/test/stuff').to_return({:body => "Proxied Secure App"})
+        get '/test/stuff'
+        last_response.body.should == "Proxied Secure App"
+			end
+
+		end
+
     describe "with a route as a string" do
       def app
         Rack::ReverseProxy.new(dummy_app) do
@@ -103,11 +130,9 @@ describe Rack::ReverseProxy do
 
           if %w|put post|.include?(method)
             it "should forward the request payload" do
-              pending "valid test with next release of WebMock" do
-                stub_request(method.to_sym, 'http://example.com/test').to_return { |req| {:body => req.body} }
-                eval "#{method} '/test', {:test => 'test'}"
-                last_response.body.should == "test=test"
-              end
+              stub_request(method.to_sym, 'http://example.com/test').to_return { |req| {:body => req.body} }
+              eval "#{method} '/test', {:test => 'test'}"
+              last_response.body.should == "test=test"
             end
           end
         end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'spec/autorun'
 require 'rubygems'
 require 'rack/test'
 require 'webmock'
+require 'webmock/rspec'
 
 Spec::Runner.configure do |config|
   WebMock.disable_net_connect!

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-reverse-proxy
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jon Swope
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-11-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,21 +50,27 @@ dependencies:
   name: webmock
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
+        - 1
+        - 5
         - 0
-        version: "0"
+        version: 1.5.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -75,6 +86,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
+- README
 - README.rdoc
 files: 
 - .document
@@ -88,6 +100,7 @@ files:
 - spec/rack/reverse_proxy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- README
 has_rdoc: true
 homepage: http://github.com/jaswope/rack-reverse-proxy
 licenses: []
@@ -98,26 +111,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Simple Reverse Proxy for Rack
 test_files: 
-- spec/rack/reverse_proxy_spec.rb
 - spec/spec_helper.rb
+- spec/rack/reverse_proxy_spec.rb