diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-29 11:30:37 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-29 11:30:37 -0800 |
| commit | dfa0c36204beb1b519962a6a49a1ebbed91015dd (patch) | |
| tree | 2794ed0b8dd33458d2509ddd974519df9f561c8b /actionpack | |
| parent | 677e06c20f6df6c44f44af9ba95390558e67a9bc (diff) | |
| parent | bf928bc7329640969917eb680da4de959b7156b7 (diff) | |
| download | rails-dfa0c36204beb1b519962a6a49a1ebbed91015dd.tar.gz rails-dfa0c36204beb1b519962a6a49a1ebbed91015dd.tar.bz2 rails-dfa0c36204beb1b519962a6a49a1ebbed91015dd.zip | |
Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables
Replaced all 'for' loops with Enumerable#each
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/Rakefile | 16 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/selector.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/fixtures/developers.yml | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index effb6badfc..bb1e704767 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -55,15 +55,15 @@ end task :lines do lines, codelines, total_lines, total_codelines = 0, 0, 0, 0 - for file_name in FileList["lib/**/*.rb"] + FileList["lib/**/*.rb"].each do |file_name| next if file_name =~ /vendor/ - f = File.open(file_name) - - while line = f.gets - lines += 1 - next if line =~ /^\s*$/ - next if line =~ /^\s*#/ - codelines += 1 + File.open(file_name, 'r') do |f| + while line = f.gets + lines += 1 + next if line =~ /^\s*$/ + next if line =~ /^\s*#/ + codelines += 1 + end end puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}" diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb index 4d963803e6..33796008bd 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb @@ -417,8 +417,8 @@ module ActionDispatch deliveries = ActionMailer::Base.deliveries assert !deliveries.empty?, "No e-mail in delivery list" - for delivery in deliveries - for part in (delivery.parts.empty? ? [delivery] : delivery.parts) + deliveries.each do |delivery| + (delivery.parts.empty? ? [delivery] : delivery.parts).each do |part| if part["Content-Type"].to_s =~ /^text\/html\W/ root = HTML::Document.new(part.body.to_s).root assert_select root, ":root", &block diff --git a/actionpack/test/fixtures/developers.yml b/actionpack/test/fixtures/developers.yml index 308bf75de2..3656564f63 100644 --- a/actionpack/test/fixtures/developers.yml +++ b/actionpack/test/fixtures/developers.yml @@ -8,7 +8,7 @@ jamis: name: Jamis salary: 150000 -<% for digit in 3..10 %> +<% (3..10).each do |digit| %> dev_<%= digit %>: id: <%= digit %> name: fixture_<%= digit %> |