rack-multipart_related 0.1.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3cf1427a6afbd52d0afc85982e1db8d496e7582d
+  data.tar.gz: e0c6a2fba01f073d2081635d5e7a86942fc4f4c3
+SHA512:
+  metadata.gz: 2dfbb39f9c1f2558c3373667584957c562c345d82d4b7f940afaf232b0fef389f5a38287ca36e81d74056e2cd04625fa890693a9c92383d630e01741aae3474d
+  data.tar.gz: cbeb9237a57029ac2c28abb465b565a4d988b1b94853ace760100b1d2401edcfbaf2b54f8db0f5ed41693a624f9035e5035cce5ce57de2339492bbbcf945655e

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://www.rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    rack-multipart_related (1.0.0)
+      json (>= 1.0)
+      rack (>= 1.0)
+
+GEM
+  remote: http://www.rubygems.org/
+  specs:
+    json (1.8.1)
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rack-multipart_related!
+  rack-test

data/README.md

@@ -6,69 +6,78 @@ Rack::MultipartRelated it's a **rack middleware** to parse **multipart/related**
 
 When a ruby webserver receives a multipart/related request:
 
-    POST /users HTTP/1.1
-    Content-Type: multipart/related; boundary="the_boundary"; type="application/json"; start="json"
-    
-    --the_boundary
-    Content-Type: application/json; charset=UTF-8
-    Content-Disposition: inline; name="json"\r
-    
-    {"user":{"name": "Jhon", "avatar": "cid:avatar_image" }}
-    --the_boundary
-    Content-Type: image/png
-    Content-Disposition: inline; name="avatar_image"; filename="avatar.png"
-    
-    <the binary content of image comes here>
-    --the_boundary--
+```bash
+POST /users HTTP/1.1
+Content-Type: multipart/related; boundary="the_boundary"; type="application/json"; start="json"
+
+--the_boundary
+Content-Type: application/json; charset=UTF-8
+Content-Disposition: inline; name="json"\r
 
+{"user":{"name": "Jhon", "avatar": "cid:avatar_image" }}
+--the_boundary
+Content-Type: image/png
+Content-Disposition: inline; name="avatar_image"; filename="avatar.png"
 
+<the binary content of image comes here>
+--the_boundary--
+```
 
 The parameters hash arrives like this:
 
-    {
-      "json" => {
-        :type => "application/json; charset=UTF-8", 
-        :tempfile => <File:/var/folders/Iu/IuwHUNlZE8OaYMACfwiapE+++TI/-Tmp-/RackMultipart20101217-30578-l17vkd-0>, # The json content
-        :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 => <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"
-      }
-    }
+```ruby
+{
+  "json" => {
+    :type => "application/json; charset=UTF-8", 
+    :tempfile => <File:/var/folders/Iu/IuwHUNlZE8OaYMACfwiapE+++TI/-Tmp-/RackMultipart20101217-30578-l17vkd-0>, # The json content
+    :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 => <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"
+  }
+}
+```
 
 Pay attention that the second part of the 'request' (in our example, "avatar\_image") needs to be referenced in the first part (in the example, "json") as "cid:REFERENCE\_NAME\_OF\_THE\_SECOND\_PART"
 
 Using this middleware, the hash above is parsed and rebuilt like the code below:
 
-    {
-      "user" => {
-        "name" => "Jhon", 
-        "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"
-        }
-      }
+```ruby
+{
+  "user" => {
+    "name" => "Jhon", 
+    "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"
     }
+  }
+}
+```
     
 ## Usage
 
 ### Rails apps
 
 In your Gemfile:
- 
-    gem 'rack-multipart_related'
+
+```bash
+gem 'rack-multipart_related'
+```
+
 In your environment.rb:
 
-    require 'rack/multipart_related'
-    config.middleware.use Rack::MultipartRelated
+```ruby
+require 'rack/multipart_related'
+config.middleware.use Rack::MultipartRelated
+```
 
 ### Non-Rails apps
 

data/lib/rack/multipart_related.rb

@@ -20,9 +20,13 @@ module Rack
 
           params = env["rack.request.form_hash"]
           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]
+          if start_part_attribute.is_a? String then
+            json_data = ::JSON.parse(start_part_attribute)
+          else
+            json_data = ::JSON.parse(start_part_attribute[:tempfile].read)
+            start_part_attribute[:tempfile].rewind
+            env['START_CONTENT_TYPE'] ||= start_part_attribute[:type]
+          end
 
           new_params = handle_atributtes_with_part_refs(json_data, params)
           env["rack.request.form_hash"] = new_params

data/lib/rack/multipart_related/version.rb

@@ -1,12 +1,7 @@
 module Rack
   class MultipartRelated
-    version = nil
-    version = $1 if ::File.expand_path('../../..', __FILE__) =~ /\/rack-multipart_related-([\w\.\-]+)/
-    if version.nil? && ::File.exists?(::File.expand_path('../../../../.git', __FILE__))
-      require "step-up"
-      version = StepUp::Driver::Git.last_version
-    end
-    version = "0.0.0" if version.nil?
-    VERSION = version.gsub(/^v?([^\+]+)\+?\d*$/, '\1')
+
+    VERSION = "1.0.0"
+
   end
 end

data/test/rack/multipart_related_test.rb

@@ -73,6 +73,44 @@ 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_json_notin_tempfile
+    request_form_hash = {
+      "json" => '{"user": {"name": "Jhon", "avatar": "cid:avatar_image"} }', 
+      "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
 
   def test_multipart_related_with_start_and_type_without_quotes
     jsonfile = make_tempfile("json", '{"user": {"name": "Jhon", "avatar": "cid:avatar_image"} }')

metadata

@@ -1,93 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-multipart_related
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Lucas Fais
 - Marcelo Manzan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-30 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: step-up
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: It's a rack middleware to parse multipart/related requests and rebuild a simple/merged parameters hash.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: It's a rack middleware to parse multipart/related requests and rebuild
+  a simple/merged parameters hash.
+email:
 - lucasfais@gmail.com
 - manzan@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/rack/multipart_related.rb
@@ -95,43 +85,30 @@ files:
 - test/rack/multipart_related_test.rb
 - test/resources/image.png
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/lucasfais/rack-multipart_related
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: rack-multipart_related
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes easy to handle mutipart/related requests.
-test_files: 
+test_files:
 - test/rack/multipart_related_test.rb
 - test/resources/image.png
 - test/test_helper.rb