recursive query string generation - fixes hashes

lib/http_router/route.rb

@@ -284,17 +284,22 @@ def add_non_path_to_tree(node, path, names)
       path_obj
     end
 
+    def append_querystring_value(uri, key, value)
+      case value
+      when Array
+        k = "#{key}[]"
+        value.each{ |v| append_querystring_value(uri, k, v) }
+      when Hash
+        value.each{ |k, v| append_querystring_value(uri, "#{key}[#{k}]", v) }
+      else
+        uri << '&' << ::Rack::Utils.escape(key.to_s) << '=' << ::Rack::Utils.escape(value.to_s)
+      end
+    end
+
     def append_querystring(uri, params)
       if params && !params.empty?
         uri_size = uri.size
-        params.each do |k,v|
-          case v
-          when Array
-            v.each { |v_part| uri << '&' << ::Rack::Utils.escape(k.to_s) << '%5B%5D=' << ::Rack::Utils.escape(v_part.to_s) }
-          else
-            uri << '&' << ::Rack::Utils.escape(k.to_s) << '=' << ::Rack::Utils.escape(v.to_s)
-          end
-        end
+        params.each{ |k,v|  append_querystring_value(uri, k, v) }
         uri[uri_size] = ??
       end
       uri

test/test_generate.rb

@@ -90,4 +90,21 @@ def test_raise
     r = router { add(':var').matching(:var => /\d+/) }
     assert_raises(HttpRouter::InvalidRouteException) { router.url(r, 'asd') }
   end
+
+  def escape_brackets(s)
+    s.gsub('[','%5B').gsub(']','%5D')
+  end
+  alias eb escape_brackets
+
+  def test_array
+    assert_generate eb('/var?foo[]=baz&foo[]=bar'), '/var', :foo => ['baz', 'bar']
+  end
+
+  def test_hash
+    assert_generate eb('/var?foo[az]=baz&foo[ar]=bar'), '/var', :foo => {:az => 'baz', :ar => 'bar'}
+  end
+
+  def test_hash_with_array
+    assert_generate eb('/var?foo[az]=baz&foo[ar][]=bar&foo[ar][]=barz'), '/var', :foo => {:az => 'baz', :ar => ['bar', 'barz']}
+  end
 end