Permalink
Browse files

Update README

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4307 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c745f47 commit 0049bd729f71c804b4c930e38269aa5a40cca158 Marcel Molina committed Apr 29, 2006
Showing with 23 additions and 21 deletions.
  1. +5 −5 actionpack/README
  2. +18 −16 actionpack/lib/action_controller/base.rb
View
10 actionpack/README
@@ -139,7 +139,7 @@ A short rundown of the major features:
end
Layout file (called weblog_layout):
- <html><body><%= @content_for_layout %></body></html>
+ <html><body><%= yield %></body></html>
Template for hello_world action:
<h1>Hello world</h1>
@@ -155,7 +155,7 @@ A short rundown of the major features:
map.connect 'clients/:client_name/:project_name/:controller/:action'
Accessing /clients/37signals/basecamp/project/dash calls ProjectController#dash with
- { "client_name" => "37signals", "project_name" => "basecamp" } in @params["params"]
+ { "client_name" => "37signals", "project_name" => "basecamp" } in params[:params]
From that URL, you can rewrite the redirect in a number of ways:
@@ -338,7 +338,7 @@ A short rundown of the major features:
<input type="submit" value="Create">
</form>
- This form generates a @params["post"] array that can be used directly in a save action:
+ This form generates a params[:post] array that can be used directly in a save action:
class WeblogController < ActionController::Base
def save
@@ -370,7 +370,7 @@ methods:
end
def display
- @post = Post.find(:params[:id])
+ @post = Post.find(params[:id])
end
def new
@@ -394,7 +394,7 @@ And the templates look like this:
weblog/layout.rhtml:
<html><body>
- <%= @content_for_layout %>
+ <%= yield %>
</body></html>
weblog/index.rhtml:
View
34 actionpack/lib/action_controller/base.rb
@@ -373,24 +373,26 @@ def hide_action(*names)
def filter_parameter_logging(*filter_words, &block)
parameter_filter = Regexp.new(filter_words.collect{ |s| s.to_s }.join('|'), true) if filter_words.length > 0
- define_method(:filter_parameters) do |unfiltered_parameters|
- filtered_parameters = {}
-
- unfiltered_parameters.each do |key, value|
- if key =~ parameter_filter
- filtered_parameters[key] = '[FILTERED]'
- elsif value.is_a?(Hash)
- filtered_parameters[key] = filter_parameters(value)
- elsif block_given?
- key, value = key.dup, value.dup
- yield key, value
- filtered_parameters[key] = value
- else
- filtered_parameters[key] = value
+ class << self
+ define_method(:filter_parameters) do |unfiltered_parameters|
+ filtered_parameters = {}
+
+ unfiltered_parameters.each do |key, value|
+ if key =~ parameter_filter
+ filtered_parameters[key] = '[FILTERED]'
+ elsif value.is_a?(Hash)
+ filtered_parameters[key] = filter_parameters(value)
+ elsif block_given?
+ key, value = key.dup, value.dup
+ yield key, value
+ filtered_parameters[key] = value
+ else
+ filtered_parameters[key] = value
+ end
end
- end
- filtered_parameters
+ filtered_parameters
+ end
end
end
end

0 comments on commit 0049bd7

Please sign in to comment.