rack-raw-upload 1.0.5 → 1.0.6

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     json (1.4.6)
+    json (1.4.6-java)
     rack (1.2.1)
     rack-test (0.5.6)
       rack (>= 1.0)
@@ -9,6 +10,7 @@ GEM
     shoulda (2.11.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -13,7 +13,7 @@ Additionally, it can be told explicitly to perform the conversion, using the hea
 
 Rack::RawUpload expects that requests will:
 
-1. be POST requests
+1. be POST or PUT requests
 2. set the mimetype `application/octet-stream`
 
 

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.5'
+    VERSION = '1.0.6'
 
     def initialize(app, opts = {})
       @app = app
@@ -35,7 +35,9 @@ module Rack
         # 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.
-        tempfile = open(tempfile.path, "r+:BINARY")
+        tempfile2 = relink_file(tempfile)
+        tempfile.close
+        tempfile = tempfile2
       end
       tempfile << env['rack.input'].read
       tempfile.flush
@@ -89,5 +91,20 @@ module Rack
         true
       end
     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
   end
 end

data/test/raw_upload_test.rb

@@ -3,6 +3,7 @@ require 'rack/test'
 require 'shoulda'
 require 'rack-raw-upload'
 require 'json'
+require 'digest'
 
 class RawUploadTest < Test::Unit::TestCase
   include Rack::Test::Methods
@@ -17,17 +18,31 @@ class RawUploadTest < Test::Unit::TestCase
 
   def setup
     @middleware_opts = {}
-    @path = __FILE__
+    @path = File.join(File.dirname(__FILE__), %w{data me-in-shanghai.jpg})
     @filename = File.basename(@path)
     @file = File.open(@path)
   end
 
   def upload(env = {})
     env = {
-      'REQUEST_METHOD' => 'POST',
       'CONTENT_TYPE' => 'application/octet-stream',
+      'rack.input' => @file
+    }.merge(env)
+    do_request(env)
+  end
+
+  def post(env = {})
+    env = {
+      'CONTENT_TYPE' => 'multipart/form-data',
+      'rack.input' => StringIO.new('things=stuff')
+    }.merge(env)
+    do_request(env)
+  end
+
+  def do_request(env = {})
+    env = {
+      'REQUEST_METHOD' => 'POST',
       'PATH_INFO' => '/some/path',
-      'rack.input' => @file,
     }.merge(env)
     request(env['PATH_INFO'], env)
   end
@@ -49,19 +64,19 @@ class RawUploadTest < Test::Unit::TestCase
     end
 
     should "not work with Content-Type 'application/x-www-form-urlencoded'" do
-      upload('CONTENT_TYPE' => 'application/x-www-form-urlencoded')
+      post('CONTENT_TYPE' => 'application/x-www-form-urlencoded')
       assert_successful_non_upload
     end
 
     should "not work with Content-Type 'multipart/form-data'" do
-      upload('CONTENT_TYPE' => 'multipart/form-data')
+      post('CONTENT_TYPE' => 'multipart/form-data')
       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
-      upload('CONTENT_TYPE' => 'multipart/form-data; stuff')
+      post('CONTENT_TYPE' => 'multipart/form-data; stuff')
       assert_successful_non_upload
     end
     
@@ -84,7 +99,7 @@ class RawUploadTest < Test::Unit::TestCase
 
     context "with X-File-Upload: smart" do
       should "perform a file upload if appropriate" do
-        upload('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
+        post('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
         assert_successful_non_upload
       end
 
@@ -115,7 +130,7 @@ class RawUploadTest < Test::Unit::TestCase
       end
 
       should "stay put when `X-File-Upload: smart` and the request is not an upload" do
-        upload('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
+        post('CONTENT_TYPE' => 'multipart/form-data', 'HTTP_X_FILE_UPLOAD' => 'smart')
         assert_successful_non_upload
       end
     end
@@ -192,14 +207,14 @@ class RawUploadTest < Test::Unit::TestCase
   def assert_file_uploaded
     file = File.open(@path)
     received = last_request.POST["file"]
-    assert_equal file.gets, received[:tempfile].gets
+    assert_files_equal file, received[:tempfile]
     assert last_response.ok?
   end
   
   def assert_file_uploaded_as(file_type)
     file = File.open(@path)
     received = last_request.POST["file"]
-    assert_equal file.gets, received[:tempfile].gets
+    assert_files_equal file, received[:tempfile]
     assert_equal file_type, received[:type]
     assert last_response.ok?
   end
@@ -208,4 +223,10 @@ class RawUploadTest < Test::Unit::TestCase
     assert ! last_request.POST.has_key?('file')
     assert last_response.ok?
   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)
+  end
 end

metadata

@@ -1,89 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-raw-upload
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.0.6
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
 platform: ruby
-authors: 
+authors:
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157245860 !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: *2157245860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2157245420 !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: *2157245420
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2157245000 !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: *2157245000
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2157271180 !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: *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.
 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
@@ -91,41 +72,31 @@ files:
 - README.md
 - Gemfile
 - Gemfile.lock
-has_rdoc: true
 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.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Rack Raw Upload middleware
 test_files: []
-