rack-raw-upload 1.0.10 → 1.0.11

data/README.md

@@ -12,7 +12,7 @@ Rack::RawUpload performs this conversion when all these conditions are met:
 2. The mimetype is one of
     * application/x-www-form-urlencoded
     * multipart/form-data
-3. The request includes body data
+3. The Content-Length is greater than 0
 
 ## Configuration
 

data/lib/rack/raw_upload.rb

@@ -3,7 +3,7 @@ require 'tmpdir' # Needed in 1.8.7 to access Dir::tmpdir
 module Rack
   class RawUpload
 
-    VERSION = '1.0.10'
+    VERSION = '1.0.11'
 
     def initialize(app, opts = {})
       @app = app
@@ -76,7 +76,7 @@ module Rack
       upload_path?(env['PATH_INFO']) &&
         %{POST PUT}.include?(env['REQUEST_METHOD']) &&
         content_type_of_raw_file?(env['CONTENT_TYPE']) &&
-        input_is_present?(env['rack.input'])
+        env['CONTENT_LENGTH'].to_i > 0
     end
 
     def literal_path_match?(request_path, candidate)
@@ -98,10 +98,6 @@ module Rack
       end
     end
 
-    def input_is_present?(input)
-      !input.nil? && (!input.respond_to?(:empty?) || !input.empty?)
-    end
-
     def random_string
       (0...8).map{65.+(rand(25)).chr}.join
     end

data/test/raw_upload_test.rb

@@ -26,7 +26,7 @@ class RawUploadTest < Test::Unit::TestCase
   def upload(env = {})
     env = {
       'CONTENT_TYPE' => 'application/octet-stream',
-      'rack.input' => @file
+      'rack.input' => @file,
     }.merge(env)
     do_request(env)
   end
@@ -34,15 +34,18 @@ class RawUploadTest < Test::Unit::TestCase
   def post(env = {})
     env = {
       'CONTENT_TYPE' => 'multipart/form-data',
-      'rack.input' => StringIO.new('things=stuff')
+      'rack.input' => StringIO.new('things=stuff'),
     }.merge(env)
     do_request(env)
   end
 
   def do_request(env = {})
+    input = env['rack.input']
+    length = input.respond_to?(:size) ? input.size : File.size(input.path)
     env = {
       'REQUEST_METHOD' => 'POST',
       'PATH_INFO' => '/some/path',
+      'CONTENT_LENGTH' => length.to_s,
     }.merge(env)
     request(env['PATH_INFO'], env)
   end
@@ -78,6 +81,11 @@ class RawUploadTest < Test::Unit::TestCase
       assert_successful_non_upload
     end
 
+    should "not work when there is no input" do
+      upload('rack.input' => StringIO.new(''))
+      assert_successful_non_upload
+    end
+
     # "stuff" should be something like "boundary=----WebKitFormBoundaryeKPeU4p65YgercgO",
     # but if I do that here, Rack tries to be clever and the test breaks
     should "not work with Content-Type 'multipart/form-data; stuff'" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-raw-upload
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Pablo Brasero