From 8f61df0bcd0e84f26c6c41b98eeb2f7bb8d5ca4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kazimierz=20Kie=C5=82kowicz?=
<kielkowicz.kazimierz@gmail.com>
Date: Wed, 7 Dec 2011 13:17:50 +0100
Subject: Add annotation to haml and slim template.
---
railties/lib/rails/source_annotation_extractor.rb | 4 +++
railties/test/railties/rake_tasks_test.rb | 42 +++++++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 railties/test/railties/rake_tasks_test.rb
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index a9f2180196..3705db0a3a 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -69,6 +69,10 @@ class SourceAnnotationExtractor
results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
elsif item =~ /\.erb$/
results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
+ elsif item =~ /\.haml$/
+ results.update(extract_annotations_from(item, /-\s*#\s*(#{tag}):?\s*(.*)$/))
+ elsif item =~ /\.slim$/
+ results.update(extract_annotations_from(item, /\/\s*\s*(#{tag}):?\s*(.*)$/))
end
end
diff --git a/railties/test/railties/rake_tasks_test.rb b/railties/test/railties/rake_tasks_test.rb
new file mode 100644
index 0000000000..76d6ca8b5a
--- /dev/null
+++ b/railties/test/railties/rake_tasks_test.rb
@@ -0,0 +1,42 @@
+require "isolation/abstract_unit"
+
+module RailtiesTest
+ class RakeNotesTest < Test::Unit::TestCase
+ def setup
+ build_app
+ require "rails/all"
+ end
+
+ def teardown
+ teardown_app
+ end
+
+ test 'notes' do
+ 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"
+
+ boot_rails
+ require 'rake'
+ require 'rdoc/task'
+ 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
+ end
+
+ end
+
+ private
+ def boot_rails
+ super
+ require "#{app_path}/config/environment"
+ end
+ end
+end
--
cgit v1.2.3