improved code stats calculation, check on multiline comments and rewrite regexps according to a class naming convention

1 files changed, 14 insertions, 3 deletions

diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index e6822b75b7..435ea83ad8 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -38,11 +38,22 @@ class CodeStatistics #:nodoc:
         next unless file_name =~ pattern
 
         f = File.open(directory + "/" + file_name)
-
+        comment_started = false
         while line = f.gets
           stats["lines"]     += 1
-          stats["classes"]   += 1 if line =~ /class [A-Z]/
-          stats["methods"]   += 1 if line =~ /def [a-z]/
+          if(comment_started)
+            if line =~ /^=end/
+              comment_started = false
+            end
+            next
+          else
+            if line =~ /^=begin/
+              comment_started = true
+              next
+            end
+          end
+          stats["classes"]   += 1 if line =~ /^\s*class\s+[_A-Z]/
+          stats["methods"]   += 1 if line =~ /^\s*def\s+[_a-z]/
           stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
         end
       end