rack-multipart_related 0.0.3 → 0.1.0

data/README.md

@@ -48,7 +48,13 @@ Using this middleware, the hash above is parsed and rebuilt like the code below:
     {
       "user" => {
         "name" => "Jhon", 
-        "avatar" => <File:/var/folders/Iu/IuwHUNlZE8OaYMACfwiapE+++TI/-Tmp-/RackMultipart20101217-30578-bt18q9-0>, # The binary content of image
+        "avatar" => {
+          :type => "image/png", 
+          :filename =>"image.png", 
+          :tempfile => <File:/var/folders/Iu/IuwHUNlZE8OaYMACfwiapE+++TI/-Tmp-/RackMultipart20101217-30578-bt18q9-0>, # The binary content of image
+          :head => "Content-Type: image/gif\r\nContent-Disposition: inline; name=\"avatar_image\"; filename=\"image.png\"\r\n", 
+          :name =>"avatar_image"
+        }
       }
     }
     

data/lib/rack/multipart_related.rb

@@ -13,13 +13,16 @@ module Rack
 
       if content_type =~ /^multipart\/related/ni
 
-        start_part = content_type[/.* start=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni, 1]
-        start_part_type = content_type[/.* type=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni, 1]
+        start_part = content_type[/.* start=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni] && ($1 || $2)
+        start_part_type = content_type[/.* type=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni] && ($1 || $2)
 
         if start_part_type == "application/json"
 
           params = env["rack.request.form_hash"]
-          json_data = ::JSON.parse(get_attribute(params, start_part)[:tempfile].read)
+          start_part_attribute = get_attribute(params, start_part)
+          json_data = ::JSON.parse(start_part_attribute[:tempfile].read)
+          start_part_attribute[:tempfile].rewind
+          env['START_CONTENT_TYPE'] ||= start_part_attribute[:type]
 
           new_params = handle_atributtes_with_part_refs(json_data, params)
           env["rack.request.form_hash"] = new_params

data/test/rack/multipart_related_test.rb

@@ -73,4 +73,49 @@ class MultipartRelatedTest < Test::Unit::TestCase
     assert last_response.ok?
     assert_equal last_request.env["rack.request.form_hash"], expected_request_form_hash_after_middleware
   end
+
+  def test_multipart_related_with_start_and_type_without_quotes
+    jsonfile = make_tempfile("json", '{"user": {"name": "Jhon", "avatar": "cid:avatar_image"} }')
+
+    request_form_hash = {
+      "json" => {
+        :type => "application/json; charset=UTF-8", 
+        :tempfile => jsonfile, 
+        :head => "Content-Type: application/json; charset=UTF-8\r\nContent-Disposition: inline; name=\"json\"\r\n", 
+        :name => "json"
+      }, 
+      "avatar_image" => {
+        :type => "image/png", 
+        :filename =>"image.png", 
+        :tempfile => imagefile, 
+        :head => "Content-Type: image/gif\r\nContent-Disposition: inline; name=\"avatar_image\"; filename=\"image.png\"\r\n", 
+        :name =>"avatar_image"
+      }
+    }
+    
+    expected_request_form_hash_after_middleware = {
+      "user" => {
+        "name" => "Jhon", 
+        "avatar" => {
+          :type => "image/png", 
+          :filename =>"image.png", 
+          :tempfile => imagefile, 
+          :head => "Content-Type: image/gif\r\nContent-Disposition: inline; name=\"avatar_image\"; filename=\"image.png\"\r\n", 
+          :name =>"avatar_image"
+        }
+      }
+    }
+
+    env = {
+      'REQUEST_METHOD' => 'POST',
+      'CONTENT_TYPE' => 'multipart/related; boundary="the_boundary"; type=application/json; start=json',
+      'PATH_INFO' => '/some/path',
+      'rack.request.form_hash' => request_form_hash
+    }
+
+    request(env['PATH_INFO'], env)
+
+    assert last_response.ok?
+    assert_equal last_request.env["rack.request.form_hash"], expected_request_form_hash_after_middleware
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-multipart_related
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Lucas Fais
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -02:00
+date: 2010-12-30 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency