rack-reverse-proxy 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/rack/reverse_proxy.rb

@@ -6,6 +6,7 @@ module Rack
     def initialize(app = nil, &b)
       @app = app || lambda { [404, [], []] }
       @paths = {}
+      @opts = {:preserve_host => false}
       instance_eval &b if block_given?
     end
 
@@ -21,7 +22,7 @@ module Rack
           headers[$1] = value
         end
       }
-			headers['HOST'] = uri.host
+			headers['HOST'] = uri.host if @opts[:preserve_host]
  
 			session = Net::HTTP.new(uri.host, uri.port)
 			session.use_ssl = (uri.scheme == 'https')
@@ -31,8 +32,10 @@ module Rack
         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]
         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.content_length = rackreq.body.length
           req.body_stream = rackreq.body
         else
@@ -70,6 +73,8 @@ module Rack
       response_headers = Rack::Utils::HeaderHash.new(http_response.to_hash)
       # handled by Rack
       response_headers.delete('status')
+      # TODO: figure out how to handle chunked responses
+      response_headers.delete('transfer-encoding')
       # TODO: Verify Content Length, and required Rack headers
       response_headers
     end
@@ -91,9 +96,10 @@ module Rack
       end
     end
 
-    def reverse_proxy matcher, url
+    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)
     end
   end
 

data/rack-reverse-proxy.gemspec

@@ -1,43 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-reverse-proxy}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Swope"]
-  s.date = %q{2010-11-07}
+  s.date = %q{2011-04-04}
   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"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack/reverse_proxy.rb",
-     "rack-reverse-proxy.gemspec",
-     "spec/rack/reverse_proxy_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rack/reverse_proxy.rb",
+    "rack-reverse-proxy.gemspec",
+    "spec/rack/reverse_proxy_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   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.7}
   s.summary = %q{A Simple Reverse Proxy for Rack}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/rack/reverse_proxy_spec.rb"
+    "spec/rack/reverse_proxy_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/rack/reverse_proxy_spec.rb

@@ -15,7 +15,7 @@ describe Rack::ReverseProxy do
   describe "as middleware" do
     def app
       Rack::ReverseProxy.new(dummy_app) do
-        reverse_proxy '/test', 'http://example.com/'
+        reverse_proxy '/test', 'http://example.com/', {:preserve_host => true}
       end
     end
 
@@ -37,12 +37,46 @@ describe Rack::ReverseProxy do
 			last_response.headers['Status'].should == nil
 		end
 
+		it "the response header should never transfer-encoding" do
+			stub_request(:any, 'example.com/test/stuff').to_return(:headers => {'transfer-encoding' => 'Chunked'})
+			get '/test/stuff'
+			last_response.headers['transfer-encoding'].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 preserve host turned off" do
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy '/test', 'http://example.com/'
+        end
+      end
+
+      it "should not set the Host header" do
+        stub_request(:any, 'example.com/test/stuff')
+        get '/test/stuff'
+        a_request(:get, 'http://example.com/test/stuff').should have_been_made
+      end
+    end
+
+    describe "with basic auth turned on" do
+      def app
+        Rack::ReverseProxy.new(dummy_app) do
+          reverse_proxy '/test', 'http://example.com/', {:username => "joe", :password => "shmoe"}
+        end
+      end
+
+      it "should make request with basic auth" do
+        stub_request(:get, "http://joe:shmoe@example.com/test/stuff").to_return(:body => "secured content")
+        get '/test/stuff'
+        last_response.body.should == "secured content"
+      end
+    end
+
     describe "with ambiguous routes" do
       def app
         Rack::ReverseProxy.new(dummy_app) do

metadata

@@ -1,96 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-reverse-proxy
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jon Swope
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-07 00:00:00 -04:00
+date: 2011-04-04 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20805780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *20805780
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &20805260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *20805260
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &20804660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *20804660
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &20804080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id004
-description: A Rack based reverse proxy for basic needs.  Useful for testing or in cases where webserver configuration is unavailable.
+  prerelease: false
+  version_requirements: *20804080
+description: A Rack based reverse proxy for basic needs.  Useful for testing or in
+  cases where webserver configuration is unavailable.
 email: jaswope@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -100,41 +75,31 @@ 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: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A Simple Reverse Proxy for Rack
-test_files: 
-- spec/spec_helper.rb
+test_files:
 - spec/rack/reverse_proxy_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/README

@@ -1,26 +0,0 @@
-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
-
-