Fixes rake annotations to search erb and builder files as well (closes …

…#9150) [m.langenberg]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7553 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/lib/active_support/dependencies.rb

@@ -383,7 +383,7 @@ def new_constants_in(*descs)
 
   class LoadingModule #:nodoc:
     # Old style environment.rb referenced this method directly.  Please note, it doesn't
-    # actualy *do* anything any more.
+    # actually *do* anything any more.
     def self.root(*args)
       if defined?(RAILS_DEFAULT_LOGGER)
         RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."

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:
 

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