ethon 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -2,7 +2,16 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.0...master)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.1...master)
+
+## 0.4.1
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.0...v0.4.1)
+
+Bugfixes:
+
+* Handle nested hash in an array in params correct
+  ( [\#201](https://github.com/typhoeus/typhoeus/issues/201) )
 
 ## 0.4.0
 

data/lib/ethon/easies/http.rb

@@ -36,7 +36,7 @@ module Ethon
       #
       # @return [ Class ] The action class.
       def fabricate(action_name)
-        eval("#{action_name.to_s.capitalize}")
+        Ethon::Easies::Http.const_get(action_name.to_s.capitalize)
       end
     end
   end

data/lib/ethon/easies/queryable.rb

@@ -60,17 +60,16 @@ module Ethon
 
         pairs = []
         recursive = Proc.new do |h, prefix|
-          h.each_pair do |k,v|
-            key = prefix == '' ? k : "#{prefix}[#{k}]"
-            case v
-            when Hash
-              recursive.call(v, key)
-            when Array
-              v.each { |x| pairs << [key, x]  }
-            when File, Tempfile
-              pairs << [Util.escape_zero_byte(key), file_info(v)]
-            else
-              pairs << [Util.escape_zero_byte(key), Util.escape_zero_byte(v)]
+          case h
+          when Hash
+            h.each_pair do |k,v|
+              key = prefix == '' ? k : "#{prefix}[#{k}]"
+              pairs_for(v, key, pairs, recursive)
+            end
+          when Array
+            h.each_with_index do |v, i|
+              key = "#{prefix}[#{i}]"
+              pairs_for(v, key, pairs, recursive)
             end
           end
         end
@@ -95,6 +94,21 @@ module Ethon
           File.expand_path(file.path)
         ]
       end
+
+      private
+
+      def pairs_for(v, key, pairs,  recursive)
+        case v
+        when Hash
+          recursive.call(v, key)
+        when Array
+          recursive.call(v, key)
+        when File, Tempfile
+          pairs << [Util.escape_zero_byte(key), file_info(v)]
+        else
+          pairs << [Util.escape_zero_byte(key), Util.escape_zero_byte(v)]
+        end
+      end
     end
   end
 end

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2336974979301889597
+      hash: 1338934003639649204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: