@@ -32,7 +32,7 @@ Recommended serving directions: end comment = Comment.new :body => "This is spam!!!1" - comment.spam? # => false + comment.splam? # => false comment.splam_score # => 2 comment.splam_reasons # => [] README @@ -15,7 +15,7 @@ module Splam module ClassMethods def splam; @splam; end - def splammable(fieldname, threshold=100) + def splammable(fieldname, threshold=100, conditions=nil) run_rules = [] # todo: run only certain rules # e.g. splammable :body, 100, [ :chinese, :html ] @@ -26,12 +26,13 @@ module Splam @splam[:rules] = Splam::Rule.subclasses @splam[:threshold] = threshold @splam[:fieldname] = fieldname + @splam[:conditions] = conditions end end def splam_score; @splam_score; end def splam_reasons; @splam_reasons; end - def spam? + def splam? @splam_score = 0 @splam_reasons = [] splam = self.class.splam || raise("Splam is not initialized") @@ -46,6 +47,6 @@ module Splam end def validates_as_spam - errors.add(@splam[:fieldname], "looks like spam.") if spam? + errors.add(@splam[:fieldname], "looks like spam.") if splam? end end \ No newline at end of file lib/splam.rb @@ -21,7 +21,7 @@ class SplamTest < Test::Unit::TestCase def test_runs_plugins f = Foo.new - assert ! f.spam? + assert ! f.splam? assert_equal 10, f.splam_score end @@ -37,11 +37,11 @@ class SplamTest < Test::Unit::TestCase else Foo.splam[:threshold] = 99 end - comment.spam? # todo: assert + spam = comment.splam? score = comment.splam_score #$stderr.puts "#{f} score: #{score}" #$stderr.puts "=====================" - assert comment.spam?, "Comment #{f} was not spam, score was #{score} but threshold was #{Foo.splam[:threshold]}\nReasons were #{comment.splam_reasons.inspect}" + assert spam, "Comment #{f} was not spam, score was #{score} but threshold was #{Foo.splam[:threshold]}\nReasons were #{comment.splam_reasons.inspect}" end end @@ -49,12 +49,12 @@ class SplamTest < Test::Unit::TestCase comment = Foo.new Dir.glob(File.join(File.dirname(__FILE__), "fixtures", "comment", "ham", "*.txt")).each do |f| comment.body = File.open(f).read - comment.spam? + spam = comment.splam? score = comment.splam_score #$stderr.puts "#{f} score: #{score}" #$stderr.puts "=====================" - assert !comment.spam?, "File #{f} should be marked ham, but was marked with score #{score}\nReasons were #{comment.splam_reasons}\n\n#{comment.body}" + assert !spam, "File #{f} should be marked ham, but was marked with score #{score}\nReasons were #{comment.splam_reasons}\n\n#{comment.body}" end end end test/splam_test.rb 4a28b305e856632c0aef333d62ae933df04c421c c3 courtenay@entp.com http://github.com/courtenay/splam/commit/5a8197b572e28777e5c746578375125ccbf0016e 5a8197b572e28777e5c746578375125ccbf0016e 2008-12-26T16:31:39-08:00 2008-12-26T16:31:39-08:00 Use "splam?" instead of "spam?" so we don't overwrite other spam libs d688d7abe38b0fc10c4275b7c2234312e8b2a3a5 c3 courtenay@entp.com