Changeset 8343

Timestamp:

12/09/07 22:12:07 (5 months ago)

Author:

bitsweat

Message:

Move #to_query methods where they ought to belong. Closes #10395 [Chu Yeow]

Files:

• trunk/activesupport/lib/active_support/core_ext/array/conversions.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/core_ext/object.rb (modified) (1 diff)

trunk/activesupport/lib/active_support/core_ext/array/conversions.rb

@@ -28 +28 @@
-        def to_param
-          join '/'
+        end
+
+        # Converts an array into a string suitable for use as a URL query string, using the given <tt>key</tt> as the
+        # param name.
+        #
+        # ==== Example:
+        #   ['Rails', 'coding'].to_query('hobbies') => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
+        def to_query(key)
+          collect { |value| value.to_query("#{key}[]") } * '&'
-        end
-

trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -4 +4 @@
-require 'builder'
-require 'xmlsimple'
-
-# 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}[]") } * '&'
-  end
-end
-
-# Locked down XmlSimple#xml_in_string
@@ -101 +84 @@
-        end
-
+        # Converts a hash into a string suitable for use as a URL query string. An optional <tt>namespace</tt> can be
+        # passed to enclose the param names (see example below).
+        #
+        # ==== Example:
+        #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
+        #
+        #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
-        def to_query(namespace = nil)
-          collect do |key, value|

trunk/activesupport/lib/active_support/core_ext/object.rb

@@ +1 @@
+require 'active_support/core_ext/object/conversions'
-require 'active_support/core_ext/object/extending'
-require 'active_support/core_ext/object/instance_variables'