updated tagging to work with comments rather than a method

scudco · May 20, 2008 · d79f292 · d79f292
1 parent 4e5077a
commit d79f292
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 21 deletions.
diff --git a/lib/test_sweet.rb b/lib/test_sweet.rb
@@ -2,7 +2,6 @@
 require 'need'
 need{'test_sweet/page'}
 need{'test_sweet/site'}
-need{'test_sweet/tag'}
 need{'test_sweet/filter_error'}
 
 module TestSweet

diff --git a/lib/test_sweet/site.rb b/lib/test_sweet/site.rb
@@ -10,7 +10,7 @@ class Site
     attr_reader :environment
 
     def self.flow(name,&block)
-      class_eval{define_method(name,&block)}
+      self.send(:define_method,name,&block)
     end
 
     def initialize

diff --git a/lib/test_sweet/tag.rb b/lib/test_sweet/tag.rb
diff --git a/lib/test_sweet/tag_filter.rb b/lib/test_sweet/tag_filter.rb
@@ -11,7 +11,7 @@ def filter(pattern,tags)
 
       def contains_tags?(file_name,tags)
         file_string = File.open(file_name).read
-        tags.all? { |tag| file_string =~ /TestSweet\.tag( :\w+,)* :#{tag}( :\w+,)*/ }
+        tags.all? { |tag| file_string =~ /#\s?tags:(\s?\w+,)* #{tag},?(\s?\w+,)*/ }
       end
     end
   end

diff --git a/test/tag_files/tag_file_a.rb b/test/tag_files/tag_file_a.rb
@@ -1 +1 @@
-TestSweet.tag :a
+#tags: a
diff --git a/test/tag_files/tag_file_a_b.rb b/test/tag_files/tag_file_a_b.rb
@@ -1 +1 @@
-TestSweet.tag :a, :b
+# tags: a, b
diff --git a/test/tag_files/tag_file_b.rb b/test/tag_files/tag_file_b.rb
@@ -1 +1 @@
-TestSweet.tag :b
+#tags: b
diff --git a/test/test_tag.rb b/test/test_tag.rb