Changeset 3158

Timestamp:

11/22/05 08:41:59 (3 years ago)

Author:

marcel

Message:

Apply [3157] to stable. Make ActionController's render honor the :locals option when rendering a :file. Closes #1665.

Files:

• branches/stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/stable/actionpack/lib/action_controller/base.rb (modified) (3 diffs)
• branches/stable/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)
• branches/stable/actionpack/test/fixtures/test/render_file_with_ivar.rhtml (added)
• branches/stable/actionpack/test/fixtures/test/render_file_with_locals.rhtml (added)

branches/stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.]
-
-* Strip out trailing &_= for raw post bodies. Closes #2868. [Sam Stephenson]

branches/stable/actionpack/lib/action_controller/base.rb

@@ -460 +460 @@
-      end
-
+      def session_enabled?
+        request.session_options[:disabled] != false
+      end
+
-    protected
-      # Renders the content that will be returned to the browser as the response body.
@@ -597 +601 @@
-        else
-          if file = options[:file]
-
+, options[:locals] || {}
-
-          elsif template = options[:template]
@@ -645 +649 @@
-      end
-
-
+, locals = {}
-        add_variables_to_assigns
-        assert_existance_of_template_file(template_path) if use_full_path
-        logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger
-
+, locals
-      end
-

branches/stable/actionpack/test/controller/new_render_test.rb

@@ -43 +43 @@
-  def render_custom_code
-    render :text => "hello world", :status => "404 Moved"
+  end
+
+  def render_file_with_instance_variables
+    @secret = 'in the sauce'
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.rhtml')
+    render :file => path
+  end
+
+  def render_file_with_locals
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.rhtml')
+    render :file => path, :locals => {:secret => 'in the sauce'} 
+  end
+
+  def render_file_not_using_full_path
+    @secret = 'in the sauce'
+    render :file => 'test/render_file_with_ivar', :use_full_path => true
-  end
-  
@@ -243 +259 @@
-  end
-
+  def test_render_file_with_instance_variables
+    get :render_file_with_instance_variables
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
+  def test_render_file_not_using_full_path
+    get :render_file_not_using_full_path 
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
+  def test_render_file_with_locals
+    get :render_file_with_locals
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
-  def test_attempt_to_access_object_method
-    assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }