aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-04-11 16:44:10 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-04-11 16:46:46 -0700
commit13e784978571b341a2783f95c1a26f4d2d4fd68e (patch)
tree8dc79b3f51382e1d11956d1621e22fcadda7c753 /actionpack/lib/action_controller
parent4364c361b599f99bc2345ce4eb2d145b07ed8a0f (diff)
downloadrails-13e784978571b341a2783f95c1a26f4d2d4fd68e.tar.gz
rails-13e784978571b341a2783f95c1a26f4d2d4fd68e.tar.bz2
rails-13e784978571b341a2783f95c1a26f4d2d4fd68e.zip
Ruby 1.9 compat: workaround module_eval issue
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/components.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb
index 7f7ecfff78..8275bd380a 100644
--- a/actionpack/lib/action_controller/components.rb
+++ b/actionpack/lib/action_controller/components.rb
@@ -39,12 +39,7 @@ module ActionController #:nodoc:
base.class_eval do
include InstanceMethods
extend ClassMethods
-
- helper do
- def render_component(options)
- @controller.send!(:render_component_as_string, options)
- end
- end
+ helper HelperMethods
# If this controller was instantiated to process a component request,
# +parent_controller+ points to the instantiator of this controller.
@@ -67,6 +62,12 @@ module ActionController #:nodoc:
end
end
+ module HelperMethods
+ def render_component(options)
+ @controller.send!(:render_component_as_string, options)
+ end
+ end
+
module InstanceMethods
# Extracts the action_name from the request parameters and performs that action.
def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc: