you can watch another user

steveklabnik · steveklabnik · commit 4d372627abdb · 2009-12-19T00:12:26.000-05:00
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,29 +1,33 @@
 class UsersController < ApplicationController
-   def new  
-       @user = User.new  
-   end  
-     
-   def create  
-     @user = User.new(params[:user])  
-     if @user.save  
-       flash[:notice] = "Registration successful."  
-       redirect_to root_url  
-     else  
-       render :action => 'new'  
-     end  
-   end  
+	def new  
+		@user = User.new  
+	end  
+	 
+	def create  
+	 @user = User.new(params[:user])  
+	 if @user.save  
+		 flash[:notice] = "Registration successful."  
+		 redirect_to root_url  
+	 else  
+		 render :action => 'new'  
+	 end  
+	end  
 
-		def edit
-			@user = current_user
-		end
-	
-		def update
-			@user = current_user
-			if @user.update_attributes(params[:user])
-				flash[:notice] = "Successfully updated profile."
-				redirect_to root_url
-			else
-				render :action => "edit"
-			end
+	def edit
+		@user = current_user
+	end
+
+	def update
+		@user = current_user
+		if @user.update_attributes(params[:user])
+			flash[:notice] = "Successfully updated profile."
+			redirect_to root_url
+		else
+			render :action => "edit"
 		end
+	end
+
+	def show
+		@user = User.find_by_username(params[:username])
+	end
 end
diff --git a/app/controllers/watchings_controller.rb b/app/controllers/watchings_controller.rb
@@ -0,0 +1,19 @@
+class WatchingsController < ApplicationController
+	def create
+		@watching = current_user.watchings.build(:watches_id => params[:watches_id])
+		if @watching.save
+			flash[:notice] = "Now watching #{@watching.watches.username}"
+			redirect_to root_url
+		else
+			flash[:error] = "Unable to watch #{@watching.watches.username}."
+			redirect_to root_url
+		end
+	end
+
+	def destroy
+		@watching = current_user.watchings.find(params[:id])
+		@watching.destroy
+		flash[:notice] = "You are no longer watching #{@watching.watches.username}"
+		redirect_to user_path(current_user.username)
+	end
+end
diff --git a/app/helpers/watchings_helper.rb b/app/helpers/watchings_helper.rb
@@ -0,0 +1,2 @@
+module WatchingsHelper
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,3 +1,6 @@
 class User < ActiveRecord::Base
 	acts_as_authentic
+	
+	has_many :watchings
+	has_many :watches, :through => :watchings
 end
diff --git a/app/models/watching.rb b/app/models/watching.rb
@@ -0,0 +1,4 @@
+class Watching < ActiveRecord::Base
+	belongs_to :user
+	belongs_to :watches, :class_name => "User"
+end
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -1 +1,17 @@
-<%= render @user %>
+<h1><%= @user.username %>'s Page</h1>
+
+<% unless @user == current_user %>
+  <%= link_to "Watch #{@user.username}", watchings_path(:watches_id => @user), :method => :post %>
+<% end %>
+
+<%= @user.username %> is watching:
+<ul>  
+<% for watching in @user.watchings %>  
+  <li>
+    <%= watching.watches.username %>
+    <% if @user == current_user %>
+      (<%= link_to "remove", watching, :method => :delete %>)  
+    <% end %>
+  </li>  
+<% end %>    
+</ul>  
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :users
+
+  map.resources :users, :except => :show
+	map.user "/users/:username", :controller => "users", :action => "show"
 
 	map.root :controller => "welcome"
 
@@ -9,5 +11,6 @@
 	map.logout "logout", :controller => "user_sessions", :action => "destroy"
 
 	map.resources :user_sessions
+	map.resources :watchings
 
 end
diff --git a/db/migrate/20091219044706_create_watchings.rb b/db/migrate/20091219044706_create_watchings.rb
@@ -0,0 +1,14 @@
+class CreateWatchings < ActiveRecord::Migration
+  def self.up
+    create_table :watchings do |t|
+      t.integer :user_id
+      t.integer :watches_id
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :watchings
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091219034919) do
+ActiveRecord::Schema.define(:version => 20091219044706) do
 
   create_table "users", :force => true do |t|
     t.string   "username"
@@ -23,4 +23,18 @@
     t.datetime "updated_at"
   end
 
+  create_table "watches", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "watches_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "watchings", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "watches_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end
diff --git a/generate b/generate
diff --git a/test/fixtures/watchings.yml b/test/fixtures/watchings.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  user_id: 1
+  watches_id: 1
+
+two:
+  user_id: 1
+  watches_id: 1
diff --git a/test/functional/watchings_controller_test.rb b/test/functional/watchings_controller_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class WatchingsControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
diff --git a/test/unit/helpers/watchings_helper_test.rb b/test/unit/helpers/watchings_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class WatchingsHelperTest < ActionView::TestCase
+end
diff --git a/test/unit/watchings_test.rb b/test/unit/watchings_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class WatchingsTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
