diff options
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/mailer.rb | 2 | ||||
| -rw-r--r-- | actionpack/README.rdoc | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/atom_feed_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/atom_feed_helper_test.rb | 18 |
5 files changed, 16 insertions, 16 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index af9bf40f9e..2806531dfa 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -102,7 +102,7 @@ Example: ) if email.has_attachments? - for attachment in email.attachments + email.attachments.each do |attachment| page.attachments.create({ :file => attachment, :description => email.subject }) diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index 88b074cef5..aaa1f79732 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -1,7 +1,7 @@ <% module_namespacing do -%> class <%= class_name %> < ActionMailer::Base default <%= key_value :from, '"from@example.com"' %> -<% for action in actions -%> +<% actions.each do |action| -%> # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc index 2f3678881d..5919b5c6d4 100644 --- a/actionpack/README.rdoc +++ b/actionpack/README.rdoc @@ -58,7 +58,7 @@ A short rundown of some of the major features: * ERB templates (static content mixed with dynamic output from ruby) - <% for post in @posts %> + <% @posts.each do |post| %> Title: <%= post.title %> <% end %> @@ -81,7 +81,7 @@ A short rundown of some of the major features: xml.language "en-us" xml.ttl "40" - for item in @recent_items + @recent_items.each do |item| xml.item do xml.title(item_title(item)) xml.description(item_description(item)) @@ -293,7 +293,7 @@ And the templates look like this: </body></html> weblog/index.html.erb: - <% for post in @posts %> + <% @posts.each do |post| %> <p><%= link_to(post.title, :action => "show", :id => post.id) %></p> <% end %> diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb index 889ea8a763..a087688a2c 100644 --- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb +++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb @@ -34,7 +34,7 @@ module ActionView # feed.title("My great blog!") # feed.updated(@posts.first.created_at) # - # for post in @posts + # @posts.each do |post| # feed.entry(post) do |entry| # entry.title(post.title) # entry.content(post.body, :type => 'html') @@ -66,7 +66,7 @@ module ActionView # feed.updated((@posts.first.created_at)) # feed.tag!(openSearch:totalResults, 10) # - # for post in @posts + # @posts.each do |post| # feed.entry(post) do |entry| # entry.title(post.title) # entry.content(post.body, :type => 'html') diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb index 36102bbc4f..81d7444cf8 100644 --- a/actionpack/test/template/atom_feed_helper_test.rb +++ b/actionpack/test/template/atom_feed_helper_test.rb @@ -16,7 +16,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -33,7 +33,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param.to_s, :updated => Time.utc(2007, 1, scroll.id)) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -54,7 +54,7 @@ class ScrollsController < ActionController::Base author.name("DHH") end - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param.to_s, :updated => Time.utc(2007, 1, scroll.id)) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -68,7 +68,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -86,7 +86,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll, :id => "tag:test.rubyonrails.org,2008:"+scroll.id.to_s) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -105,7 +105,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -123,7 +123,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') @@ -140,7 +140,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.summary(:type => 'xhtml') do |xhtml| @@ -165,7 +165,7 @@ class ScrollsController < ActionController::Base feed.title("My great blog!") feed.updated((@scrolls.first.created_at)) - for scroll in @scrolls + @scrolls.each do |scroll| feed.entry(scroll) do |entry| entry.title(scroll.title) entry.content(scroll.body, :type => 'html') |