Autoloads, requires, and using new api

rack · May 3, 2011 · 297f638 · 297f638
1 parent 51fc864
commit 297f638
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/lib/rack.rb b/lib/rack.rb
@@ -54,6 +54,7 @@ def self.release
   autoload :Static, "rack/static"
   autoload :URLMap, "rack/urlmap"
   autoload :Utils, "rack/utils"
+  autoload :Multipart, "rack/multipart"
 
   autoload :MockRequest, "rack/mock"
   autoload :MockResponse, "rack/mock"

diff --git a/lib/rack/multipart.rb b/lib/rack/multipart.rb
@@ -1,5 +1,3 @@
-require 'rack/utils'
-
 module Rack
   # A multipart form data parser, adapted from IOWA.
   #

diff --git a/lib/rack/multipart/parser.rb b/lib/rack/multipart/parser.rb
@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Rack
   module Multipart
     class Parser

diff --git a/lib/rack/request.rb b/lib/rack/request.rb
@@ -303,7 +303,7 @@ def parse_query(qs)
       end
 
       def parse_multipart(env)
-        Utils::Multipart.parse_multipart(env)
+        Rack::Multipart.parse_multipart(env)
       end
   end
 end
diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb
@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'set'
 require 'tempfile'
+
 require 'rack/multipart'
 
 if RUBY_VERSION[/^\d+\.\d+/] == '1.8'