Changeset 7834

Timestamp:

10/11/07 05:56:58 (2 years ago)

Author:

bitsweat

Message:

Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before. Closes #7047.

Files:

• branches/1-2-stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/actionpack/lib/action_controller/routing.rb (modified) (3 diffs)
• branches/1-2-stable/actionpack/test/controller/routing_test.rb (modified) (1 diff)
• branches/1-2-stable/actionpack/test/controller/url_rewriter_test.rb (modified) (2 diffs)
• branches/1-2-stable/activesupport/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (2 diffs)
• branches/1-2-stable/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

branches/1-2-stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan, Diego Algorta Casamayou]
-
-* Fix in place editor's setter action with non-string fields.  #7418 [Andreas]

branches/1-2-stable/actionpack/lib/action_controller/routing.rb

@@ -452 +452 @@
-      # the query string. The query string will correctly build array parameter
-      # values.
-=
+ = 
-        elements = []
-
-        only_keys ||= hash.keys
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-      # Write the real recognition implementation and then resend the message.
-      def recognize(path, environment={})
@@ -669 +660 @@
-  
-      def extract_value
-
+&& hash[:#{key}].to_param 
-      end
-      def value_check
@@ -1231 +1222 @@
-        # great fun, eh?
-
-
-
-
-
+
+
+
-        options_as_params
-      end

branches/1-2-stable/actionpack/test/controller/routing_test.rb

@@ -947 +947 @@
-
-  def test_expand_array_build_query_string
-[]=1&x[]
+%5B%5D=1&x%5B%5D
-  end
-

branches/1-2-stable/actionpack/test/controller/url_rewriter_test.rb

@@ -24 +24 @@
-    )
-  end
-  
-  private
-    def split_query_string(str)
-      [str[0].chr] + str[1..-1].split(/&/).sort
-    end
-  
-    def assert_query_equal(q1, q2)
-      assert_equal(split_query_string(q1), split_query_string(q2))
-    end
-end
-
@@ -124 +115 @@
-    ActionController::Routing::Routes.load!
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end

branches/1-2-stable/activesupport/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan, Diego Algorta Casamayou]
+
+
-*1.4.3* (October 4th, 2007)
-

branches/1-2-stable/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -1 +1 @@
-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:
+    "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class Array
+  def to_query(key) #:nodoc:
+    collect { |value| value.to_query("#{key}[]") }.sort * '&'
+  end
+end
-
-# Locked down XmlSimple#xml_in_string
@@ -47 +65 @@
-        def self.included(klass)
-          klass.extend(ClassMethods)
+        end
+
+        def to_query(namespace = nil)
+          collect do |key, value|
+            value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+          end.sort * '&'
-        end
-

branches/1-2-stable/activesupport/test/core_ext/hash_ext_test.rb

@@ -471 +471 @@
-  end
-end
+
+class QueryTest < Test::Unit::TestCase
+  def test_simple_conversion
+    assert_query_equal 'a=10', :a => 10
+  end
+
+  def test_cgi_escaping
+    assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d'
+  end
+
+  def test_nil_parameter_value
+    empty = Object.new 
+    def empty.to_param; nil end
+    assert_query_equal 'a=', 'a' => empty
+  end
+
+  def test_nested_conversion
+    assert_query_equal 'person%5Bname%5D=Nicholas&person%5Blogin%5D=seckar',
+      :person => {:name => 'Nicholas', :login => 'seckar'}
+  end
+  
+  def test_multiple_nested
+    assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10',
+      :person => {:id => 10}, :account => {:person => {:id => 20}}
+  end
+  
+  def test_array_values
+    assert_query_equal 'person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20',
+      :person => {:id => [10, 20]}
+  end
+
+  private
+    def assert_query_equal(expected, actual, message = nil)
+      assert_equal expected.split('&').sort, actual.to_query.split('&').sort
+    end
+end
+