httmultiparty 0.3.10 → 0.3.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2ba205ce71b29daa317ddb636c11c36a0faf232c
+  data.tar.gz: de40e080e6a714619fe8360b5ee59f1262f7497c
+SHA512:
+  metadata.gz: f7573acf386d59f6c49a4fa9aace247a3d3582feb3511d1eabb90ae7c59897c1df0047909ea4745abfd7f87057e2cc57fc4e85af0a89a41277f27f20c7052511
+  data.tar.gz: ebf1a84986bea0781cfa4239825ce99ab9b0e497d725d2168bf16cc7e9ec16f3978ffbc8a001a22847f0e12a2ee86c1510ea9408c266cc2c682912828d6af66a

data/README.md

@@ -1,18 +1,19 @@
-<h2>Description</h2>
-<p>HTTMultiParty is a thin wrapper around HTTParty to provide multipart uploads.</p>
+## Description
 
-<h2>Requirements</h2>
-<ul>
-  <li>httparty</li>
-  <li>multipart-post</li>
-</ul>
+HTTMultiParty is a thin wrapper around HTTParty to provide multipart uploads.
 
-<h2>Quick Start and Example</h2>
-<p>To start just "include HTTMultiParty" instead of "include HTTParty" into your client class.
-When you pass a query with an instance of a File as a value for a PUT or POST request, the wrapper will 
-use a bit of magic and multipart-post to execute a multipart upload:</p>
+## Requirements
 
-<pre>
+- httparty
+- multipart-post
+- mimemagic
+
+## Quick Start and Example
+
+To start just "include HTTMultiParty" instead of "include HTTParty" into
+your client class. When you pass a query with an instance of a File as a value for a PUT or POST request, the wrapper will use a bit of magic and multipart-post to execute a multipart upload:
+
+```ruby
 require 'httmultiparty'
 class SomeClient
   include HTTMultiParty
@@ -23,6 +24,28 @@ response = SomeClient.post('/', :query => {
   :foo      => 'bar',
   :somefile => File.new('README.md')
 })
-</pre>
+```
 
 Aside from that it provides all the usual HTTParty gimmicks.
+
+## MIME type support
+
+If you want the library to detect the MIME types of the uploaded files, then
+you need to enable it by supplying the `:detect_mime_type` option as `true`
+for POST or PUT requests. Otherwise, they will be uploaded with the default
+MIME type of `application/octet-stream`. For example:
+
+```ruby
+require 'httmultiparty'
+class SomeClient
+  include HTTMultiParty
+  base_uri 'http://localhost:3000'
+end
+
+response = SomeClient.post('/', :query => {
+  :foo      => 'bar',
+  :somefile => File.new('README.md')
+}, :detect_mime_type => true)
+```
+
+

data/lib/httmultiparty.rb

@@ -3,31 +3,35 @@ gem 'multipart-post'
 require 'tempfile'
 require 'httparty'
 require 'net/http/post/multipart'
+require 'mimemagic'
 
 module HTTMultiParty
   TRANSFORMABLE_TYPES = [File, Tempfile]
 
-  QUERY_STRING_NORMALIZER = Proc.new do |params|
-    HTTMultiParty.flatten_params(params).map do |(k,v)|
-      [k, TRANSFORMABLE_TYPES.include?(v.class) ? HTTMultiParty.file_to_upload_io(v) : v]
-    end
-  end
-
   def self.included(base)
     base.send :include, HTTParty
     base.extend ClassMethods
   end
 
-  def self.file_to_upload_io(file)
+  def self.file_to_upload_io(file, detect_mime_type = false)
     if file.respond_to? :original_filename
       filename = file.original_filename
     else
       filename =  File.split(file.path).last
     end
-    content_type = 'application/octet-stream'
+    content_type = detect_mime_type ? MimeMagic.by_path(filename) : 'application/octet-stream'
     UploadIO.new(file, content_type, filename)
   end
 
+  def self.query_string_normalizer(options = {})
+    detect_mime_type = options.fetch(:detect_mime_type, false)
+    Proc.new do |params|
+      HTTMultiParty.flatten_params(params).map do |(k,v)|
+        [k, TRANSFORMABLE_TYPES.include?(v.class) ? HTTMultiParty.file_to_upload_io(v, detect_mime_type) : v]
+      end
+    end
+  end
+
   def self.flatten_params(params={}, prefix='')
     flattened = []
     params.each do |(k,v)|
@@ -76,7 +80,7 @@ module HTTMultiParty
        options[:body] ||= options.delete(:query)
        if hash_contains_files?(options[:body])
          method = MultipartPost
-         options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
+         options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
        end
        perform_request method, path, options
      end
@@ -86,7 +90,7 @@ module HTTMultiParty
        options[:body] ||= options.delete(:query)
        if hash_contains_files?(options[:body])
          method = MultipartPut
-         options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
+         options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
        end
        perform_request method, path, options
      end

data/lib/httmultiparty/multipartable.rb

@@ -7,7 +7,7 @@ module HTTMultiParty::Multipartable
   end
 
   def body=(value)
-    @body_parts = value.map {|(k,v)| Parts::Part.new(boundary, k, v)}
+    @body_parts = Array(value).map {|(k,v)| Parts::Part.new(boundary, k, v)}
     @body_parts << Parts::EpiloguePart.new(boundary)
     set_headers_for_body
   end

data/lib/httmultiparty/version.rb

@@ -1,3 +1,3 @@
 module HTTMultiParty
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

metadata

@@ -1,132 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: httmultiparty
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 10
-  version: 0.3.10
+version: !ruby/object:Gem::Version
+  version: 0.3.11
 platform: ruby
-authors: 
+authors:
 - Johannes Wagener
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-10 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
   name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !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: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: HTTMultiParty is a thin wrapper around HTTParty to provide multipart uploads.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: HTTMultiParty is a thin wrapper around HTTParty to provide multipart
+  uploads.
+email:
 - johannes@wagener.cc
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/httmultiparty/multipart_post.rb
 - lib/httmultiparty/multipart_put.rb
 - lib/httmultiparty/multipartable.rb
 - lib/httmultiparty/version.rb
 - lib/httmultiparty.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/jwagener/httmultiparty
-licenses: []
-
+licenses:
+- MIT
+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: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTMultiParty is a thin wrapper around HTTParty to provide multipart uploads.
 test_files: []
-