Permalink
Browse files

Fixed component method names

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8fff238 commit 8838020ac445093212787cf01ff253c401ad1744 @dhh dhh committed Feb 22, 2005
Showing with 6 additions and 6 deletions.
  1. +6 −6 actionpack/lib/action_controller/components.rb
@@ -24,23 +24,23 @@ def render_component(options = {}) #:doc:
private
def component_response(options, reuse_response = false)
- component_class(options).process(component_request(options), reuse_response ? @response : component_response)
+ component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component)
end
def component_class(options)
options[:controller] ? (options[:controller].camelize + "Controller").constantize : self.class
end
- def component_request(options)
- component_request = Marshal::load(Marshal::dump(@request))
- component_request.send(
+ def request_for_component(options)
+ request_for_component = Marshal::load(Marshal::dump(@request))
+ request_for_component.send(
:instance_variable_set, :@parameters,
(options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action] })
)
- return component_request
+ return request_for_component
end
- def component_response
+ def response_for_component
Marshal::load(Marshal::dump(@response))
end
end

0 comments on commit 8838020

Please sign in to comment.