rails-threaded-proxy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a50696507952bcd8658bcecce9e784ed9f627a10c7add96e0942d0e7806e9a
-  data.tar.gz: 75767119d8493f4913b977e27e0d67dadfab57e6ed3cbade742d2ca5db9e4c49
+  metadata.gz: 67d445144a447e246d05ce8b70eeb0d7d12f209f842bc0c7253e47d1aa172aa6
+  data.tar.gz: 2fa990229d510d47e56f787f2a8901d0f837988d2d979a94fd6627ade95bf1b9
 SHA512:
-  metadata.gz: c04a9f03a0b19c139c9de59c00dfa7f49a5e6b3bdaafe1cb1db6f23b0d6ef623c60c30be5e5e08f68517915317f2764bc394bd82da36e65ef52c365641b1dc81
-  data.tar.gz: e6368a368ca91d818de566c6884b1840c95ff76665e18d5b8256a88b28c18048f22c52e1f771a8c5348bb9e4d02f9f91022e62c682d3cf7b4f5bd7601ec4891a
+  metadata.gz: eb263f91b43ecea9118da5a0c8612577c56dee6f395d027b66d0f6b80aa0ded6cf0a6a6b3ffc329c24aa0d2b383713ca8d02fafd20504134fedfb62671807814
+  data.tar.gz: cf2d19158dd8784f9f2a66a1ae82ae5529b9393e6108da7a11df9e1869bd3e8d2f9d4a56119ef207db3250ee121d7648e23f4b5e5dd3fa6a864dc28f216bb5d2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/threaded_proxy/client.rb

@@ -23,7 +23,7 @@ module ThreadedProxy
 
     def initialize(origin_url, options={})
       @origin_url = Addressable::URI.parse(origin_url)
-      @options = options.merge(DEFAULT_OPTIONS)
+      @options = DEFAULT_OPTIONS.merge(options)
     end
 
     def log(message)
@@ -32,12 +32,11 @@ module ThreadedProxy
 
     def start(socket)
       request_method = METHODS[(@options[:method] || 'GET').to_s.downcase]
-      http_request = request_method.new(@origin_url, (@options[:headers] || {}).merge('Connection' => 'close'))
-      if IO === @options[:body]
+      http_request = request_method.new(@origin_url, @options[:headers].merge('Connection' => 'close'))
+      if @options[:body].respond_to?(:read)
         http_request.body_stream = @options[:body]
       elsif String === @options[:body]
         http_request.body = @options[:body]
-        @options[:headers]['Content-Length'] = @options[:body].bytesize.to_s
       end
 
       http = HTTP.new(@origin_url.host, @origin_url.port || default_port(@origin_url))

data/lib/threaded_proxy/controller.rb

@@ -11,13 +11,18 @@ module ThreadedProxy
         if options[:body] == :rack
           options[:headers] ||= {}
           options[:body] = request.body_stream
+
           if request.env['HTTP_TRANSFER_ENCODING'] == 'chunked'
             options[:headers]['Transfer-Encoding'] = 'chunked'
           elsif request.env['CONTENT_LENGTH']
-            options[:headers]['Content-Length'] = request.env['CONTENT_LENGTH'].to_s
+            options[:headers]['content-length'] = request.env['CONTENT_LENGTH'].to_s
           else
             raise "Cannot proxy a non-chunked POST request without content-length"
           end
+
+          if request.env['CONTENT_TYPE']
+            options[:headers]['Content-Type'] = request.env['CONTENT_TYPE']
+          end
         end
 
         client = Client.new(origin_url, options)

data/rails-threaded-proxy.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rails-threaded-proxy 0.1.0 ruby lib
+# stub: rails-threaded-proxy 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rails-threaded-proxy".freeze
-  s.version = "0.1.0".freeze
+  s.version = "0.2.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-threaded-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Nutt