app/models/user_comment.rb db/migrate/015_create_user_comments.rb test/fixtures/user_comments.yml @@ -63,4 +63,12 @@ class UsersController < ApplicationController extra_terms end end + + def comments + @user = User.find_by_login(params[:id]) + + @user.comments.create :author_id => current_user.id, :text => params[:text], :created => Time.now + + redirect_to :action => :show + end end app/controllers/users_controller.rb @@ -61,6 +61,8 @@ class User < ActiveRecord::Base has_many :borrowed, :class_name => 'Item', :through => :borrowings, :source => :item, :conditions => "status = 'lent'" + has_many :comments, :class_name => 'UserComment' + # gets all the tags this user has used and how many times they've used them # sorted with most occurances first def tag_counts app/models/user.rb @@ -15,6 +15,30 @@ </table> <% end %> +<% if current_user or not @user.comments.empty? %> + <h2>Comments</h2> +<% end %> + +<% unless @user.comments.empty? %> + <% @user.comments.each do |c| %> + <div class="comment" style="margin-bottom: 1em;"> + <p><%= paragraphize c.text %></p> + <p class="byline">-- <%= user_link(c.author) %> <%= c.created.strftime("%Y-%m-%d") %></p> + </div> + <% end %> +<% end %> + +<% if current_user %> + <% form_tag comments_user_path(@user.login), :method => 'post' do %> + <label style="vertical-align: top">Write a comment: + <textarea name="text" rows="7" cols="30" ></textarea> + </label><br> + <input type="submit" value="Comment" style="margin-left: 3em; margin-top: 1em;"> + <% end %> +<% end %> + +<h2>Items</h2> + <% if @items.empty? %> <p>This user hasn't listed any items yet.</p> <% else %> app/views/users/show.rhtml @@ -8,7 +8,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :videos, :collection => { :search => :get } map.connect 'users/:id/search', :controller => 'users', :action => 'search' - map.resources :users, :requirements => { :id => %r([^/;,?]+) } + map.resources :users, :requirements => { :id => %r([^/;,?]+) }, :member => { :comments => :post } map.resources :loans config/routes.rb @@ -388,3 +388,11 @@ display:none; .fieldWithErrors input { background: #d99; } + +.comment { + margin-bottom: 1em; +} + +.comment .byline { + padding-left: 2em; +} public/stylesheets/andreas06.css @@ -29,4 +29,12 @@ class UsersControllerTest < ActionController::TestCase assert_match /Homage to Catalonia/, @response.body end + + def test_show_comments + get :show, :id => 'medwards' + + assert_response :success + + assert_match /A Rad Dude./, @response.body + end end test/functional/users_controller_test.rb 9da79015bd504de8fe9a96e6b93800c90a704019 Brendan Taylor whateley@gmail.com http://github.com/medwards/free-library-on-rails/commit/a56a2ea40ae58e107db01fcd5b78f015f808539f a56a2ea40ae58e107db01fcd5b78f015f808539f 2009-10-03T18:41:30-07:00 2009-10-03T18:41:30-07:00 add user comments ffc757dfd55675ed45a29936757c5a9b98fd9dd7 Brendan Taylor whateley@gmail.com