typhoeus 0.2.2 → 0.2.3

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+0.2.3
+-----
+* Code duplication in Typhoeus::Form led to nested URL param errors on POST only. Fixed [dbalatero]
+
 0.2.2
 -----
 * Fixed a problem with nested URL params encoding incorrectly [dbalatero]

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/typhoeus/easy.rb

@@ -220,7 +220,7 @@ module Typhoeus
     def params
       @form.nil? ? {} : @form.params
     end
-    
+
     def params=(params)
       @form = Typhoeus::Form.new(params)
 

data/lib/typhoeus/form.rb

@@ -3,45 +3,26 @@ require 'mime/types'
 module Typhoeus
   class Form
     attr_accessor :params
+    attr_reader :traversal
 
     def initialize(params = {})
       @params = params
     end
 
+    def traversal
+      @traversal ||= Typhoeus::Utils.traverse_params_hash(params)
+    end
+
     def process!
-      params.each do |key, value|
-        case value
-          when Hash
-            value.keys.each {|sub_key| formadd_param("#{key}[#{sub_key}]", value[sub_key].to_s)}
-          when Array
-            value.each {|v| formadd_param(key.to_s, v.to_s)}
-          when File
-            filename = File.basename(value.path)
-            types = MIME::Types.type_for(filename)
-            formadd_file(
-              key.to_s,
-              filename,
-              types.empty? ? 'application/octet-stream' : types[0].to_s,
-              File.expand_path(value.path)
-            )
-          else
-            formadd_param(key.to_s, value.to_s)
-        end
-      end
+      # add params
+      traversal[:params].each { |p| formadd_param(p[0], p[1]) }
+
+      # add files
+      traversal[:files].each { |file_args| formadd_file(*file_args) }
     end
 
     def to_s
-      params.keys.sort_by{|k|k.to_s}.collect do |k|
-        value = params[k]
-        if value.is_a? Hash
-          value.keys.sort_by{|sk|sk.to_s}.collect {|sk| Typhoeus::Utils.escape("#{k}[#{sk}]") + "=" + Typhoeus::Utils.escape(value[sk].to_s)}
-        elsif value.is_a? Array
-          key = Typhoeus::Utils.escape(k.to_s)
-          value.collect { |v| "#{key}=#{Typhoeus::Utils.escape(v.to_s)}" }.join('&')
-        else
-          "#{Typhoeus::Utils.escape(k.to_s)}=#{Typhoeus::Utils.escape(params[k].to_s)}"
-        end
-      end.flatten.join("&")
+      Typhoeus::Utils.traversal_to_param_string(traversal, false)
     end
   end
-end
+end

data/lib/typhoeus/request.rb

@@ -110,23 +110,9 @@ module Typhoeus
     end
 
     def params_string
-      traverse_hash(params).flatten.join('&')
-    end
-
-    def traverse_hash(hash, current_key = nil)
-      hash.keys.sort { |a, b| a.to_s <=> b.to_s }.collect do |key|
-        new_key = current_key ? "#{current_key}[#{key}]" : key
-        if hash[key].is_a?(Hash)
-          traverse_hash(hash[key], new_key)
-        elsif hash[key].is_a?(Array)
-          array_key = Typhoeus::Utils.escape("#{new_key}[]")
-          hash[key].collect { |v| "#{array_key}=#{Typhoeus::Utils.escape(v.to_s)}" }.join('&')
-        else
-          "#{Typhoeus::Utils.escape(new_key)}=#{Typhoeus::Utils.escape(hash[key].to_s)}"
-        end
-      end
+      traversal = Typhoeus::Utils.traverse_params_hash(params)
+      Typhoeus::Utils.traversal_to_param_string(traversal)
     end
-    private :traverse_hash
 
     def on_complete(&block)
       @on_complete = block

data/lib/typhoeus/utils.rb

@@ -8,6 +8,44 @@ module Typhoeus
     end
     module_function :escape
 
+    # Params are NOT escaped.
+    def traverse_params_hash(hash, result = nil, current_key = nil)
+      result ||= { :files => [], :params => [] }
+
+      hash.keys.sort { |a, b| a.to_s <=> b.to_s }.collect do |key|
+        new_key = (current_key ? "#{current_key}[#{key}]" : key).to_s
+        case hash[key]
+        when Hash
+          traverse_params_hash(hash[key], result, new_key)
+        when Array
+          array_key = "#{new_key}[]"
+          hash[key].each do |v|
+            result[:params] << [array_key, v.to_s]
+          end
+        when File
+          filename = File.basename(hash[key].path)
+          types = MIME::Types.type_for(filename)
+          result[:files] << [
+            new_key,
+            filename,
+            types.empty? ? 'application/octet-stream' : types[0].to_s,
+            File.expand_path(hash[key].path)
+          ]
+        else
+          result[:params] << [new_key, hash[key].to_s]
+        end
+      end
+      result
+    end
+    module_function :traverse_params_hash
+
+    def traversal_to_param_string(traversal, escape = true)
+      traversal[:params].collect { |param|
+        "#{Typhoeus::Utils.escape(param[0])}=#{Typhoeus::Utils.escape(param[1])}"
+      }.join('&')
+    end
+    module_function :traversal_to_param_string
+
     # Return the bytesize of String; uses String#size under Ruby 1.8 and
     # String#bytesize under 1.9.
     if ''.respond_to?(:bytesize)

data/spec/typhoeus/easy_spec.rb

@@ -191,7 +191,7 @@ describe Typhoeus::Easy do
         :username => ['dbalatero', 'dbalatero2']
       }
       
-      easy.url.should =~ /\?.*username=dbalatero&username=dbalatero2/
+      easy.url.should =~ /\?.*username%5B%5D=dbalatero&username%5B%5D=dbalatero2/
     end
   end
 

data/spec/typhoeus/form_spec.rb

@@ -36,9 +36,9 @@ describe Typhoeus::Form do
         :name => "John Smith",
         :age => "29"
       })
-      form.should_receive(:formadd_param).with("colors", "brown")
-      form.should_receive(:formadd_param).with("colors", "green")
-      form.should_receive(:formadd_param).with("colors", "white")
+      form.should_receive(:formadd_param).with("colors[]", "brown")
+      form.should_receive(:formadd_param).with("colors[]", "green")
+      form.should_receive(:formadd_param).with("colors[]", "white")
       form.should_receive(:formadd_param).with("name", "John Smith")
       form.should_receive(:formadd_param).with("age", "29")
       form.process!
@@ -52,13 +52,14 @@ describe Typhoeus::Form do
         form.should_receive(:formadd_file).with("file", "placeholder.txt", "text/plain", anything)
         form.process!
       end
+
       it "should handle more than one file" do
         form = Typhoeus::Form.new(
           :text_file => File.open(File.expand_path(File.dirname(__FILE__) + "/../fixtures/placeholder.txt"), "r"),
           :gif_file => File.open(File.expand_path(File.dirname(__FILE__) + "/../fixtures/placeholder.gif"), "r")
         )
-        form.should_receive(:formadd_file).with("text_file", "placeholder.txt", "text/plain", anything)
         form.should_receive(:formadd_file).with("gif_file", "placeholder.gif", "image/gif", anything)
+        form.should_receive(:formadd_file).with("text_file", "placeholder.txt", "text/plain", anything)
         form.process!
       end
       it "should default to 'application/octet-stream' if no content type can be determined" do
@@ -100,7 +101,7 @@ describe Typhoeus::Form do
         :name => "John Smith",
         :age => "29"
       })
-      form.to_s.should == "age=29&colors=brown&colors=green&colors=white&name=John+Smith"
+      form.to_s.should == "age=29&colors%5B%5D=brown&colors%5B%5D=green&colors%5B%5D=white&name=John+Smith"
     end
   end
-end
+end

data/spec/typhoeus/request_spec.rb

@@ -102,11 +102,11 @@ describe Typhoeus::Request do
     end
 
     it "can run a POST synchronously" do
-      response = Typhoeus::Request.post("http://localhost:3000", :params => {:q => "hi"}, :headers => {:foo => "bar"})
+      response = Typhoeus::Request.post("http://localhost:3000", :params => {:q => { :a => "hi" } }, :headers => {:foo => "bar"})
       response.code.should == 200
       json = JSON.parse(response.body)
       json["REQUEST_METHOD"].should == "POST"
-      json["rack.request.query_hash"]["q"].should == "hi"
+      json["rack.request.query_hash"]["q"]["a"].should == "hi"
     end
 
     it "can run a PUT synchronously" do

data/typhoeus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typhoeus}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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-14}
+  s.date = %q{2011-02-19}
   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: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Paul Dix
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency