mutle-rack-uploads 0.0.0 → 0.1.0

data/README.rdoc

@@ -1,11 +1,14 @@
 = rack-uploads
 
 rack-uploads is a middleware which receives uploads and stores them in
-env['rack.uploads'] for easy access.
+in the Rack env for easy access.
 
 It works with normal HTTP file uploads, as well as with the Nginx Upload
 Module.
 
+All multipart params get replaced by a Rack::Uploads::UploadedFile, while
+still retaining access to the original parameter value.
+
 == Dependencies
 
 Development dependencies:
@@ -15,8 +18,9 @@ Development dependencies:
 
 == Usage
 
-  # Sinatra
-  use Rack::Uploads, :path => "/uploads"
+=== Sinatra
+
+  use Rack::Uploads
 
   post "/uploads" do
     env['rack.uploads'].each do |upload|
@@ -24,11 +28,10 @@ Development dependencies:
     end
   end
 
-
-  #Rails
+=== Rails
 
   # config/environment.rb
-  config.middleware.use "Rack::Uploads", :path => "/uploads"
+  config.middleware.use "Rack::Uploads"
 
   # app/controller/uploads_controller.rb
   class UploadsController < ApplicationController
@@ -44,14 +47,13 @@ Development dependencies:
 There are a few options you can pass to rack-uploads during
 initializiation:
 
-:path => "/files" - This will check for file uploads only on POST requests
-to /files.
+<tt>:session_authorized => lambda { |req| req.params['secret'] == "sekrit"
+}</tt> -
+Only allow uploads with the parameter "secret" set to "sekrit"
 
-:file_params => ["file", "Filedata"] - Sets which parameters to check for uploads. Default is
-"file" and "Filedata" (used by Flash uploaders)
+<tt>:nginx => [{ :tmp_path => "_tmp_path", :filename => "_file_name" }]</tt> - 
+Sets the suffixes of the nginx upload parameters
 
-:session_authorized => lambda { |req| req.params['secret'] == "sekrit" } -
-Only allow uploads with the parameter "secret" set to "sekrit"
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/lib/rack/uploads/middleware.rb

@@ -3,21 +3,19 @@ module Rack
 
     def initialize(app, options={})
       @app = app
-      @path = options[:path] || '/uploads'
-      @file_params = options[:file_params] || ["file", "Filedata"]
       @session_authorized = options[:session_authorized] || true
+      @nginx = options[:nginx] || [{ :tmp_path => "_tmp_path", :filename => "_file_name" }]
     end
 
     def call(env)
       req = Rack::Request.new(env)
-      if req.path_info == @path && req.post?
+      if req.post? && req.form_data?
         return not_authorized unless @session_authorized == true || (@session_authorized.respond_to?(:call) && @session_authorized.call(req) == true)
         uploads = []
-        @file_params.each do |file_key|
-          if file = req.params[file_key]
-            uploads << UploadedFile.new(file_key, file)
-          elsif req.params["#{file_key}_name"] && req.params["#{file_key}_path"]
-            uploads << UploadedNginxFile.new(file_key, {:filename => req.params["#{file_key}_name"], :temp_path => req.params["#{file_key}_path"] })
+        req.params.each do |key,param|
+          if param_file = file(req, key)
+            uploads << param_file
+            req.params[key] = param_file
           end
         end
         env['rack.uploads'] = uploads if uploads.size > 0
@@ -29,6 +27,23 @@ module Rack
       resp
     end
 
+    def multipart?(req)
+      req.media_type == "multipart/form-data"
+    end
+
+    def file(req, key)
+      param = req.params[key]
+      return UploadedFile.new(key, param) if param.instance_of?(Hash) && param[:tempfile]
+      @nginx.each do |nginx|
+        if key =~ %r{^(.+)#{nginx[:tmp_path]}$}
+          tmp_path = param
+          filename = req.params["#{$1}#{nginx[:filename]}"]
+          return UploadedNginxFile.new($1, {:filename => filename, :temp_path => tmp_path}) if ::File.exist?(tmp_path) && filename
+        end
+      end
+      nil
+    end
+
     def invalid_request
       [400, {}, 'Invalid Request']
     end

data/lib/rack/uploads/uploaded_file.rb

@@ -15,6 +15,11 @@ module Rack
 
       def mv(destination)
         FileUtils.mv(temp_path, destination)
+        @cleanup_needed = false
+      end
+
+      def cp(destination)
+        FileUtils.cp(temp_path, destination)
       end
 
       def rm
@@ -25,6 +30,10 @@ module Rack
         ::File.size(temp_path)
       end
 
+      def [](key)
+        @file[key]
+      end
+
       def method_missing(meth, *args)
         return @file[meth.to_sym] if @file[meth.to_sym]
         super(meth, *args)

data/rack-uploads.gemspec

@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rack-uploads}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mutwin Kraus"]
+  s.date = %q{2009-06-13}
+  s.email = %q{mutle@blogage.de}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "init.rb",
+     "lib/rack/uploads.rb",
+     "lib/rack/uploads/middleware.rb",
+     "lib/rack/uploads/uploaded_file.rb",
+     "rack-uploads.gemspec",
+     "spec/fixtures/files/test_data.txt",
+     "spec/middleware_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/uploaded_file_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/mutle/rack-uploads}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Rack Upload handler with Nginx Upload Module support}
+  s.test_files = [
+    "spec/middleware_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/uploaded_file_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/spec/middleware_spec.rb

@@ -12,7 +12,7 @@ describe Rack::Uploads do
     lambda { |env| 
       req = Rack::Request.new(env)
       if req.path_info == "/uploads" && req.post? && env['rack.uploads']
-        [200, {}, "Received Files"]
+        [200, {}, "Received #{env['rack.uploads'].size} Files"]
       else
         [200, {}, "Hello, World!"]
       end
@@ -30,24 +30,23 @@ describe Rack::Uploads do
       @backend ||= Rack::Uploads.new(hello_world)
     end
 
-    it "should receive and store a file upload" do
-      post '/uploads', {:file => multipart_fixture("test_data.txt")}
+    it "should receive a file upload" do
+      post '/uploads', {:file => multipart_fixture("test_data.txt"), "foo[bar]" => multipart_fixture("test_data.txt")}
       last_response.status.should == 200
-      last_response.body.should == "Received Files"
-      File.exist?("/tmp/blogage_upload").should be_true
+      last_response.body.should == "Received 2 Files"
     end
 
-    it "should receive and store a flash upload" do
+    it "should receive a flash upload" do
       post '/uploads', {'Filedata' => multipart_fixture("test_data.txt")}
       last_response.status.should == 200
-      last_response.body.should == "Received Files"
+      last_response.body.should == "Received 1 Files"
     end
 
-    it "should receive and move a nginx upload" do
+    it "should receive a nginx upload" do
       file = multipart_fixture("test_data.txt")
       post '/uploads', nginx_upload_request("file", "test_data.txt")
       last_response.status.should == 200
-      last_response.body.should == "Received Files"
+      last_response.body.should == "Received 1 Files"
     end
 
     it "should cleanup received nginx uploads" do
@@ -97,7 +96,7 @@ describe Rack::Uploads do
   private
   def nginx_upload_request(key, name, temp_path="/tmp/rack_upload_nginx_tmp")
     FileUtils.cp multipart_file(name), temp_path
-    {"file_path" => temp_path, "#{key}_name" => name, "#{key}_content_type" => "text/plain", "#{key}_size" => File.size(multipart_file(name))}
+    {"#{key}_tmp_path" => temp_path, "#{key}_file_name" => name, "#{key}_content_type" => "text/plain", "#{key}_size" => File.size(multipart_file(name))}
   end
 
   def multipart_fixture(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mutle-rack-uploads
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mutwin Kraus
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2009-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/rack/uploads.rb
 - lib/rack/uploads/middleware.rb
 - lib/rack/uploads/uploaded_file.rb
+- rack-uploads.gemspec
 - spec/fixtures/files/test_data.txt
 - spec/middleware_spec.rb
 - spec/spec_helper.rb