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

6 files changed, 19 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 90648c37ad..8fd8f4797c 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -2,6 +2,9 @@ module ActionController
   class ActionControllerError < StandardError #:nodoc:
   end
 
+  class BadRequest < ActionControllerError #:nodoc:
+  end
+
   class RenderError < ActionControllerError #:nodoc:
   end
 
@@ -38,7 +41,7 @@ module ActionController
 
   class UnknownHttpMethod < ActionControllerError #:nodoc:
   end
-  
+
   class UnknownFormat < ActionControllerError #:nodoc:
   end
 end
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 598bc6c5cb..86d061e3b7 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -47,6 +47,7 @@ module ActionController
   #
   #   23 Aug 11:30 | Carolina Railhawks Soccer Match
   #   N/A | Carolina Railhaws Training Workshop
+  #
   module Helpers
     extend ActiveSupport::Concern
 
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index d9fc777250..0b800c3c62 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -52,6 +52,7 @@ module ActionController #:nodoc:
       end
 
       # Clear all mime types in <tt>respond_to</tt>.
+      #
       def clear_respond_to
         self.mimes_for_respond_to = Hash.new.freeze
       end
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 1f52c164de..aa67fa7f23 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -193,7 +193,8 @@ module ActionController
     def process_action(*args)
       if _wrapper_enabled?
         wrapped_hash = _wrap_parameters request.request_parameters
-        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
+        wrapped_keys = request.request_parameters.keys
+        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
 
         # This will make the wrapped hash accessible from controller and view
         request.parameters.merge! wrapped_hash
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 5aa3b2ca15..83407846dc 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -142,11 +142,13 @@ module ActionController #:nodoc:
 
     # Initializes a new responder an invoke the proper format. If the format is
     # not defined, call to_format.
+    #
     def self.call(*args)
       new(*args).respond
     end
 
     # Main entry point for responder responsible to dispatch to the proper format.
+    #
     def respond
       method = "to_#{format}"
       respond_to?(method) ? send(method) : to_format
@@ -154,6 +156,7 @@ module ActionController #:nodoc:
 
     # HTML format does not render the resource, it always attempt to render a
     # template.
+    #
     def to_html
       default_render
     rescue ActionView::MissingTemplate => e
@@ -168,6 +171,7 @@ module ActionController #:nodoc:
     # All other formats follow the procedure below. First we try to render a
     # template, if the template is not available, we verify if the resource
     # responds to :to_format and display it.
+    #
     def to_format
       if get? || !has_errors? || response_overridden?
         default_render
@@ -205,12 +209,14 @@ module ActionController #:nodoc:
     end
 
     # Checks whether the resource responds to the current format or not.
+    #
     def resourceful?
       resource.respond_to?("to_#{format}")
     end
 
     # Returns the resource location by retrieving it from the options or
     # returning the resources array.
+    #
     def resource_location
       options[:location] || resources
     end
@@ -219,6 +225,7 @@ module ActionController #:nodoc:
 
     # If a response block was given, use it, otherwise call render on
     # controller.
+    #
     def default_render
       if @default_response
         @default_response.call(options)
@@ -243,6 +250,7 @@ module ActionController #:nodoc:
     # Results in:
     #
     #   render :xml => @user, :status => :created
+    #
     def display(resource, given_options={})
       controller.render given_options.merge!(options).merge!(format => resource)
     end
@@ -252,12 +260,14 @@ module ActionController #:nodoc:
     end
 
     # Check whether the resource has errors.
+    #
     def has_errors?
       resource.respond_to?(:errors) && !resource.errors.empty?
     end
 
     # By default, render the <code>:edit</code> action for HTML requests with errors, unless
     # the verb was POST.
+    #
     def default_action
       @action ||= DEFAULT_ACTIONS_FOR_VERBS[request.request_method_symbol]
     end
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 0c3caa9514..eeb37db2e7 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -194,6 +194,7 @@ module ActionController #:nodoc:
   # ==== Passenger
   #
   # To be described.
+  #
   module Streaming
     extend ActiveSupport::Concern