Changeset 6742

Timestamp:

05/15/07 22:10:03 (1 year ago)

Author:

bitsweat

Message:

Move request parameter parsing from CGI to AbstractRequest.

Files:

• trunk/actionpack/lib/action_controller/cgi_ext/parameters.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_process.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/cgi_ext/parameters.rb

@@ -61 +61 @@
-
-          parser.result
-        end
-
-        def parse_formatted_request_parameters(mime_type, body)
-          case strategy = ActionController::Base.param_parsers[mime_type]
-            when Proc
-              strategy.call(body)
-            when :xml_simple, :xml_node
-              body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
-            when :yaml
-              YAML.load(body)
-          end
-        rescue Exception => e # YAML, XML or Ruby code block errors
-          { "exception" => "#{e.message} (#{e.class})", "backtrace" => e.backtrace,
-            "body" => body, "format" => mime_type }
-        end
-

trunk/actionpack/lib/action_controller/cgi_process.rb

@@ -77 +77 @@
-      @request_parameters ||=
-        if ActionController::Base.param_parsers.has_key?(content_type)
-CGI
+self.class
-        else
-          CGI.parse_request_parameters(@cgi.params)

trunk/actionpack/lib/action_controller/request.rb

@@ -296 +296 @@
-    def reset_session #:nodoc:
-    end
+
+
+    def self.parse_formatted_request_parameters(mime_type, body)
+      case strategy = ActionController::Base.param_parsers[mime_type]
+        when Proc
+          strategy.call(body)
+        when :xml_simple, :xml_node
+          body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
+        when :yaml
+          YAML.load(body)
+        else
+          {}
+      end
+    rescue Exception => e # YAML, XML or Ruby code block errors
+      { "exception" => "#{e.message} (#{e.class})", "backtrace" => e.backtrace,
+        "body" => body, "format" => mime_type }
+    end
-  end
-end

trunk/actionpack/test/controller/cgi_test.rb

@@ -275 +275 @@
-
-
-class XmlCGITest < Test::Unit::TestCase
-  def test_single_file
-    raw_post_data = 
-      "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar></person>"
-    person = CGI.parse_formatted_request_parameters(Mime::XML, raw_post_data)
-    assert_equal "image/jpg", person['person']['avatar'].content_type
-    assert_equal "me.jpg", person['person']['avatar'].original_filename
-    assert_equal "ABC", person['person']['avatar'].read
-  end
-
-  def test_multiple_files
-    raw_post_data = 
-      "<person><name>David</name><avatars>" +
-      "<avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar>" +
-      "<avatar type='file' name='you.gif' content_type='image/gif'>#{Base64.encode64('DEF')}</avatar>" +
-      "</avatars></person>"
-    person = CGI.parse_formatted_request_parameters(Mime::XML, raw_post_data)
-
-    assert_equal "image/jpg", person['person']['avatars']['avatar'].first.content_type
-    assert_equal "me.jpg", person['person']['avatars']['avatar'].first.original_filename
-    assert_equal "ABC", person['person']['avatars']['avatar'].first.read
-
-    assert_equal "image/gif", person['person']['avatars']['avatar'].last.content_type
-    assert_equal "you.gif", person['person']['avatars']['avatar'].last.original_filename
-    assert_equal "DEF", person['person']['avatars']['avatar'].last.read
-  end
-end
-
-
-class MultipartCGITest < Test::Unit::TestCase
-  FIXTURE_PATH = File.dirname(__FILE__) + '/../fixtures/multipart'
@@ -380 +351 @@
-  private
-    def process(name)
-      old_stdin = $stdin
-      File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|
-        ENV['CONTENT_LENGTH'] = file.stat.size.to_s
-
-
+
-        CGI.parse_request_parameters @cgi.params
-      end
-    ensure
-      $stdin = old_stdin
-    end
-end

trunk/actionpack/test/controller/request_test.rb

@@ -356 +356 @@
-    end
-end
+
+
+class RequestParameterParsingTest < Test::Unit::TestCase
+  def test_xml_with_single_file
+    body = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar></person>"
+
+    person = ActionController::AbstractRequest.parse_formatted_request_parameters(Mime::XML, body)
+
+    assert_equal "image/jpg", person['person']['avatar'].content_type
+    assert_equal "me.jpg", person['person']['avatar'].original_filename
+    assert_equal "ABC", person['person']['avatar'].read
+  end
+
+  def test_xml_with_multiple_files
+    body = <<-end_body
+      <person>
+        <name>David</name>
+        <avatars>
+          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{Base64.encode64('ABC')}</avatar>
+          <avatar type='file' name='you.gif' content_type='image/gif'>#{Base64.encode64('DEF')}</avatar>
+        </avatars>
+      </person>
+    end_body
+
+    person = ActionController::AbstractRequest.parse_formatted_request_parameters(Mime::XML, body)
+
+    assert_equal "image/jpg", person['person']['avatars']['avatar'].first.content_type
+    assert_equal "me.jpg", person['person']['avatars']['avatar'].first.original_filename
+    assert_equal "ABC", person['person']['avatars']['avatar'].first.read
+
+    assert_equal "image/gif", person['person']['avatars']['avatar'].last.content_type
+    assert_equal "you.gif", person['person']['avatars']['avatar'].last.original_filename
+    assert_equal "DEF", person['person']['avatars']['avatar'].last.read
+  end
+end
+