Merge branch 'master' of github.com:lifo/docrails

1 files changed, 50 insertions, 0 deletions

diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
new file mode 100644
index 0000000000..97546d5f93
--- /dev/null
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -0,0 +1,50 @@
+require 'active_support/core_ext/hash/keys'
+
+module ActionDispatch
+  module Http
+    module Parameters
+      # Returns both GET and POST \parameters in a single hash.
+      def parameters
+        @env["action_dispatch.request.parameters"] ||= request_parameters.merge(query_parameters).update(path_parameters).with_indifferent_access
+      end
+      alias :params :parameters
+
+      def path_parameters=(parameters) #:nodoc:
+        @env.delete("action_dispatch.request.symbolized_path_parameters")
+        @env.delete("action_dispatch.request.parameters")
+        @env["action_dispatch.request.path_parameters"] = parameters
+      end
+
+      # The same as <tt>path_parameters</tt> with explicitly symbolized keys.
+      def symbolized_path_parameters
+        @env["action_dispatch.request.symbolized_path_parameters"] ||= path_parameters.symbolize_keys
+      end
+
+      # Returns a hash with the \parameters used to form the \path of the request.
+      # Returned hash keys are strings:
+      #
+      #   {'action' => 'my_action', 'controller' => 'my_controller'}
+      #
+      # See <tt>symbolized_path_parameters</tt> for symbolized keys.
+      def path_parameters
+        @env["action_dispatch.request.path_parameters"] ||= {}
+      end
+  
+    private
+
+      # Convert nested Hashs to HashWithIndifferentAccess
+      def normalize_parameters(value)
+        case value
+        when Hash
+          h = {}
+          value.each { |k, v| h[k] = normalize_parameters(v) }
+          h.with_indifferent_access
+        when Array
+          value.map { |e| normalize_parameters(e) }
+        else
+          value
+        end
+      end
+    end
+  end
+end
\ No newline at end of file