Added Hash#to_query to turn a hash of values into a form-encoded query string [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6038 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 47 insertions, 0 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 63cf492fe5..265dd53297 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added Hash#to_query to turn a hash of values into a form-encoded query string [Nicholas Seckar]
+
 * Increase test coverage for subclasses_of. Closes #7335. [Roman2K, Nicholas Seckar]
 
 * Remove unused code from Duration#inspect.  Closes #7180.  [Rich Collins]
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 83054cde93..74e23bd884 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,5 +1,23 @@
 require 'date'
 require 'xml_simple'
+require 'cgi'
+
+# Extensions needed for Hash#to_query
+class Object
+  def to_param #:nodoc:
+    to_s
+  end
+
+  def to_query(key) #:nodoc:
+    "#{key}=#{CGI.escape(to_param)}"
+  end
+end
+
+class Array
+  def to_query(key) #:nodoc:
+    collect { |value| value.to_query("#{key}[]") } * '&'
+  end
+end
 
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
@@ -27,6 +45,12 @@ module ActiveSupport #:nodoc:
           klass.extend(ClassMethods)
         end
 
+        def to_query(namespace = nil)
+          collect do |key, value|
+            value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+          end * '&'
+        end
+
         def to_xml(options = {})
           options[:indent] ||= 2
           options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 90468fd5a9..cc5d71447b 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -527,3 +527,24 @@ class HashToXmlTest < Test::Unit::TestCase
     end
   end
 end
+
+class QueryTest < Test::Unit::TestCase
+  def test_simple_conversion
+    assert_equal 'a=10', {:a => 10}.to_query
+  end
+  
+  def test_nested_conversion
+    assert_equal 'person[name]=Nicholas&person[login]=seckar',
+      {:person => {:name => 'Nicholas', :login => 'seckar'}}.to_query
+  end
+  
+  def test_multiple_nested
+    assert_equal 'account[person][id]=20&person[id]=10',
+      {:person => {:id => 10}, :account => {:person => {:id => 20}}}.to_query
+  end
+  
+  def test_array_values
+    assert_equal 'person[id][]=10&person[id][]=20',
+      {:person => {:id => [10, 20]}}.to_query
+  end
+end
\ No newline at end of file