Merge remote branch 'mikel/master'

6 files changed, 95 insertions, 30 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 725d8fb8fc..2c2ef16622 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -10,6 +10,7 @@ module AbstractController
 
   autoload :Base
   autoload :Callbacks
+  autoload :Collector
   autoload :Helpers
   autoload :Layouts
   autoload :LocalizedCache
diff --git a/actionpack/lib/abstract_controller/collector.rb b/actionpack/lib/abstract_controller/collector.rb
new file mode 100644
index 0000000000..d429333661
--- /dev/null
+++ b/actionpack/lib/abstract_controller/collector.rb
@@ -0,0 +1,30 @@
+module AbstractController
+  module Collector
+    def self.generate_method_for_mime(mime)
+      sym = mime.is_a?(Symbol) ? mime : mime.to_sym
+      const = sym.to_s.upcase
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{sym}(*args, &block)                # def html(*args, &block)
+          custom(Mime::#{const}, *args, &block)  #   custom(Mime::HTML, *args, &block)
+        end                                      # end
+      RUBY
+    end
+
+    Mime::SET.each do |mime|
+      generate_method_for_mime(mime)
+    end
+
+  protected
+
+    def method_missing(symbol, &block)
+      mime_constant = Mime.const_get(symbol.to_s.upcase)
+
+      if Mime::SET.include?(mime_constant)
+        AbstractController::Collector.generate_method_for_mime(mime_constant)
+        send(symbol, &block)
+      else
+        super
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index a168b1b4c5..1dec3f2c3e 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -41,10 +41,6 @@ module AbstractController
     # Mostly abstracts the fact that calling render twice is a DoubleRenderError.
     # Delegates render_to_body and sticks the result in self.response_body.
     def render(*args, &block)
-      if response_body
-        raise AbstractController::DoubleRenderError
-      end
-
       options = _normalize_options(*args, &block)
       self.response_body = render_to_body(options)
     end
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 4c02677729..08599d660e 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -1,3 +1,5 @@
+require 'abstract_controller/collector'
+
 module ActionController #:nodoc:
   module MimeResponds #:nodoc:
     extend ActiveSupport::Concern
@@ -265,6 +267,7 @@ module ActionController #:nodoc:
     end
 
     class Collector #:nodoc:
+      include AbstractController::Collector
       attr_accessor :order
 
       def initialize(&block)
@@ -289,32 +292,6 @@ module ActionController #:nodoc:
       def response_for(mime)
         @responses[mime] || @responses[Mime::ALL] || @default_response
       end
-
-      def self.generate_method_for_mime(mime)
-        sym = mime.is_a?(Symbol) ? mime : mime.to_sym
-        const = sym.to_s.upcase
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{sym}(&block)                # def html(&block)
-            custom(Mime::#{const}, &block)  #   custom(Mime::HTML, &block)
-          end                               # end
-        RUBY
-      end
-
-      Mime::SET.each do |mime|
-        generate_method_for_mime(mime)
-      end
-
-      def method_missing(symbol, &block)
-        mime_constant = Mime.const_get(symbol.to_s.upcase)
-
-        if Mime::SET.include?(mime_constant)
-          self.class.generate_method_for_mime(mime_constant)
-          send(symbol, &block)
-        else
-          super
-        end
-      end
-
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 72e2bbd00e..8f03035b2b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -13,6 +13,10 @@ module ActionController
     end
 
     def render(*args)
+      if response_body
+        raise ::AbstractController::DoubleRenderError
+      end
+
       args << {} unless args.last.is_a?(Hash)
       super(*args)
       self.content_type ||= args.last[:_template].mime_type.to_s
diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
new file mode 100644
index 0000000000..2ebcebbbb7
--- /dev/null
+++ b/actionpack/test/abstract/collector_test.rb
@@ -0,0 +1,57 @@
+require 'abstract_unit'
+
+module AbstractController
+  module Testing
+    class MyCollector
+      include Collector
+      attr_accessor :responses
+
+      def initialize
+        @responses = []
+      end
+
+      def custom(mime, *args, &block)
+        @responses << [mime, args, block]
+      end
+    end
+
+    class TestCollector < ActiveSupport::TestCase
+      test "responds to default mime types" do
+        collector = MyCollector.new
+        assert_respond_to collector, :html
+        assert_respond_to collector, :text
+      end
+
+      test "does not respond to unknown mime types" do
+        collector = MyCollector.new
+        assert !collector.respond_to?(:unknown)
+      end
+
+      test "register mime types on method missing" do
+        AbstractController::Collector.send(:remove_method, :js)
+        collector = MyCollector.new
+        assert !collector.respond_to?(:js)
+        collector.js
+        assert_respond_to collector, :js
+      end
+
+      test "does not register unknown mime types" do
+        collector = MyCollector.new
+        assert_raise NameError do
+          collector.unknown
+        end
+      end
+
+      test "generated methods call custom with args received" do
+        collector = MyCollector.new
+        collector.html
+        collector.text(:foo)
+        collector.js(:bar) { :baz }
+        assert_equal [Mime::HTML, [], nil], collector.responses[0]
+        assert_equal [Mime::TEXT, [:foo], nil], collector.responses[1]
+        assert_equal [Mime::JS, [:bar]], collector.responses[2][0,2]
+        assert_equal :baz, collector.responses[2][2].call
+      end
+    end
+  end
+end
\ No newline at end of file