rack-raw-upload 1.0.7 → 1.0.8

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.7'
+    VERSION = '1.0.8'
 
     def initialize(app, opts = {})
       @app = app
@@ -33,7 +33,7 @@ module Rack
         env['rack.input'].extend(EqlFix)
         tempfile = env['rack.input']
       else
-        tempfile = create_tempfile
+        tempfile = Tempfile.new('raw-upload.', @tmpdir)
         tempfile << env['rack.input'].read
         tempfile.flush
         tempfile.rewind
@@ -78,7 +78,7 @@ module Rack
       regexp = '^' + candidate.gsub('.', '\.').gsub('*', '[^/]*') + '$'
       !! (Regexp.new(regexp) =~ request_path)
     end
-    
+
     def content_type_of_raw_file?(content_type)
       case content_type
       when %r{^application/x-www-form-urlencoded}, %r{^multipart/form-data}
@@ -88,29 +88,6 @@ 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)
-      ret = ::File.open(new_name, "r+")
-      ret.binmode
-      ret
-    rescue SystemCallError
-      # The randomly chosen file name was taken. Try again.
-      retry
-    end
-
     def random_string
       (0...8).map{65.+(rand(25)).chr}.join
     end

data/test/raw_upload_test.rb

@@ -98,11 +98,29 @@ class RawUploadTest < Test::Unit::TestCase
       assert_successful_non_upload
     end
 
-    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)
+    context "when garbage collection runs (Ruby 1.9)" do
+      context "and the file is received as a Tempfile" do
+        should "ensure that the uploaded file remains" do
+          tempfile = Tempfile.new('rack-raw-upload-test-')
+          tempfile << @file.read
+          tempfile.rewind
+          upload('rack.input' => tempfile)
+          received = last_request.POST["file"]
+          GC.start
+          assert File.exists?(received[:tempfile].path)
+          assert_file_uploaded
+        end
+      end
+
+      context "and the file is NOT received as a TmpFile" do
+        should "ensure that the uploaded file remains" do
+          upload
+          received = last_request.POST["file"]
+          GC.start
+          assert File.exists?(received[:tempfile].path)
+          assert_file_uploaded
+        end
+      end
     end
 
     context "with X-File-Upload: smart" do

metadata

@@ -1,88 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-raw-upload
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.0.8
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153512340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153512340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153511880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153511880
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2153511460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153511460
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2153511000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  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.
+  prerelease: false
+  version_requirements: *2153511000
+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
@@ -92,38 +74,29 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Rack Raw Upload middleware
 test_files: []
-