tap-http 0.3.1 → 0.3.2

data/History

@@ -1,3 +1,9 @@
+== 0.3.2 / 2009-02-23
+
+Bug fix in handling of multipart/form data.
+
+* parse_rack_request now parses overloaded params
+
 == 0.3.1 / 2009-02-19
 
 Improved handling of multipart/form data.

data/controllers/capture_controller.rb

@@ -41,7 +41,7 @@ class CaptureController < Tap::Controller
   # Echos back redirected HTTP requests formatted as YAML.
   def echo
     response['Content-Type'] = "text/plain"
-    YAML.dump(config)
+    YAML.dump(parse_request)
   end
   
   protected
@@ -49,6 +49,17 @@ class CaptureController < Tap::Controller
   # helper to parse the request into a request hash for
   # use by a Tap::Http::Submit task
   def parse_request(keep_content=true) # :nodoc:
+    
+    # perform the actions of Rack::Request::POST, but capturing
+    # overloaded parameter names
+    env = request.env
+    env["rack.request.form_input"] = env["rack.input"]
+    unless env["rack.request.form_hash"] = Tap::Http::Utils.parse_multipart(env)
+      env["rack.request.form_vars"] = env["rack.input"].read
+      env["rack.request.form_hash"] = Rack::Utils.parse_query(env["rack.request.form_vars"])
+      env["rack.input"].rewind if env["rack.input"].respond_to?(:rewind)
+    end
+    
     config = {}
     parse_rack_request(request, keep_content).each_pair do |key, value| 
       config[key.to_s] = value

data/lib/tap/http/utils.rb

@@ -1,6 +1,7 @@
 autoload(:WEBrick, 'webrick')
 autoload(:Zlib, 'zlib')
 autoload(:StringIO, 'stringio')
+require 'rack'
 
 module Tap
   module Http
@@ -137,10 +138,11 @@ module Tap
         request.params.each_pair do |key, value|
           params[key] = each_member(value) do |obj|
             if obj.kind_of?(Hash)
-              file = {'Content-Type' => value[:type], 'Filename' => value[:filename]}
-              file['Content'] = value[:tempfile].read if keep_content
+              file = {'Content-Type' => obj[:type], 'Filename' => obj[:filename]}
+              file['Content'] = obj[:tempfile].read if keep_content
               file
-            else value
+            else
+              obj
             end
           end
         end
@@ -207,6 +209,99 @@ module Tap
       def inflate(str)
         Zlib::GzipReader.new( StringIO.new( str ) ).read
       end
+      
+      EOL = Rack::Utils::Multipart::EOL
+      # Lifted from Rack::Utils::Multipart, and modified to collect
+      # overloaded params and params with names suffixed by '[]' as
+      # arrays.
+      def parse_multipart(env)
+        unless env['CONTENT_TYPE'] =~
+          %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
+          nil
+        else
+          boundary = "--#{$1}"
+
+          params = {}
+          buf = ""
+          content_length = env['CONTENT_LENGTH'].to_i
+          input = env['rack.input']
+
+          boundary_size = boundary.size + EOL.size
+          bufsize = 16384
+
+          content_length -= boundary_size
+
+          status = input.read(boundary_size)
+          raise EOFError, "bad content body"  unless status == boundary + EOL
+
+          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/
+
+          loop {
+            head = nil
+            body = ''
+            filename = content_type = name = nil
+
+            until head && buf =~ rx
+              if !head && i = buf.index("\r\n\r\n")
+                head = buf.slice!(0, i+2) # First \r\n
+                buf.slice!(0, 2)          # Second \r\n
+
+                filename = head[/Content-Disposition:.* filename="?([^\";]*)"?/ni, 1]
+                content_type = head[/Content-Type: (.*)\r\n/ni, 1]
+                name = head[/Content-Disposition:.* name="?([^\";]*)"?/ni, 1]
+
+                if filename
+                  body = Tempfile.new("RackMultipart")
+                  body.binmode  if body.respond_to?(:binmode)
+                end
+
+                next
+              end
+
+              # Save the read body part.
+              if head && (boundary_size+4 < buf.size)
+                body << buf.slice!(0, buf.size - (boundary_size+4))
+              end
+
+              c = input.read(bufsize < content_length ? bufsize : content_length)
+              raise EOFError, "bad content body"  if c.nil? || c.empty?
+              buf << c
+              content_length -= c.size
+            end
+
+            # Save the rest.
+            if i = buf.index(rx)
+              body << buf.slice!(0, i)
+              buf.slice!(0, boundary_size+2)
+
+              content_length = -1  if $1 == "--"
+            end
+
+            if filename
+              body.rewind
+              data = {:filename => filename, :type => content_type,
+                :name => name, :tempfile => body, :head => head}
+            else
+              data = body
+            end
+
+            if name
+              case current = params[name]
+              when nil 
+                params[name] = (name =~ /\[\]\z/ ? [data] : data)
+              when Array 
+                params[name] << data
+              else 
+                params[name] = [current, data]
+              end
+            end
+
+            break  if buf.empty? || content_length == -1
+          }
+
+          params
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-http
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -07:00
+date: 2009-02-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.0
+        version: 0.12.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack