Changeset 4755

Timestamp:

08/13/06 04:15:22 (2 years ago)

Author:

ulysses

Message:

Invoke method_missing directly for hidden actions. Closes #3030.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/base_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
-
-* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading.  [Rick Olson]

trunk/actionpack/lib/action_controller/base.rb

@@ -975 +975 @@
-        end
-      end
-
+  
-      def perform_action
- || self.class.action_methods.include?('method_missing')
+
-          send(action_name)
+          render unless performed?
+        elsif respond_to? :method_missing
+          send(:method_missing, action_name)
-          render unless performed?
-        elsif template_exists? && template_public?

trunk/actionpack/test/controller/base_test.rb

@@ -13 +13 @@
-    hide_action :hidden_action
-    def hidden_action
+      raise "Noooo!"
-    end
-    
@@ -32 +33 @@
-  def hidden_action
-  end
+end
+
+class MethodMissingController < ActionController::Base
+  
+  hide_action :shouldnt_be_called
+  def shouldnt_be_called
+    raise "NO WAY!"
+  end
+  
+protected
+  
+  def method_missing(selector)
+    render :text => selector.to_s
+  end
+  
-end
-
@@ -65 +81 @@
-    end
-  end
+  
-end
+
+
+class PerformActionTest < Test::Unit::TestCase
+  def use_controller(controller_class)
+    @controller = controller_class.new
+
+    # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
+    # a more accurate simulation of what happens in "real life".
+    @controller.logger = Logger.new(nil)
+
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @request.host = "www.nextangle.com"
+  end
+  
+  def test_get_on_priv_should_show_selector
+    use_controller MethodMissingController
+    get :shouldnt_be_called
+    assert_response :success
+    assert_equal 'shouldnt_be_called', @response.body
+  end
+  
+  def test_method_missing_is_not_an_action_name
+    use_controller MethodMissingController
+    assert ! @controller.send(:action_methods).include?('method_missing')
+    
+    get :method_missing
+    assert_response :success
+    assert_equal 'method_missing', @response.body
+  end
+  
+  def test_get_on_hidden_should_fail
+    use_controller NonEmptyController
+    get :hidden_action
+    assert_response 404
+    
+    get :another_hidden_action
+    assert_response 404
+  end
+end