[pull] master from stripe:master

lib/stripe/util.rb

@@ -276,7 +276,7 @@ def self.flatten_params_array(value, api_mode, calculated_key)
         if elem.is_a?(Hash)
           result += flatten_params(elem, api_mode, "#{calculated_key}[#{i}]")
         elsif elem.is_a?(Array)
-          result += flatten_params_array(elem, api_mode, calculated_key)
+          result += flatten_params_array(elem, api_mode, "#{calculated_key}[#{i}]")
         else
           # Always use indexed format for arrays
           result << ["#{calculated_key}[#{i}]", elem]

test/stripe/util_test.rb

@@ -29,7 +29,15 @@ class UtilTest < Test::Unit::TestCase
           a: [[foo: "bar", baz: "qux"]],
         }
         assert_equal(
-          "a[0][foo]=bar&a[0][baz]=qux",
+          "a[0][0][foo]=bar&a[0][0][baz]=qux",
+          Stripe::Util.encode_parameters(params, :v1)
+        )
+      end
+
+      should "correctly encode 2D arrays of scalars" do
+        params = { a: [[1, 2], [3, 4]] }
+        assert_equal(
+          "a[0][0]=1&a[0][1]=2&a[1][0]=3&a[1][1]=4",
           Stripe::Util.encode_parameters(params, :v1)
         )
       end
@@ -96,6 +104,14 @@ class UtilTest < Test::Unit::TestCase
         ]
         assert_equal([["d[a]", "a"], ["d[b]", "b"], ["e[0]", 0], ["e[1]", 1]], Stripe::Util.flatten_params(params, :v2))
       end
+
+      should "flatten 2D arrays with correct indices" do
+        params = { a: [[1, 2], [3, 4]] }
+        assert_equal(
+          [["a[0][0]", 1], ["a[0][1]", 2], ["a[1][0]", 3], ["a[1][1]", 4]],
+          Stripe::Util.flatten_params(params, :v1)
+        )
+      end
     end
 
     should "#symbolize_names should convert names to symbols" do