rack-proxy 0.3.7 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-proxy (0.3.7)
+    rack-proxy (0.4.0)
       rack
 
 GEM

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Jacek Becela jacek.becela@gmail.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/rack/http_streaming_response.rb

@@ -9,21 +9,21 @@ module Rack
     def initialize(request, host, port = nil)
       @request, @host, @port = request, host, port
     end
-    
+
     def status
       response.code.to_i
     end
-    
+
     def headers
       h = Utils::HeaderHash.new
-      
-      response.each_header do |k, v|
+
+      response.to_hash.each do |k, v|
         h[k] = v
       end
-      
+
       h
     end
-    
+
     def body
       self
     end
@@ -34,7 +34,7 @@ module Rack
     ensure
       session.end_request_hacked
     end
-    
+
     def to_s
       @body ||= begin
         lines = []
@@ -42,18 +42,18 @@ module Rack
         each do |line|
           lines << line
         end
-        
+
         lines.join
       end
     end
-    
+
     protected
-    
+
     # Net::HTTPResponse
     def response
       @response ||= session.begin_request_hacked(@request)
     end
-    
+
     # Net::HTTP
     def session
       @session ||= begin
@@ -62,7 +62,7 @@ module Rack
         http.start
       end
     end
-    
+
   end
 
 end

data/lib/rack/proxy.rb

@@ -5,8 +5,13 @@ module Rack
 
   # Subclass and bring your own #rewrite_request and #rewrite_response
   class Proxy
-    VERSION = "0.3.7"
-    
+    VERSION = "0.4.0"
+
+    # @option opts [String, URI::HTTP] :backend Backend host to proxy requests to
+    def initialize opts = {}
+      @backend = URI(opts[:backend]) if opts[:backend]
+    end
+
     def call(env)
       rewrite_response(perform_request(rewrite_env(env)))
     end
@@ -15,7 +20,7 @@ module Rack
     def rewrite_env(env)
       env
     end
-    
+
     # Return a rack triplet [status, headers, body]
     def rewrite_response(triplet)
       triplet
@@ -25,9 +30,15 @@ module Rack
 
     def perform_request(env)
       source_request = Rack::Request.new(env)
-      
+
       # Initialize request
-      target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(source_request.fullpath)
+      if source_request.fullpath == ""
+        full_path = URI.parse(env['REQUEST_URI']).request_uri
+      else
+        full_path = source_request.fullpath
+      end
+
+      target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(full_path)
 
       # Setup headers
       target_request.initialize_http_header(extract_http_request_headers(source_request.env))
@@ -35,18 +46,24 @@ module Rack
       # Setup body
       if target_request.request_body_permitted? && source_request.body
         target_request.body_stream    = source_request.body
-        target_request.content_length = source_request.content_length
+        target_request.content_length = source_request.content_length.to_i
         target_request.content_type   = source_request.content_type if source_request.content_type
       end
-      
+
       # Create a streaming response (the actual network communication is deferred, a.k.a. streamed)
-      target_response = HttpStreamingResponse.new(target_request, source_request.host, source_request.port)
+      if @backend
+        target_response = HttpStreamingResponse.new(target_request, @backend.host, @backend.port)
+
+        target_response.use_ssl = "https" == @backend.scheme
+      else
+        target_response = HttpStreamingResponse.new(target_request, source_request.host, source_request.port)
+
+        target_response.use_ssl = "https" == source_request.scheme
+      end
 
-      target_response.use_ssl = "https" == source_request.scheme
-      
       [target_response.status, target_response.headers, target_response.body]
     end
-    
+
     def extract_http_request_headers(env)
       headers = env.reject do |k, v|
         !(/^HTTP_[A-Z_]+$/ === k) || v.nil?

data/test/http_streaming_response_test.rb

@@ -2,45 +2,46 @@ require "test_helper"
 require "rack/http_streaming_response"
 
 class HttpStreamingResponseTest < Test::Unit::TestCase
-  
+
   def setup
     host, req = "trix.pl", Net::HTTP::Get.new("/")
     @response = Rack::HttpStreamingResponse.new(req, host)
   end
-  
+
   def test_streaming
     # Response status
     assert @response.status == 200
-    
+
     # Headers
     headers = @response.headers
-    
+
     assert headers.size > 0
-    assert headers["content-type"] == "text/html"
-    assert headers["CoNtEnT-TyPe"] == "text/html"
-    assert headers["content-length"].to_i > 0
-    
+
+    assert headers["content-type"] == ["text/html;charset=utf-8"]
+    assert headers["CoNtEnT-TyPe"] == headers["content-type"]
+    assert headers["content-length"].first.to_i > 0
+
     # Body
     chunks = []
     @response.body.each do |chunk|
       chunks << chunk
     end
-    
+
     assert chunks.size > 0
     chunks.each do |chunk|
       assert chunk.is_a?(String)
     end
-    
-    
+
+
   end
-  
+
   def test_to_s
-    assert_equal @response.headers["Content-Length"].to_i, @response.body.to_s.size
+    assert_equal @response.headers["Content-Length"].first.to_i, @response.body.to_s.size
   end
-  
+
   def test_to_s_called_twice
     body = @response.body
     assert_equal body.to_s, body.to_s
   end
-  
+
 end

data/test/rack_proxy_test.rb

@@ -42,4 +42,10 @@ class RackProxyTest < Test::Unit::TestCase
     assert !headers.key?('CONNECTION')
     assert !headers.key?('NOT-HTTP-HEADER')
   end
+
+  def test_handles_missing_content_length
+    assert_nothing_thrown do
+      post "/", nil, "CONTENT_LENGTH" => nil
+    end
+  end
 end

metadata

@@ -1,64 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-proxy
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 7
-  version: 0.3.7
 platform: ruby
-authors: 
+authors:
 - Jacek Becela
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-02 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !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: :runtime
-  name: rack
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack-test
-  version_requirements: *id002
-description: A Rack app that provides request/response rewriting proxy capabilities with streaming.
-email: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A Rack app that provides request/response rewriting proxy capabilities
+  with streaming.
+email:
 - jacek.becela@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Rakefile
 - Readme
 - lib/net_http_hacked.rb
@@ -70,41 +66,31 @@ files:
 - test/net_http_hacked_test.rb
 - test/rack_proxy_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/rack-proxy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: rack-proxy
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A request/response rewriting HTTP proxy. A Rack app.
-test_files: 
+test_files:
 - test/http_streaming_response_test.rb
 - test/net_http_hacked_test.rb
 - test/rack_proxy_test.rb