rack-proxy 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3d10314d397ff73d14421024f662ee818be5ce
-  data.tar.gz: ce5856ec13f3a36c7132fa24fbff7a56d2a9203c
+  metadata.gz: 3428e6ef27227f99c1dcf5d72a6a36ab5c1c3563
+  data.tar.gz: 29204ed05a07cf2372c3b7fd81d03647304372e0
 SHA512:
-  metadata.gz: 407afac47e2f903fb5c379b2281a771d5ef00620b2c4dbef55a6a6048dc8af839cd02b6f623b43a9234f07ed6988bf64586b65549fe477af364404721cc45590
-  data.tar.gz: 8845e00d5f435acd21bcf2702be29a2e49ed03723317bae6cdb16e2da77bfc0a5ea9ee7a9f92a51854898a83e67138e4a30250e0eea49e379956e31aad14f595
+  metadata.gz: d39750e97c1b8eab48ca445eb212d563838e22a40012daac9343f225bfebd882a2896282ea05df6c926343e8c9b5d274a7d2ec449de5cc4becc4c2440a6827fc
+  data.tar.gz: d2b51386bae91a75e07ead88fed9b21e8dade23032034da2cd9b420a6d5f5047b3fce3f8b49ff00a27ec19d391004261f46ed642bfd01334773561394bdb2368

data/Gemfile.lock

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

data/lib/rack/http_streaming_response.rb

@@ -10,9 +10,15 @@ module Rack
       @request, @host, @port = request, host, port
     end
 
-    def status
+    def body
+      self
+    end
+
+    def code
       response.code.to_i
     end
+    # #status is deprecated
+    alias_method :status, :code
 
     def headers
       h = Utils::HeaderHash.new
@@ -24,10 +30,6 @@ module Rack
       h
     end
 
-    def body
-      self
-    end
-
     # Can be called only once!
     def each(&block)
       response.read_body(&block)

data/lib/rack/proxy.rb

@@ -5,7 +5,7 @@ module Rack
 
   # Subclass and bring your own #rewrite_request and #rewrite_response
   class Proxy
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
 
     # @option opts [String, URI::HTTP] :backend Backend host to proxy requests to
     def initialize(opts={})
@@ -51,32 +51,21 @@ module Rack
         target_request.content_type   = source_request.content_type if source_request.content_type
       end
 
+      backend = @backend || source_request
 
-      # Create a streaming response (the actual network communication is deferred, a.k.a. streamed)
+      # Create the response
       if @streaming
-        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
-
-        triplet = [target_response.status, target_response.headers, target_response.body]
+        # streaming response (the actual network communication is deferred, a.k.a. streamed)
+        target_response = HttpStreamingResponse.new(target_request, backend.host, backend.port)
+        target_response.use_ssl = backend.scheme == "https"
       else
-        host = (@backend && @backend.host) || source_request.host
-        port = (@backend && @backend.port) || source_request.port
-        target_response = Net::HTTP.start(host, port) do |http|
+        target_response = Net::HTTP.start(backend.host, backend.port) do |http|
           http.request(target_request)
         end
-
-        headers = (target_response.respond_to?(:headers) && target_response.headers) || {}
-        triplet = [target_response.code, headers, target_response.body]
       end
 
-      triplet
+      headers = (target_response.respond_to?(:headers) && target_response.headers) || {}
+      [target_response.code, headers, target_response.body]
     end
 
     def extract_http_request_headers(env)

data/test/http_streaming_response_test.rb

@@ -10,6 +10,7 @@ class HttpStreamingResponseTest < Test::Unit::TestCase
 
   def test_streaming
     # Response status
+    assert @response.code == 200
     assert @response.status == 200
 
     # Headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-proxy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jacek Becela
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack