arachni-typhoeus 0.2.0.1 → 0.2.0.2

data/VERSION

@@ -1 +1 @@
-0.2.0.1
+0.2.0.2

data/lib/typhoeus/request.rb

@@ -110,18 +110,23 @@ module Typhoeus
     end
 
     def params_string
-      params.keys.sort { |a, b| a.to_s <=> b.to_s }.collect do |k|
-        value = params[k]
-        if value.is_a? Hash
-          value.keys.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('&')
+      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(k.to_s)}=#{Typhoeus::Utils.escape(params[k].to_s)}"
+          "#{Typhoeus::Utils.escape(new_key)}=#{Typhoeus::Utils.escape(hash[key].to_s)}"
         end
-      end.flatten.join("&")
+      end
     end
+    private :traverse_hash
 
     def on_complete(&block)
       @on_complete = block

data/lib/typhoeus/utils.rb

@@ -2,7 +2,7 @@ module Typhoeus
   module Utils
     # Taken from Rack::Utils, 1.2.1 to remove Rack dependency.
     def escape(s)
-      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/u) {
+      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) {
         '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
       }.tr(' ', '+')
     end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 0
-  - 1
-  version: 0.2.0.1
+  - 2
+  version: 0.2.0.2
 platform: ruby
 authors: 
 - Paul Dix
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +00:00
+date: 2011-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency