typhoeus 0.2.3 → 0.2.4

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+0.2.4
+-----
+* Fix form POSTs to only use multipart for file uploads, otherwise use application/x-www-form-urlencoded [dbalatero]
+
 0.2.3
 -----
 * Code duplication in Typhoeus::Form led to nested URL param errors on POST only. Fixed [dbalatero]

data/README.textile

@@ -59,6 +59,11 @@ request = Typhoeus::Request.new("http://www.pauldix.net",
 # the options are all optional. The default for :method is :get. Timeout is measured in milliseconds.
 # cache_timeout is measured in seconds.
 
+# Run the request via Hydra.
+hydra = Typhoeus::Hydra.new
+hydra.queue(request)
+hydra.run
+
 # the response object will be set after the request is run
 response = request.response
 response.code    # http status code

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/typhoeus/easy.rb

@@ -226,7 +226,11 @@ module Typhoeus
 
       if method == :post
         @form.process!
-        set_option(OPTION_VALUES[:CURLOPT_HTTPPOST], @form)
+        if @form.multipart?
+          set_option(OPTION_VALUES[:CURLOPT_HTTPPOST], @form)
+        else
+          self.post_data = @form.to_s
+        end
       else
         self.url = "#{url}?#{@form.to_s}"
       end

data/lib/typhoeus/form.rb

@@ -21,6 +21,10 @@ module Typhoeus
       traversal[:files].each { |file_args| formadd_file(*file_args) }
     end
 
+    def multipart?
+      !traversal[:files].empty?
+    end
+
     def to_s
       Typhoeus::Utils.traversal_to_param_string(traversal, false)
     end

data/spec/servers/app.rb

@@ -10,7 +10,8 @@ post '/file' do
   {
     'content-type' => params[:file][:type],
     'filename' => params[:file][:filename],
-    'content' => params[:file][:tempfile].read
+    'content' => params[:file][:tempfile].read,
+    'request-content-type' => request.env['CONTENT_TYPE']
   }.to_json
 end
 

data/spec/typhoeus/easy_spec.rb

@@ -244,21 +244,39 @@ describe Typhoeus::Easy do
       easy.params = {:foo => "bar"}
       easy.perform
       easy.response_code.should == 200
-      easy.response_body.should include("name=\\\"foo\\\"\\r\\n\\r\\nbar")
+      easy.response_body.should =~ /foo=bar/
     end
 
-    it "should handle a file upload" do
+    it "should use Content-Type: application/x-www-form-urlencoded for normal posts" do
+      easy = Typhoeus::Easy.new
+      easy.url = "http://localhost:3002/normal_post"
+      easy.method = :post
+      easy.params = { :a => 'b', :c => 'd',
+                      :e => { :f => { :g => 'h' } } }
+      easy.perform
+
+      request = JSON.parse(easy.response_body)
+      request['CONTENT_TYPE'].should == 'application/x-www-form-urlencoded' 
+      request['rack.request.form_vars'].should == 'a=b&c=d&e%5Bf%5D%5Bg%5D=h'
+    end
+
+    it "should handle a file upload, as multipart" do
       easy = Typhoeus::Easy.new
       easy.url    = "http://localhost:3002/file"
       easy.method = :post
       easy.params = {:file => File.open(File.expand_path(File.dirname(__FILE__) + "/../fixtures/placeholder.txt"), "r")}
       easy.perform
       easy.response_code.should == 200
-      JSON.parse(easy.response_body).should == {
-        'content-type' => 'text/plain',
+      result = JSON.parse(easy.response_body)
+      
+      { 'content-type' => 'text/plain',
         'filename' => 'placeholder.txt',
         'content' => 'This file is used to test uploading.'
-      }
+      }.each do |key, val|
+        result[key].should == val
+      end
+
+      result['request-content-type'].should =~ /multipart/
     end
   end
   

data/typhoeus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typhoeus}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Dix", "David Balatero"]
-  s.date = %q{2011-02-19}
+  s.date = %q{2011-02-24}
   s.description = %q{Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.}
   s.email = %q{dbalatero@gmail.com}
   s.extensions = ["ext/typhoeus/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Paul Dix
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency