Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a little more work!

This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing
changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997.

2 files changed, 10 insertions, 28 deletions

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index e762ea60a5..b47abb8b8c 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -215,7 +215,7 @@ module ActionController #:nodoc:
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
 
       if collector = retrieve_collector_from_mimes(mimes, &block)
-        response = collector.response
+        response = collector.response(request.variant)
         response ? response.call : render({})
       end
     end
@@ -357,7 +357,7 @@ module ActionController #:nodoc:
       if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
         options = options.clone
-        options[:default_response] = collector.response
+        options[:default_response] = collector.response(request.variant)
         (options.delete(:responder) || self.class.responder).call(self, resources, options)
       end
     end
@@ -390,7 +390,7 @@ module ActionController #:nodoc:
     # is available.
     def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
       mimes ||= collect_mimes_from_class_level
-      collector = Collector.new(mimes, request.variant)
+      collector = Collector.new(mimes)
       block.call(collector) if block_given?
       format = collector.negotiate_format(request)
 
@@ -428,11 +428,9 @@ module ActionController #:nodoc:
       include AbstractController::Collector
       attr_accessor :format
 
-      def initialize(mimes, variant = nil)
+      def initialize(mimes)
         @responses = {}
-        @variant = variant
-
-        mimes.each { |mime| @responses["Mime::#{mime.upcase}".constantize] = nil }
+        mimes.each { |mime| send(mime) }
       end
 
       def any(*args, &block)
@@ -446,19 +444,15 @@ module ActionController #:nodoc:
 
       def custom(mime_type, &block)
         mime_type = Mime::Type.lookup(mime_type.to_s) unless mime_type.is_a?(Mime::Type)
-        @responses[mime_type] ||= if block_given?
-          block
-        else
-          VariantFilter.new(@variant)
-        end
+        @responses[mime_type] ||= block
       end
 
-      def response
+      def response(variant)
         response = @responses.fetch(format, @responses[Mime::ALL])
-        if response.is_a?(VariantFilter) || response.nil? || response.arity == 0
+        if response.nil? || response.arity == 0
           response
         else
-          lambda { response.call VariantFilter.new(@variant) }
+          lambda { response.call VariantFilter.new(variant) }
         end
       end
 
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index 0bac86977a..c258bbec06 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -175,12 +175,6 @@ class RespondToController < ActionController::Base
     end
   end
 
-  def variant_inline_syntax
-    respond_to do |format|
-      format.html.phone { render text: "phone" }
-    end
-  end
-
   protected
     def set_layout
       case action_name
@@ -560,16 +554,10 @@ class RespondToControllerTest < ActionController::TestCase
     assert_equal "tablet", @response.body
   end
 
+
   def test_no_variant_in_variant_setup
     get :variant_plus_none_for_format
     assert_equal "text/html", @response.content_type
     assert_equal "none", @response.body
   end
-
-  def test_variant_inline_syntax
-    @request.variant = :phone
-    get :variant_inline_syntax
-    assert_equal "text/html", @response.content_type
-    assert_equal "phone", @response.body
-  end
 end