rack-raw-upload 1.0.6 → 1.0.7

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.6'
+    VERSION = '1.0.7'
 
     def initialize(app, opts = {})
       @app = app
@@ -29,19 +29,15 @@ module Rack
     private
 
     def convert_and_pass_on(env)
-      tempfile = Tempfile.new('raw-upload.', @tmpdir)
-      if (RUBY_VERSION.split('.').map{|e| e.to_i} <=> [1, 9]) > 0
-        # 1.8.7: if the 'original' tempfile has no open file-handler,
-        # the garbage collector will unlink this file.
-        # in this case, only the path to the 'original' tempfile is used
-        # and the physical file will be deleted, if the gc runs.
-        tempfile2 = relink_file(tempfile)
-        tempfile.close
-        tempfile = tempfile2
+      if env['rack.input'].kind_of?(Tempfile)
+        env['rack.input'].extend(EqlFix)
+        tempfile = env['rack.input']
+      else
+        tempfile = create_tempfile
+        tempfile << env['rack.input'].read
+        tempfile.flush
+        tempfile.rewind
       end
-      tempfile << env['rack.input'].read
-      tempfile.flush
-      tempfile.rewind
       fake_file = {
         :filename => env['HTTP_X_FILE_NAME'],
         :type => env['CONTENT_TYPE'],
@@ -92,6 +88,18 @@ module Rack
       end
     end
 
+    def create_tempfile
+      tempfile = Tempfile.new('raw-upload.', @tmpdir)
+
+      # If the GC runs, it may unlink the tempfile.
+      # To avoid this, I create another version of it
+      # (a hard link to the same file). If the original
+      # is unlinked, we'll still have this other link.
+      ret = relink_file(tempfile)
+      tempfile.close
+      ret
+    end
+
     def relink_file(file)
       new_name = file.path + random_string
       ::File.link(file.path, new_name)
@@ -107,4 +115,15 @@ module Rack
       (0...8).map{65.+(rand(25)).chr}.join
     end
   end
+
+
+  module EqlFix
+    def eql_with_fix?(o)
+      self.object_id.eql?(o.object_id) || self.eql_without_fix?(o)
+    end
+
+    alias_method :eql_without_fix?, :eql?
+    alias_method :eql?, :eql_with_fix?
+  end
+
 end

data/test/raw_upload_test.rb

@@ -54,7 +54,7 @@ class RawUploadTest < Test::Unit::TestCase
     end
 
     should "work with Content-Type 'application/octet-stream'" do
-      upload('CONTENT_TYPE' => 'application/octet-stream')
+      upload
       assert_file_uploaded_as 'application/octet-stream'
     end
 
@@ -69,7 +69,7 @@ class RawUploadTest < Test::Unit::TestCase
     end
 
     should "not work with Content-Type 'multipart/form-data'" do
-      post('CONTENT_TYPE' => 'multipart/form-data')
+      post
       assert_successful_non_upload
     end
 
@@ -79,6 +79,14 @@ class RawUploadTest < Test::Unit::TestCase
       post('CONTENT_TYPE' => 'multipart/form-data; stuff')
       assert_successful_non_upload
     end
+
+    should "work when the input is a Tempfile" do
+      tempfile = Tempfile.new('rack-raw-upload-test-')
+      tempfile << @file.read
+      tempfile.rewind
+      upload('rack.input' => tempfile)
+      assert_file_uploaded
+    end
     
     should "be forced to perform a file upload if `X-File-Upload: true`" do
       upload('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'true')
@@ -90,8 +98,8 @@ class RawUploadTest < Test::Unit::TestCase
       assert_successful_non_upload
     end
 
-    should "be compatible to rails 1.8.7 and tempfile must exist after garbage collection" do
-      upload('CONTENT_TYPE' => 'application/octet-stream')
+    should "ensure the uploaded file exists after garbage collection (Ruby 1.9)" do
+      upload
       received = last_request.POST["file"]
       GC.start
       assert File.exists?(received[:tempfile].path)
@@ -99,7 +107,7 @@ class RawUploadTest < Test::Unit::TestCase
 
     context "with X-File-Upload: smart" do
       should "perform a file upload if appropriate" do
-        post('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
+        post('HTTP_X_FILE_UPLOAD' => 'smart')
         assert_successful_non_upload
       end
 
@@ -130,7 +138,7 @@ class RawUploadTest < Test::Unit::TestCase
       end
 
       should "stay put when `X-File-Upload: smart` and the request is not an upload" do
-        post('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
+        post('HTTP_X_FILE_UPLOAD' => 'smart')
         assert_successful_non_upload
       end
     end
@@ -206,7 +214,7 @@ class RawUploadTest < Test::Unit::TestCase
 
   def assert_file_uploaded
     file = File.open(@path)
-    received = last_request.POST["file"]
+    assert received = last_request.POST["file"], "No file received"
     assert_files_equal file, received[:tempfile]
     assert last_response.ok?
   end
@@ -225,8 +233,8 @@ class RawUploadTest < Test::Unit::TestCase
   end
 
   def assert_files_equal(f1, f2)
-    f1.seek(0)
-    f2.seek(0)
-    assert_equal Digest::MD5.hexdigest(f1.read), Digest::MD5.hexdigest(f2.read)
+    expected = Digest::MD5.hexdigest(IO.read(f1.path))
+    actual   = Digest::MD5.hexdigest(IO.read(f2.path))
+    assert_equal expected, actual
   end
 end

metadata

@@ -1,70 +1,88 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-raw-upload
-version: !ruby/object:Gem::Version
-  version: 1.0.6
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
-authors:
+authors: 
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-30 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2157245860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2157245860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2157245420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157245420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &2157245000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157245000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2157271180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157271180
-description: Middleware that converts files uploaded with mimetype application/octet-stream
-  into normal form input, so Rack applications can read these as normal, rather than
-  as raw input.
+  version_requirements: *id004
+description: Middleware that converts files uploaded with mimetype application/octet-stream into normal form input, so Rack applications can read these as normal, rather than as raw input.
 email: pablobm@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - lib/rack/raw_upload.rb
 - lib/rack-raw-upload.rb
 - test/raw_upload_test.rb
@@ -74,29 +92,38 @@ files:
 - Gemfile.lock
 homepage: https://github.com/newbamboo/rack-raw-upload
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
 - --main
 - README.rdoc
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Rack Raw Upload middleware
 test_files: []
+