kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #4892 from bkzl/master

Browse source 
Display annotations from .coffee files in `rake notes`
This commit is contained in:
José Valim 2012-02-05 08:02:35 -08:00
commit d36cfe2244
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/lib/rails/source_annotation_extractor.rb
View file

@ -53,7 +53,7 @@ class SourceAnnotationExtractor
# Returns a hash that maps filenames under +dir+ (recursively) to arrays # Returns a hash that maps filenames under +dir+ (recursively) to arrays
# with their annotations. Only files with annotations are included, and only # with their annotations. Only files with annotations are included, and only
# those with extension +.builder+, +.rb+, +.erb+, +.haml+ and +.slim+ # those with extension +.builder+, +.rb+, +.erb+, +.haml+, +.slim+ and +.coffee+
# are taken into account. # are taken into account.
def find_in(dir) def find_in(dir)
results = {} results = {}
@ -63,7 +63,7 @@ class SourceAnnotationExtractor
if File.directory?(item) if File.directory?(item)
results.update(find_in(item)) results.update(find_in(item))
elsif item =~ /\.(builder|rb)$/ elsif item =~ /\.(builder|rb|coffee)$/
results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
elsif item =~ /\.erb$/ elsif item =~ /\.erb$/
results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))

22
railties/test/application/rake/notes_test.rb
View file

@ -7,7 +7,7 @@ module ApplicationTests
build_app build_app
require "rails/all" require "rails/all"
end end
def teardown def teardown
teardown_app teardown_app
end end
@ -17,6 +17,7 @@ module ApplicationTests
app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>" app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>"
app_file "app/views/home/index.html.haml", "-# TODO: note in haml" app_file "app/views/home/index.html.haml", "-# TODO: note in haml"
app_file "app/views/home/index.html.slim", "/ TODO: note in slim" app_file "app/views/home/index.html.slim", "/ TODO: note in slim"
app_file "app/assets/javascripts/application.js.coffee", "# TODO: note in coffee"
app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby" app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
boot_rails boot_rails
@ -25,25 +26,26 @@ module ApplicationTests
require 'rake/testtask' require 'rake/testtask'
Rails.application.load_tasks Rails.application.load_tasks
Dir.chdir(app_path) do Dir.chdir(app_path) do
output = `bundle exec rake notes` output = `bundle exec rake notes`
lines = output.scan(/\[([0-9\s]+)\]/).flatten lines = output.scan(/\[([0-9\s]+)\]/).flatten
assert_match /note in erb/, output assert_match /note in erb/, output
assert_match /note in haml/, output assert_match /note in haml/, output
assert_match /note in slim/, output assert_match /note in slim/, output
assert_match /note in ruby/, output assert_match /note in ruby/, output
assert_match /note in coffee/, output
assert_equal 4, lines.size assert_equal 5, lines.size
assert_equal 4, lines[0].size
assert_equal 4, lines[1].size lines.each do |line_number|
assert_equal 4, lines[2].size assert_equal 4, line_number.size
assert_equal 4, lines[3].size end
end end
end end
private private
def boot_rails def boot_rails
super super