Skip to content

Commit

Permalink
Refactor delete and restore methods
Browse files Browse the repository at this point in the history
Update specs for restore/delete message by the user, which is neither
the sender nor the receiver
  • Loading branch information
LTe committed Aug 29, 2012
1 parent 0054120 commit ee9e4c6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
32 changes: 17 additions & 15 deletions lib/acts-as-messageable/model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -123,30 +123,32 @@ def reply_to(message, *args)
def delete_message(message)
current_user = self

if message.to == current_user
unless message.recipient_delete
message.update_attributes!(:recipient_delete => true)
case current_user
when message.to
attribute = message.recipient_delete ? :recipient_permanent_delete : :recipient_delete
when message.from
attribute = message.sender_delete ? :sender_permanent_delete : :sender_delete
else
message.update_attributes!(:recipient_permanent_delete => true)
end
elsif message.from == current_user
unless message.sender_delete
message.update_attributes!(:sender_delete => true)
else
message.update_attributes!(:sender_permanent_delete => true)
end
raise "#{current_user} can't delete this message"
end

message.update_attributes!(attribute => true)
end

# Mark message as restored
def restore_message(message)
current_user = self

if message.to == current_user
message.update_attributes!(:recipient_delete => false)
elsif message.from == current_user
message.update_attributes!(:sender_delete => false)
case current_user
when message.to
attribute = :recipient_delete
when message.from
attribute = :sender_delete
else
raise "#{current_user} can't delete this message"
end

message.update_attributes!(attribute => false)
end
end
end
Expand Down
9 changes: 9 additions & 0 deletions spec/acts-as-messageable_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
end

describe "delete messages" do

it "bob should have one deleted message from alice" do
@bob.messages.process do |m|
m.delete
Expand Down Expand Up @@ -112,6 +113,10 @@

@bob.sent_messages.count.should == 1
end

it "pat should not able to delete message" do
lambda { @pat.delete_message(@message) }.should raise_error
end
end

describe "restore message" do
Expand All @@ -127,6 +132,10 @@
@alice.deleted_messages.process { |m| m.restore }
@alice.received_messages.count.should == 1
end

it "pat should not able to restore message" do
lambda { @pat.restore_message(@message) }.should raise_error
end
end

describe "read/unread feature" do
Expand Down

0 comments on commit ee9e4c6

Please sign in to comment.