app/views/messages/_full_message.html.erb @@ -5,4 +5,8 @@ module CommunicationsHelper edit_connection_path(conn) end end + + def message_anchor(message) + "message_#{message.id}" + end end app/helpers/communications_helper.rb @@ -51,6 +51,11 @@ class Message < Communication def parent=(message) @parent = message end + + # Return the sender/recipient that *isn't* the given person. + def other_person(person) + person == sender ? recipient : sender + end # Put the message in the trash for the given person. def trash(person, time=Time.now) @@ -85,7 +90,7 @@ class Message < Communication # Return true if the message is a reply to a previous message. def reply? - !parent.nil? and correct_sender_recipient_pair? + (!parent.nil? or !parent_id.nil?) and correct_sender_recipient_pair? end # Return true if the sender/recipient pair is valid for a given parent. app/models/message.rb @@ -1,12 +1,18 @@ <li> <div class="profile-image"> <%= image_link message.sender %> + <%- if not message.read? and not current_person?(message.sender) -%> + <%= image_tag("icons/email.gif", :class => "icon") %> + <%- elsif message.replied_to? -%> + <%= image_tag("icons/reply.gif", :class => "icon" ) %> + <%- end -%> </div> <p><span class="field">From:</span> <%= person_link message.sender %></p> <p class="meta published"> <%= time_ago_in_words message.created_at %> ago </p> <p title="Subject"> - <%= link_to sanitize(truncate(message.subject, 30)), message %> + <%= link_to sanitize(truncate(message.subject, 30)), + message_path(message, :anchor => message_anchor(message)) %> </p> </li> \ No newline at end of file app/views/home/_message.html.erb @@ -1,8 +1,7 @@ <li class="message"> <div class="profile-image"> - <% other_person = current_person?(message.sender) ? - message.recipient : message.sender %> - <%= image_link other_person, :image => :thumbnail, + <%= image_link message.other_person(current_person), + :image => :thumbnail, :image_options => { :class => "photo" } %> <%- if not message.read? and not current_person?(message.sender) -%> @@ -23,7 +22,8 @@ </p> <p> <span class="label">Subject:</span> - <%= link_to sanitize(message.subject), message %> + <%= link_to sanitize(message.subject), + message_path(message, :anchor => message_anchor(message)) %> </p> <p class="tools meta"> <%= link_to "Read", message %> | @@ -31,7 +31,7 @@ <% unless message.trashed?(current_person) -%> <%= link_to("Trash", message, :method => :delete) %> <% else -%> - <%= link_to "Untrash", undestroy_message_path(message), + <%= link_to "Untrash", undestroy_message_path(message), :method => :put %> <% end -%> </p> app/views/messages/_message.html.erb @@ -16,7 +16,7 @@ <% form_for(:message, :url => person_messages_path(@recipient)) do |f| %> <div class="form_row full"> - <label for="message_to">To</label> + <label for="recipient">To</label> <%= text_field_tag :recipient, h(@recipient.name) %> <!-- TODO: be able to change recipients with this <a href="#" class="add-recipient"> app/views/messages/new.html.erb @@ -1,30 +1,19 @@ <%- column_div :type => :primary do -%> <% if current_person?(@message.sender) %> - <% other_person = @message.recipient %> - <% heading = "Message sent to #{h other_person.name}" %> + <% heading = "Message sent to #{h @message.recipient.name}" %> <% else %> - <% other_person = @message.sender %> - <% heading = "Message from #{h other_person.name}" %> + <% heading = "Message from #{h @message.sender.name}" %> <% end %> <h2><%= heading %></h2> <%= render :partial => 'message_nav' %> - <h3 class="subject"> - <%= image_link other_person %> - <%= @message.subject %></h3> - <%= display @message.content %> - <p class="meta tools"> - Sent <%= time_ago_in_words @message.created_at %> ago | - <%= link_to "Reply", reply_message_path(@message) %> | - <% unless @message.trashed?(current_person) -%> - <%= link_to("Trash", @message, :method => :delete) %> - <% else -%> - <%= link_to "Untrash", undestroy_message_path(@message), - :method => :put %> - <% end -%> - </p> + <h3 class="subject"><%= sanitize @message.subject %></h3> + <ul class="list person"> + <%= render :partial => 'full_message', + :collection => @message.conversation.messages %> + </ul> <%- end -%> app/views/messages/show.html.erb @@ -39,12 +39,13 @@ describe MessagesController do end it "should have a working reply page" do - login_as @message.recipient - get :reply, :id => @message - response.should be_success - response.should render_template("new") - assigns(:message).parent.should == @message - assigns(:recipient).should == @message.sender + proper_reply_behavior(@message.recipient) + end + + it "should have a working reply page for the recipient" do + # This spec tests replying to your *own* message, as at + # the bottom of a thread. + proper_reply_behavior(@message.sender) end it "should reply correctly when logged in as the sender" do @@ -127,4 +128,19 @@ describe MessagesController do assigns(:message).should be_reply end.should change(Message, :count).by(1) end + + def proper_reply_behavior(person) + login_as person + get :reply, :id => @message + response.should be_success + # Check that the hidden parent_id tag is there, with the right value. + response.should have_tag("input[id=?][name=?][type=?][value=?]", + "message_parent_id", + "message[parent_id]", + "hidden", + @message.id) + response.should render_template("new") + assigns(:message).parent.should == @message + assigns(:recipient).should == @message.other_person(person) + end end \ No newline at end of file spec/controllers/messages_controller_spec.rb dd27682a2c32827e9c8749002857663bbde9ea09 0d3cda76d349fe41f8e38a5eebeb8fea8d6f1b49 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/825ca094af08bf123ac19cd1a1c8a95457c97a15 825ca094af08bf123ac19cd1a1c8a95457c97a15 2008-07-31T13:59:11-07:00 2008-07-31T13:59:11-07:00 Merge branch 'messages' into edge 4770b15ad60eec2680ffa634dc78ee2f0144b4b0 Michael Hartl michael@michaelhartl.com