From 86754a8f7b4986323aae3be172330fbc228c27ab Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Tue, 22 Nov 2016 22:22:34 +0100
Subject: Use accept header instead of mangling request path.

Instead of appending a format to the request, it's much better
to just pass a more appropriate accept header. Rails will figure
out the format from that instead.

This allows devs to use `:as` on routes that don't have a format.

Introduce an `IdentityEncoder` to avoid `if request_encoder`,
essentially a better version of the purpose of the `WWWFormEncoder`.
One that makes conceptual sense on GET requests too.

Fixes #27144.
---
 .../lib/action_dispatch/testing/integration.rb     | 10 +++----
 .../lib/action_dispatch/testing/request_encoder.rb | 31 +++++++++++-----------
 2 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index a1c2a8858a..c60395acf9 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -211,7 +211,7 @@ module ActionDispatch
         end
 
         if path =~ %r{://}
-          path = build_expanded_path(path, request_encoder) do |location|
+          path = build_expanded_path(path) do |location|
             https! URI::HTTPS === location if location.scheme
 
             if url_host = location.host
@@ -220,8 +220,6 @@ module ActionDispatch
               host! url_host
             end
           end
-        elsif as
-          path = build_expanded_path(path, request_encoder)
         end
 
         hostname, port = host.split(":")
@@ -239,7 +237,7 @@ module ActionDispatch
           "HTTP_HOST"      => host,
           "REMOTE_ADDR"    => remote_addr,
           "CONTENT_TYPE"   => request_encoder.content_type,
-          "HTTP_ACCEPT"    => accept
+          "HTTP_ACCEPT"    => request_encoder.accept_header || accept
         }
 
         wrapped_headers = Http::Headers.from_hash({})
@@ -291,10 +289,10 @@ module ActionDispatch
           "#{env['rack.url_scheme']}://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{path}"
         end
 
-        def build_expanded_path(path, request_encoder)
+        def build_expanded_path(path)
           location = URI.parse(path)
           yield location if block_given?
-          path = request_encoder.append_format_to location.path
+          path = location.path
           location.query ? "#{path}?#{location.query}" : path
         end
     end
diff --git a/actionpack/lib/action_dispatch/testing/request_encoder.rb b/actionpack/lib/action_dispatch/testing/request_encoder.rb
index b0b994b2d0..734fc8cb54 100644
--- a/actionpack/lib/action_dispatch/testing/request_encoder.rb
+++ b/actionpack/lib/action_dispatch/testing/request_encoder.rb
@@ -1,10 +1,17 @@
 module ActionDispatch
   class RequestEncoder # :nodoc:
-    @encoders = {}
+    class IdentityEncoder
+      def content_type; end
+      def accept_header; end
+      def encode_params(params); params; end
+      def response_parser; -> body { body }; end
+    end
+
+    @encoders = { identity: IdentityEncoder.new }
 
     attr_reader :response_parser
 
-    def initialize(mime_name, param_encoder, response_parser, url_encoded_form = false)
+    def initialize(mime_name, param_encoder, response_parser = nil)
       @mime = Mime[mime_name]
 
       unless @mime
@@ -12,21 +19,15 @@ module ActionDispatch
           "unregistered MIME Type: #{mime_name}. See `Mime::Type.register`."
       end
 
-      @url_encoded_form = url_encoded_form
-      @path_format      = ".#{@mime.symbol}" unless @url_encoded_form
-      @response_parser  = response_parser || -> body { body }
-      @param_encoder    = param_encoder   || :"to_#{@mime.symbol}".to_proc
+      @response_parser = response_parser || -> body { body }
+      @param_encoder   = param_encoder   || :"to_#{@mime.symbol}".to_proc
     end
 
-    def append_format_to(path)
-      if @url_encoded_form
-        path
-      else
-        path + @path_format
-      end
+    def content_type
+      @mime.to_s
     end
 
-    def content_type
+    def accept_header
       @mime.to_s
     end
 
@@ -40,7 +41,7 @@ module ActionDispatch
     end
 
     def self.encoder(name)
-      @encoders[name] || WWWFormEncoder
+      @encoders[name] || @encoders[:identity]
     end
 
     def self.register_encoder(mime_name, param_encoder: nil, response_parser: nil)
@@ -48,7 +49,5 @@ module ActionDispatch
     end
 
     register_encoder :json, response_parser: -> body { JSON.parse(body) }
-
-    WWWFormEncoder = new(:url_encoded_form, -> params { params }, nil, true)
   end
 end
-- 
cgit v1.2.3