diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-29 20:54:57 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-29 20:54:57 -0700 |
| commit | f09ae8538f3625468ee175d5a4d9782e0d5ba415 (patch) | |
| tree | 3ecf2b0f15ecf191b8fc413a7c280b6876f8f0d3 | |
| parent | 12e5c727aea3975d2108a66571dc13a5b2a0e651 (diff) | |
| parent | 2f71d4063f17e25310939f81246ada0accff0342 (diff) | |
| download | rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.gz rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.tar.bz2 rails-f09ae8538f3625468ee175d5a4d9782e0d5ba415.zip | |
Merge pull request #6519 from oscardelben/3-2-stable
Display annotations in coffee files
| -rw-r--r-- | railties/lib/rails/source_annotation_extractor.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/rake/notes_test.rb | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb index 2286e0477a..2e5f148862 100644 --- a/railties/lib/rails/source_annotation_extractor.rb +++ b/railties/lib/rails/source_annotation_extractor.rb @@ -53,7 +53,7 @@ class SourceAnnotationExtractor # Returns a hash that maps filenames under +dir+ (recursively) to arrays # 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. def find_in(dir) results = {} @@ -63,7 +63,7 @@ class SourceAnnotationExtractor if File.directory?(item) results.update(find_in(item)) - elsif item =~ /\.(builder|rb)$/ + elsif item =~ /\.(builder|rb|coffee)$/ results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) elsif item =~ /\.erb$/ results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb index 659cbfec0f..dd401009f7 100644 --- a/railties/test/application/rake/notes_test.rb +++ b/railties/test/application/rake/notes_test.rb @@ -7,7 +7,7 @@ module ApplicationTests build_app require "rails/all" end - + def teardown teardown_app end @@ -17,6 +17,8 @@ module ApplicationTests 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.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" boot_rails require 'rake' @@ -24,17 +26,19 @@ module ApplicationTests require 'rake/testtask' Rails.application.load_tasks - + Dir.chdir(app_path) do output = `bundle exec rake notes` - + assert_match /note in erb/, output assert_match /note in haml/, output assert_match /note in slim/, output + assert_match /note in ruby/, output + assert_match /note in coffee/, output end - + end - + private def boot_rails super |