messages work.

steveklabnik · steveklabnik · commit c01fa3190216 · 2009-12-19T00:48:02.000-05:00
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -2,4 +2,8 @@ class DashboardController < ApplicationController
   def index
   end
 
+	def inbox
+		@messages = current_user.inverse_messages
+	end
+
 end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -0,0 +1,47 @@
+class MessagesController < ApplicationController
+  def index
+    @messages = Message.all
+  end
+
+  def show
+    @message = Message.find(params[:id])
+  end
+
+  def new
+    @message = Message.new
+  end
+
+  def edit
+    @message = Message.find(params[:id])
+  end
+
+  def create
+    @message = Message.new(params[:message])
+		@message.sender = current_user
+
+		if @message.save
+			flash[:notice] = 'Message was successfully created.'
+			redirect_to(@message)
+		else
+			render :action => "new"
+		end
+  end
+
+  def update
+    @message = Message.find(params[:id])
+
+		if @message.update_attributes(params[:message])
+			flash[:notice] = 'Message was successfully updated.'
+			redirect_to(@message)
+		else
+			render :action => "edit"
+		end
+  end
+
+  def destroy
+    @message = Message.find(params[:id])
+    @message.destroy
+
+    redirect_to(messages_url)
+  end
+end
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
@@ -0,0 +1,2 @@
+module MessagesHelper
+end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -0,0 +1,4 @@
+class Message < ActiveRecord::Base
+	belongs_to :sender, :class_name => "User"
+	belongs_to :recipient, :class_name => "User"
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -3,4 +3,10 @@ class User < ActiveRecord::Base
 	
 	has_many :watchings
 	has_many :watches, :through => :watchings
+	
+	has_many :messages
+	has_many :recipients, :through => :messages
+	
+	has_many :inverse_messages, :class_name => "Message", :foreign_key => "recipient_id"
+	has_many :inverse_recipients, :through => :inverse_messages, :source => :users
 end
diff --git a/app/views/dashboard/inbox.html.erb b/app/views/dashboard/inbox.html.erb
@@ -0,0 +1,5 @@
+<ul>
+<% for message in @messages %>
+ <li><%= message.sender.username %> says: <%= message.text %></li> 
+<% end %>
+</ul>
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
@@ -1,2 +1 @@
-<h1>Dashboard#index</h1>
-<p>Find me in app/views/dashboard/index.html.erb</p>
+<%= link_to "Check messages", inbox_path %>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
@@ -0,0 +1,24 @@
+<h1>Editing message</h1>
+
+<% form_for(@message) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :sender_id %><br />
+    <%= f.text_field :sender_id %>
+  </p>
+  <p>
+    <%= f.label :recipient_id %><br />
+    <%= f.text_field :recipient_id %>
+  </p>
+  <p>
+    <%= f.label :text %><br />
+    <%= f.text_field :text %>
+  </p>
+  <p>
+    <%= f.submit 'Update' %>
+  </p>
+<% end %>
+
+<%= link_to 'Show', @message %> |
+<%= link_to 'Back', messages_path %>
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
@@ -0,0 +1,24 @@
+<h1>Listing messages</h1>
+
+<table>
+  <tr>
+    <th>Sender</th>
+    <th>Recipient</th>
+    <th>Text</th>
+  </tr>
+
+<% @messages.each do |message| %>
+  <tr>
+    <td><%=h message.sender_id %></td>
+    <td><%=h message.recipient_id %></td>
+    <td><%=h message.text %></td>
+    <td><%= link_to 'Show', message %></td>
+    <td><%= link_to 'Edit', edit_message_path(message) %></td>
+    <td><%= link_to 'Destroy', message, :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New message', new_message_path %>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
@@ -0,0 +1,19 @@
+<h1>New message</h1>
+
+<% form_for(@message) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :recipient_id %><br />
+    <%= f.collection_select(:recipient_id, User.find(:all, :order => :username) - [current_user], :id, :username) %>
+  </p>
+  <p>
+    <%= f.label :text %><br />
+    <%= f.text_area :text %>
+  </p>
+  <p>
+    <%= f.submit 'Create' %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', messages_path %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
@@ -0,0 +1,13 @@
+<p>
+  <b>Recipient:</b>
+  <%=h @message.recipient.username %>
+</p>
+
+<p>
+  <b>Text:</b>
+  <%=h @message.text %>
+</p>
+
+
+<%= link_to 'Edit', edit_message_path(@message) %> |
+<%= link_to 'Back', messages_path %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -4,6 +4,10 @@
   <%= link_to "Watch #{@user.username}", watchings_path(:watches_id => @user), :method => :post %>
 <% end %>
 
+<% if @user == current_user %>
+  <%= link_to "Send a message", new_message_path %>
+<% end %>
+
 <%= @user.username %> is watching:
 <ul>  
 <% for watching in @user.watchings %>  
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
+  map.resources :messages
+
 
   map.resources :users, :except => :show
 	map.user "/users/:username", :controller => "users", :action => "show"
@@ -13,4 +15,6 @@
 	map.resources :user_sessions
 	map.resources :watchings
 
+	map.inbox "/dashboard/inbox", :controller => "dashboard", :action => "inbox"
+
 end
diff --git a/db/migrate/20091219052226_create_messages.rb b/db/migrate/20091219052226_create_messages.rb
@@ -0,0 +1,15 @@
+class CreateMessages < ActiveRecord::Migration
+  def self.up
+    create_table :messages do |t|
+      t.integer :sender_id
+      t.integer :recipient_id
+      t.text :text
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :messages
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -9,7 +9,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091219044706) do
+ActiveRecord::Schema.define(:version => 20091219051440) do
+
+  create_table "messages", :force => true do |t|
+    t.integer  "sender_id"
+    t.integer  "recipient_id"
+    t.string   "text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "users", :force => true do |t|
     t.string   "username"
diff --git a/generate b/generate
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
diff --git a/test/unit/helpers/messages_helper_test.rb b/test/unit/helpers/messages_helper_test.rb
diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-<h1>Dashboard#index</h1>`
`2`		`-<p>Find me in app/views/dashboard/index.html.erb</p>`
	`1`	`+<%= link_to "Check messages", inbox_path %>`