Skip to content
Browse files

Add user following

  • Loading branch information...
1 parent be4f33b commit df31ef04cc96136d39fe389423e172821b8cc6bd Jason Kim committed Mar 18, 2012
View
31 app/assets/stylesheets/custom.css.scss
@@ -211,4 +211,35 @@ aside {
height: 100px;
margin-bottom: 5px;
}
+}
+
+/* sidebar */
+
+.stats {
+ overflow: auto;
+ a {
+ float: left;
+ padding: 0 10px;
+ border-left: 1px solid $grayLighter;
+ color: gray;
+ &:first-child {
+ padding-left: 0;
+ border: 0;
+ }
+ &:hover {
+ text-decoration: none;
+ color: $blue;
+ }
+ }
+ strong {
+ display: block;
+ }
+}
+
+.user_avatars {
+ overflow: auto;
+ margin-top: 10px;
+ .gravatar {
+ margin: 1px 1px;
+ }
}
View
21 app/controllers/relationships_controller.rb
@@ -0,0 +1,21 @@
+class RelationshipsController < ApplicationController
+ before_filter :signed_in_user
+
+ def create
+ @user = User.find(params[:relationship][:followed_id])
+ current_user.follow!(@user)
+ respond_to do |format|
+ format.html { redirect_to @user }
+ format.js
+ end
+ end
+
+ def destroy
+ @user = Relationship.find(params[:id]).followed
+ current_user.unfollow!(@user)
+ respond_to do |format|
+ format.html { redirect_to @user }
+ format.js
+ end
+ end
+end
View
17 app/controllers/users_controller.rb
@@ -1,8 +1,23 @@
class UsersController < ApplicationController
- before_filter :signed_in_user, only: [:index, :edit, :update]
+ before_filter :signed_in_user,
+ only: [:index, :edit, :update, :following, :followers]
+
before_filter :correct_user, only: [:edit, :update]
before_filter :admin_user, only: :destroy
+ def following
+ @title = "Following"
+ @user = User.find(params[:id])
+ @users = @user.followed_users.paginate(page: params[:page])
+ render 'show_follow'
+ end
+
+ def followers
+ @title = "Followers"
+ @user = User.find(params[:id])
+ @users = @user.followers.paginate(page: params[:page])
+ render 'show_follow'
+ end
def index
@users = User.paginate(page: params[:page])
View
21 app/models/micropost.rb
@@ -7,4 +7,25 @@ class Micropost < ActiveRecord::Base
validates :user_id, presence: true
default_scope order: 'microposts.created_at DESC'
+
+ def self.from_users_followed_by(user)
+ followed_user_ids = user.followed_user_ids.join(', ')
+ where("user_id IN (?) OR user_id = ?", followed_user_ids, user)
+ end
+
+ default_scope :order => 'microposts.created_at DESC'
+
+ # Returns microposts from the users being followed by the given user.
+ scope :from_users_followed_by, lambda { |user| followed_by(user) }
+
+ private
+
+ # Returns an SQL condition for users followed by the given user.
+ # We include the user's own id as well.
+ def self.followed_by(user)
+ followed_user_ids = %(SELECT followed_id FROM relationships
+ WHERE follower_id = :user_id)
+ where("user_id IN (#{followed_user_ids}) OR user_id = :user_id",
+ { user_id: user })
+ end
end
View
8 app/models/relationship.rb
@@ -0,0 +1,8 @@
+class Relationship < ActiveRecord::Base
+ attr_accessible :followed_id
+
+ belongs_to :follower, class_name: "User"
+ belongs_to :followed, class_name: "User"
+ validates :follower_id, presence: true
+ validates :followed_id, presence: true
+end
View
22 app/models/user.rb
@@ -13,6 +13,13 @@ class User < ActiveRecord::Base
attr_accessible :name, :email, :password, :password_confirmation
has_secure_password
has_many :microposts, dependent: :destroy
+ has_many :relationships, foreign_key: "follower_id", dependent: :destroy
+ has_many :followed_users, through: :relationships, source: :followed
+ has_many :reverse_relationships, foreign_key: "followed_id",
+ class_name: "Relationship",
+ dependent: :destroy
+ has_many :followers, through: :reverse_relationships, source: :follower
+
before_save :create_remember_token
validates :name, presence: true, length: { maximum: 50 }
@@ -24,8 +31,19 @@ class User < ActiveRecord::Base
validates :password_confirmation, presence: true
def feed
- # This is preliminary. See "Following users" for the full implementation.
- Micropost.where("user_id = ?", id)
+ Micropost.from_users_followed_by(self)
+ end
+
+ def following?(other_user)
+ relationships.find_by_followed_id(other_user.id)
+ end
+
+ def follow!(other_user)
+ relationships.create!(followed_id: other_user.id)
+ end
+
+ def unfollow!(other_user)
+ relationships.find_by_followed_id(other_user.id).destroy
end
private
View
2 app/views/relationships/create.js.erb
@@ -0,0 +1,2 @@
+$("#follow_form").html("<%= escape_javascript(render('users/unfollow')) %>")
+$("#followers").html('<%= @user.followers.count %>')
View
2 app/views/relationships/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#follow_form").html("<%= escape_javascript(render('users/follow')) %>")
+$("#followers").html('<%= @user.followers.count %>')
View
15 app/views/shared/_stats.html.erb
@@ -0,0 +1,15 @@
+<% @user ||= current_user %>
+<div class="stats">
+ <a href="<%= following_user_path(@user) %>">
+ <strong id="following" class="stat">
+ <%= @user.followed_users.count %>
+ </strong>
+ following
+ </a>
+ <a href="<%= followers_user_path(@user) %>">
+ <strong id="followers" class="stat">
+ <%= @user.followers.count %>
+ </strong>
+ followers
+ </a>
+</div>
View
3 app/views/static_pages/home.html.erb
@@ -6,6 +6,9 @@
<%= render 'shared/user_info' %>
</section>
<section>
+ <%= render 'shared/stats' %>
+ </section>
+ <section>
<%= render 'shared/micropost_form' %>
</section>
</aside>
View
5 app/views/users/_follow.html.erb
@@ -0,0 +1,5 @@
+<%= form_for(current_user.relationships.build(followed_id: @user.id),
+ remote: true) do |f| %>
+ <div><%= f.hidden_field :followed_id %></div>
+ <%= f.submit "Follow", :class => "btn btn-large btn-primary" %>
+<% end %>
View
9 app/views/users/_follow_form.html.erb
@@ -0,0 +1,9 @@
+<% unless current_user?(@user) %>
+ <div id="follow_form">
+ <% if current_user.following?(@user) %>
+ <%= render 'unfollow' %>
+ <% else %>
+ <%= render 'follow' %>
+ <% end %>
+ </div>
+<% end %>
View
5 app/views/users/_unfollow.html.erb
@@ -0,0 +1,5 @@
+<%= form_for(current_user.relationships.find_by_followed_id(@user),
+ html: { method: :delete },
+ remote: true) do |f| %>
+ <%= f.submit "Unfollow", :class => "btn btn-large" %>
+<% end %>
View
4 app/views/users/show.html.erb
@@ -7,8 +7,12 @@
<%= @user.name %>
</h1>
</section>
+ <section>
+ <%= render 'shared/stats' %>
+ </section>
</aside>
<div class="span8">
+ <%= render 'follow_form' if signed_in? %>
<% if @user.microposts.any? %>
<h3>Microposts (<%= @user.microposts.count %>)</h3>
<ol class="microposts">
View
29 app/views/users/show_follow.html.erb
@@ -0,0 +1,29 @@
+<div class="row">
+ <aside class="span4">
+ <section>
+ <%= gravatar_for @user %>
+ <h1><%= @user.name %></h1>
+ <span><%= link_to "view my profile", @user %></span>
+ <span><b>Microposts:</b> <%= @user.microposts.count %></span>
+ </section>
+ <section>
+ <%= render 'shared/stats' %>
+ <% unless @users.empty? %>
+ <div class="user_avatars">
+ <% @users.each do |user| %>
+ <%= link_to gravatar_for(user, :size => 30), user %>
+ <% end %>
+ </div>
+ <% end %>
+ </section>
+ </aside>
+ <div class="span8">
+ <h3><%= yield(:title) %></h3>
+ <% if @users.any? %>
+ <ul class="users">
+ <%= render @users %>
+ </ul>
+ <%= will_paginate @users %>
+ <% end %>
+ </div>
+</div>
View
8 config/routes.rb
@@ -1,7 +1,13 @@
SampleApp::Application.routes.draw do
- resources :users
+ resources :users do
+ member do
+ get :following, :followers
+ end
+ end
resources :sessions, only: [:new, :create, :destroy]
resources :microposts, only: [:create, :destroy]
+ resources :relationships, only: [:create, :destroy]
+
match '/signup', to: 'users#new'
match '/signin', to: 'sessions#new'
View
14 db/migrate/20120318170758_create_relationships.rb
@@ -0,0 +1,14 @@
+class CreateRelationships < ActiveRecord::Migration
+ def change
+ create_table :relationships do |t|
+ t.integer :follower_id
+ t.integer :followed_id
+
+ t.timestamps
+ end
+
+ add_index :relationships, :follower_id
+ add_index :relationships, :followed_id
+ add_index :relationships, [:follower_id, :followed_id], unique: true
+ end
+end
View
13 db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120318041518) do
+ActiveRecord::Schema.define(:version => 20120318170758) do
create_table "microposts", :force => true do |t|
t.string "content"
@@ -22,6 +22,17 @@
add_index "microposts", ["user_id", "created_at"], :name => "index_microposts_on_user_id_and_created_at"
+ create_table "relationships", :force => true do |t|
+ t.integer "follower_id"
+ t.integer "followed_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ add_index "relationships", ["followed_id"], :name => "index_relationships_on_followed_id"
+ add_index "relationships", ["follower_id", "followed_id"], :name => "index_relationships_on_follower_id_and_followed_id", :unique => true
+ add_index "relationships", ["follower_id"], :name => "index_relationships_on_follower_id"
+
create_table "users", :force => true do |t|
t.string "name"
t.string "email"
View
57 lib/tasks/sample_data.rake
@@ -1,25 +1,42 @@
namespace :db do
desc "Fill database with sample data"
task populate: :environment do
- admin = User.create!(name: "Example User",
- email: "example@railstutorial.org",
- password: "foobar",
- password_confirmation: "foobar")
- admin.toggle!(:admin)
- 99.times do |n|
- name = Faker::Name.name
- email = "example-#{n+1}@railstutorial.org"
- password = "password"
- User.create!(name: name,
- email: email,
- password: password,
- password_confirmation: password)
- end
-
- users = User.all(limit: 6)
- 50.times do
- content = Faker::Lorem.sentence(5)
- users.each { |user| user.microposts.create!(content: content) }
- end
+ make_users
+ make_microposts
+ make_relationships
end
+end
+
+def make_users
+ admin = User.create!(name: "Example User",
+ email: "example@railstutorial.org",
+ password: "foobar",
+ password_confirmation: "foobar")
+ admin.toggle!(:admin)
+ 99.times do |n|
+ name = Faker::Name.name
+ email = "example-#{n+1}@railstutorial.org"
+ password = "password"
+ User.create!(name: name,
+ email: email,
+ password: password,
+ password_confirmation: password)
+ end
+end
+
+def make_microposts
+ users = User.all(limit: 6)
+ 50.times do
+ content = Faker::Lorem.sentence(5)
+ users.each { |user| user.microposts.create!(content: content) }
+ end
+end
+
+def make_relationships
+ users = User.all
+ user = users.first
+ followed_users = users[2..50]
+ followers = users[3..40]
+ followed_users.each { |followed| user.follow!(followed) }
+ followers.each { |follower| follower.follow!(user) }
end
View
40 spec/controllers/relationships_controller_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe RelationshipsController do
+
+ let(:user) { FactoryGirl.create(:user) }
+ let(:other_user) { FactoryGirl.create(:user) }
+
+ before { sign_in user }
+
+ describe "creating a relationship with Ajax" do
+
+ it "should increment the Relationship count" do
+ expect do
+ xhr :post, :create, relationship: { followed_id: other_user.id }
+ end.should change(Relationship, :count).by(1)
+ end
+
+ it "should respond with success" do
+ xhr :post, :create, relationship: { followed_id: other_user.id }
+ response.should be_success
+ end
+ end
+
+ describe "destroying a relationship with Ajax" do
+
+ before { user.follow!(other_user) }
+ let(:relationship) { user.relationships.find_by_followed_id(other_user) }
+
+ it "should decrement the Relationship count" do
+ expect do
+ xhr :delete, :destroy, id: relationship.id
+ end.should change(Relationship, :count).by(-1)
+ end
+
+ it "should respond with success" do
+ xhr :delete, :destroy, id: relationship.id
+ response.should be_success
+ end
+ end
+end
View
21 spec/models/micropost_spec.rb
@@ -28,4 +28,23 @@
before { @micropost.content = "a" * 141 }
it { should_not be_valid }
end
-end
+
+ describe "from_users_followed_by" do
+
+ let(:user) { FactoryGirl.create(:user) }
+ let(:other_user) { FactoryGirl.create(:user) }
+ let(:third_user) { FactoryGirl.create(:user) }
+
+ before { user.follow!(other_user) }
+
+ let(:own_post) { user.microposts.create!(content: "foo") }
+ let(:followed_post) { other_user.microposts.create!(content: "bar") }
+ let(:unfollowed_post) { third_user.microposts.create!(content: "baz") }
+
+ subject { Micropost.from_users_followed_by(user) }
+
+ it { should include(own_post) }
+ it { should include(followed_post) }
+ it { should_not include(unfollowed_post) }
+ end
+end
View
33 spec/models/relationship_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Relationship do
+
+ let(:follower) { FactoryGirl.create(:user) }
+ let(:followed) { FactoryGirl.create(:user) }
+ let(:relationship) do
+ follower.relationships.build(followed_id: followed.id)
+ end
+
+ subject { relationship }
+
+ it { should be_valid }
+
+ describe "follower methods" do
+ before { relationship.save }
+
+ it { should respond_to(:follower) }
+ it { should respond_to(:followed) }
+ its(:follower) { should == follower }
+ its(:followed) { should == followed }
+ end
+
+ describe "when followed id is not present" do
+ before { relationship.followed_id = nil }
+ it { should_not be_valid }
+ end
+
+ describe "when follower id is not present" do
+ before { relationship.follower_id = nil }
+ it { should_not be_valid }
+ end
+end
View
42 spec/models/user_spec.rb
@@ -29,6 +29,14 @@
it { should respond_to(:authenticate) }
it { should respond_to(:microposts) }
it { should respond_to(:feed) }
+ it { should respond_to(:relationships) }
+ it { should respond_to(:followed_users) }
+ it { should respond_to(:reverse_relationships) }
+ it { should respond_to(:followers) }
+ it { should respond_to(:following?) }
+ it { should respond_to(:follow!) }
+ it { should respond_to(:unfollow!) }
+
it { should be_valid }
it { should_not be_admin }
@@ -139,10 +147,44 @@
let(:unfollowed_post) do
FactoryGirl.create(:micropost, user: FactoryGirl.create(:user))
end
+ let(:followed_user) { FactoryGirl.create(:user) }
+
+ before do
+ @user.follow!(followed_user)
+ 3.times { followed_user.microposts.create!(content: "Lorem ipsum") }
+ end
its(:feed) { should include(newer_micropost) }
its(:feed) { should include(older_micropost) }
its(:feed) { should_not include(unfollowed_post) }
+ its(:feed) do
+ followed_user.microposts.each do |micropost|
+ should include(micropost)
+ end
+ end
+ end
+ end
+
+ describe "following" do
+ let(:other_user) { FactoryGirl.create(:user) }
+ before do
+ @user.save
+ @user.follow!(other_user)
+ end
+
+ it { should be_following(other_user) }
+ its(:followed_users) { should include(other_user) }
+
+ describe "followed user" do
+ subject { other_user }
+ its(:followers) { should include(@user) }
+ end
+
+ describe "and unfollowing" do
+ before { @user.unfollow!(other_user) }
+
+ it { should_not be_following(other_user) }
+ its(:followed_users) { should_not include(other_user) }
end
end
end
View
10 spec/requests/authentication_pages_spec.rb
@@ -100,6 +100,16 @@
before { visit users_path }
it { should have_selector('title', text: 'Sign in') }
end
+
+ describe "visiting the following page" do
+ before { visit following_user_path(user) }
+ it { should have_selector('title', text: 'Sign in') }
+ end
+
+ describe "visiting the followers page" do
+ before { visit followers_user_path(user) }
+ it { should have_selector('title', text: 'Sign in') }
+ end
end
View
16 spec/requests/static_pages_spec.rb
@@ -19,8 +19,8 @@
describe "for signed-in users" do
let(:user) { FactoryGirl.create(:user) }
before do
- FactoryGirl.create(:micropost, user: user, content: "Lorem ipsum")
- FactoryGirl.create(:micropost, user: user, content: "Dolor sit amet")
+ FactoryGirl.create(:micropost, :user => user, :content => "Lorem")
+ FactoryGirl.create(:micropost, :user => user, :content => "Ipsum")
sign_in user
visit root_path
end
@@ -30,7 +30,19 @@
page.should have_selector("li##{item.id}", text: item.content)
end
end
+
+ describe "follower/following counts" do
+ let(:other_user) { FactoryGirl.create(:user) }
+ before do
+ other_user.follow!(user)
+ visit root_path
+ end
+
+ it { should have_link("0 following", href: following_user_path(user)) }
+ it { should have_link("1 follower", href: followers_user_path(user)) }
+ end
end
+
end
describe "Help page" do
View
26 spec/requests/user_pages_spec.rb
@@ -144,4 +144,30 @@
specify { user.reload.email.should == new_email }
end
end
+
+ describe "following/followers" do
+ let(:user) { FactoryGirl.create(:user) }
+ let(:other_user) { FactoryGirl.create(:user) }
+ before { user.follow!(other_user) }
+
+ describe "followed users" do
+ before do
+ sign_in user
+ visit following_user_path(user)
+ end
+
+ it { should have_link(other_user.name, href: user_path(other_user)) }
+ end
+
+ describe "followers" do
+ before do
+ sign_in other_user
+ visit followers_user_path(other_user)
+ end
+
+ it { should have_link(user.name, href: user_path(user)) }
+ end
+
+
+ end
end

0 comments on commit df31ef0

Please sign in to comment.
Something went wrong with that request. Please try again.