rack-proxy 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cfbad861512cde3b7cfc42fb55dbdc5732ac54
-  data.tar.gz: 41f8241e9bfea2cfec20820318c674ce2d5701bc
+  metadata.gz: 62bc77dceccd17a3c51368465f5e4559b1e2c10f
+  data.tar.gz: fa070a3fe2a3e8ba95372e5643601fcbcd2fa71d
 SHA512:
-  metadata.gz: 8132a893c3345caf4d4a4e0b4d57bf978606c6e462e45848cc4199f20485d6e5735cd7d32f564038332ad5608b91b8ed602680eda690d9bf8602cdf3d71033f7
-  data.tar.gz: 54496b618268e23ca229a7e8ce8a1a916991c4e2037c86bc47579faa9111adab18cf697e45db6cfbee5de35f2b25cb4e7ebf36857d7ff2361087d78c2fd045b9
+  metadata.gz: d4a4b8488144c9d46447112e97cef94113eb8487da3550d496d85fec159cd15ced276d210b07d64b88e4d3b3f4ab52b85c659a9d1d234ea666d9a9f4f360fa02
+  data.tar.gz: 7b1dc10788f6b5eb53f02612bed7066d971a7f12c2ec31215c3bec7f9d95de07c479841f756b8c56f6f509fc8a78891545deba4c7f44c7bba0a8c48a97812bd2

data/Gemfile.lock

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

data/lib/rack/proxy.rb

@@ -5,7 +5,31 @@ module Rack
 
   # Subclass and bring your own #rewrite_request and #rewrite_response
   class Proxy
-    VERSION = "0.5.9"
+    VERSION = "0.5.10"
+
+    class << self
+      def extract_http_request_headers(env)
+        headers = env.reject do |k, v|
+          !(/^HTTP_[A-Z_]+$/ === k) || v.nil?
+        end.map do |k, v|
+          [reconstruct_header_name(k), v]
+        end.inject(Utils::HeaderHash.new) do |hash, k_v|
+          k, v = k_v
+          hash[k] = v
+          hash
+        end
+
+        x_forwarded_for = (headers["X-Forwarded-For"].to_s.split(/, +/) << env["REMOTE_ADDR"]).join(", ")
+
+        headers.merge!("X-Forwarded-For" =>  x_forwarded_for)
+      end
+
+      protected
+
+      def reconstruct_header_name(name)
+        name.sub(/^HTTP_/, "").gsub("_", "-")
+      end
+    end
 
     # @option opts [String, URI::HTTP] :backend Backend host to proxy requests to
     def initialize(opts={})
@@ -43,7 +67,7 @@ module Rack
       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))
+      target_request.initialize_http_header(self.class.extract_http_request_headers(source_request.env))
 
       # Setup body
       if target_request.request_body_permitted? && source_request.body
@@ -80,26 +104,6 @@ module Rack
       [target_response.code, headers, body]
     end
 
-    def extract_http_request_headers(env)
-      headers = env.reject do |k, v|
-        !(/^HTTP_[A-Z_]+$/ === k) || v.nil?
-      end.map do |k, v|
-        [reconstruct_header_name(k), v]
-      end.inject(Utils::HeaderHash.new) do |hash, k_v|
-        k, v = k_v
-        hash[k] = v
-        hash
-      end
-
-      x_forwarded_for = (headers["X-Forwarded-For"].to_s.split(/, +/) << env["REMOTE_ADDR"]).join(", ")
-
-      headers.merge!("X-Forwarded-For" =>  x_forwarded_for)
-    end
-
-    def reconstruct_header_name(name)
-      name.sub(/^HTTP_/, "").gsub("_", "-")
-    end
-
   end
 
 end

data/test/rack_proxy_test.rb

@@ -50,24 +50,24 @@ class RackProxyTest < Test::Unit::TestCase
   end
 
   def test_header_reconstruction
-    proxy = Rack::Proxy.new
+    proxy_class = Rack::Proxy
 
-    header = proxy.send(:reconstruct_header_name, "HTTP_ABC")
+    header = proxy_class.send(:reconstruct_header_name, "HTTP_ABC")
     assert header == "ABC"
 
-    header = proxy.send(:reconstruct_header_name, "HTTP_ABC_D")
+    header = proxy_class.send(:reconstruct_header_name, "HTTP_ABC_D")
     assert header == "ABC-D"
   end
 
   def test_extract_http_request_headers
-    proxy = Rack::Proxy.new
+    proxy_class = Rack::Proxy
     env = {
       'NOT-HTTP-HEADER' => 'test-value',
       'HTTP_ACCEPT' => 'text/html',
       'HTTP_CONNECTION' => nil
     }
 
-    headers = proxy.send(:extract_http_request_headers, env)
+    headers = proxy_class.extract_http_request_headers(env)
     assert headers.key?('ACCEPT')
     assert !headers.key?('CONNECTION')
     assert !headers.key?('NOT-HTTP-HEADER')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-proxy
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Jacek Becela
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack