rack-uploads 0.1.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/rack/uploads/middleware.rb

@@ -7,17 +7,23 @@ module Rack
       @nginx = options[:nginx] || [{ :tmp_path => "_tmp_path", :filename => "_file_name" }]
     end
 
+    def extract_uploads_from_arguments(req, params, uploads=[])
+      params.each do |key,param|
+        if param_file = file(req, key, param)
+          uploads << param_file
+          params[key] = param_file
+        elsif param.instance_of?(Hash)
+          uploads = extract_uploads_from_arguments(req, param, uploads)
+        end
+      end
+      uploads
+    end
+
     def call(env)
       req = Rack::Request.new(env)
       if req.post? && req.form_data?
         return not_authorized unless @session_authorized == true || (@session_authorized.respond_to?(:call) && @session_authorized.call(req) == true)
-        uploads = []
-        req.params.each do |key,param|
-          if param_file = file(req, key)
-            uploads << param_file
-            req.params[key] = param_file
-          end
-        end
+        uploads = extract_uploads_from_arguments(req, req.params)
         env['rack.uploads'] = uploads if uploads.size > 0
       end
       resp = @app.call(env)
@@ -31,8 +37,7 @@ module Rack
       req.media_type == "multipart/form-data"
     end
 
-    def file(req, key)
-      param = req.params[key]
+    def file(req, key, param)
       return UploadedFile.new(key, param) if param.instance_of?(Hash) && param[:tempfile]
       @nginx.each do |nginx|
         if key =~ %r{^(.+)#{nginx[:tmp_path]}$}

data/rack-uploads.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-uploads}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   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.date = %q{2009-10-13}
   s.email = %q{mutle@blogage.de}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -32,7 +35,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.5}
   s.summary = %q{Rack Upload handler with Nginx Upload Module support}
   s.test_files = [
     "spec/middleware_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-uploads
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mutwin Kraus
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 +02:00
+date: 2009-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -62,8 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
+source: 
 specification_version: 3
 summary: Rack Upload handler with Nginx Upload Module support
 test_files: