From 044b65e5e46d1d5d49d92c2d4e9cdc67de753a12 Mon Sep 17 00:00:00 2001 From: Peer Allan Date: Sun, 17 Oct 2010 13:49:31 -0500 Subject: [PATCH 1/1] Fixed gsub of the grep lines to show results if the first line is a comment --- lib/application_checker.rb | 5 ++++- test/application_checker_test.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/lib/application_checker.rb b/lib/application_checker.rb index 8f3334a..f5df1cf 100644 --- a/lib/application_checker.rb +++ b/lib/application_checker.rb @@ -365,7 +365,10 @@ module Rails end # ignore comments - lines.gsub /^(\/[^:]+:)?\s*#.+$/m, "" + lines.split("\n").map do |l| + clean_line = l.gsub(/^(\/[^:]+:)?\s*#.+$/m, '') + clean_line.blank?? nil : clean_line + end.compact.join("\n") end # Sets a base path for finding files; mostly for testing diff --git a/test/application_checker_test.rb b/test/application_checker_test.rb index a5edd4d..e2321ed 100644 --- a/test/application_checker_test.rb +++ b/test/application_checker_test.rb @@ -79,6 +79,14 @@ class ApplicationCheckerTest < ActiveSupport::TestCase assert @checker.alerts.has_key?("named_scope is now just scope") end + def test_named_scope_with_comments_left_over + make_file("app/models", "article.rb", "# named_scope :failure") + make_file("app/models", "post.rb", "named_scope :failure") + @checker.check_ar_methods + + assert @checker.alerts.has_key?("named_scope is now just scope") + end + def test_check_routes make_file("config/", "routes.rb", " map.connect 'fail'") @checker.check_routes -- 1.7.2.2