diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/lib/tasks/annotations.rake | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index b726937f4e..7e36909749 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,8 @@ *SVN* -* Remove web_service generator. [Koz] +* Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg] + +* Removed web_service generator [Koz] * Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [fcheung]. Example: diff --git a/railties/lib/tasks/annotations.rake b/railties/lib/tasks/annotations.rake index 20ccad6d7b..80fe202588 100644 --- a/railties/lib/tasks/annotations.rake +++ b/railties/lib/tasks/annotations.rake @@ -30,9 +30,9 @@ class SourceAnnotationExtractor if File.directory?(item) results.update(find_in(item)) - elsif item =~ /\.r(?:b|xml|js)$/ + elsif item =~ /\.(builder|(r(?:b|xml|js)))$/ results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) - elsif item =~ /\.rhtml$/ + elsif item =~ /\.(rhtml|erb)$/ results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) end end |