From 8fbe1804464f7dceef48185631aa984680572a0f Mon Sep 17 00:00:00 2001 From: robhogg Date: Mon, 2 Jan 2012 15:54:11 +0000 Subject: [PATCH 1/3] Modified nsfw? to use case-insensitive regex match. --- app/models/status_message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/status_message.rb b/app/models/status_message.rb index 579dc06c4..c0374b184 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -68,7 +68,7 @@ class StatusMessage < Post end def nsfw? - self.raw_message.include?('#nsfw') + self.raw_message.match?(/#nsfw/i) end def formatted_message(opts={}) From b792a6d3e0058cc9f6a103317bc951e4564e98e2 Mon Sep 17 00:00:00 2001 From: robhogg Date: Mon, 2 Jan 2012 20:33:04 +0000 Subject: [PATCH 2/3] Fixed typo --- app/models/status_message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/status_message.rb b/app/models/status_message.rb index c0374b184..3ba4d38fb 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -68,7 +68,7 @@ class StatusMessage < Post end def nsfw? - self.raw_message.match?(/#nsfw/i) + self.raw_message.match(/#nsfw/i) end def formatted_message(opts={}) From 6571ec2fa927ab17d27e3f216646c5087dbbc631 Mon Sep 17 00:00:00 2001 From: robhogg Date: Mon, 2 Jan 2012 21:14:17 +0000 Subject: [PATCH 3/3] Added test for nsfw? --- spec/models/status_message_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index 8202c021b..300d8b858 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -226,6 +226,18 @@ STR end end + describe "#nsfw?" do + it 'returns MatchObject (true) if the post contains #nsfw (however capitalised)' do + status = Factory(:status_message, :text => "This message is #nSFw") + status.nsfw?.should be_true + end + + it 'returns nil (false) if the post does not contain #nsfw' do + status = Factory(:status_message, :text => "This message is #sFW") + status.nsfw?.should be_false + end + end + describe "#notify_person" do it 'notifies the person mentioned' do Notification.should_receive(:notify).with(alice, anything, anything)