Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 4 commits
  • 27 files changed
  • 0 commit comments
  • 1 contributor
View
1 app/controllers/pages_controller.rb
@@ -1,5 +1,6 @@
class PagesController < ApplicationController
def home
+ @title = "Home"
if signed_in?
@micropost = current_user.microposts.build
@feed_items = current_user.feed.paginate(page: params[:page])
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
16 app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
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 :signed_in_cant_signup, only: [:create, :new]
before_filter :correct_user, only: [:edit, :update]
before_filter :admin_user, only: :destroy
@@ -52,6 +52,20 @@ def destroy
end
end
+ 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
+
private
def signed_in_cant_signup
redirect_to root_path, notice: "You already have an account and are signed in" if signed_in?
View
14 app/models/micropost.rb
@@ -5,4 +5,18 @@ class Micropost < ActiveRecord::Base
validates :content, presence: true, length: { maximum: 140 }
validates :user_id, presence: true
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
9 app/models/relationship.rb
@@ -0,0 +1,9 @@
+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
28 app/models/user.rb
@@ -12,23 +12,45 @@
class User < ActiveRecord::Base
attr_accessible :name, :email, :password, :password_confirmation
has_secure_password
+
has_many :microposts, dependent: :destroy
- before_save :create_remember_token
+ 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
validates :name, presence: true, length: { maximum:50 }
valid_email_regex = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
validates :email, presence: true, format: { with: valid_email_regex },
- uniqueness: { case_sensitive: false }
+ uniqueness: { case_sensitive: false }
validates :password, length: { minimum: 6 }
validates :password_digest, presence: { message: "Password can't be blank" }
+ before_save :create_remember_token
+
def feed
- 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
def create_remember_token
self.remember_token = SecureRandom.urlsafe_base64
end
+
end
+
View
1 app/views/pages/home.html.erb
@@ -9,6 +9,7 @@
</td>
<td class="sidebar round">
<%= render 'shared/user_info' %>
+ <%= render 'shared/stats' %>
</td>
</tr>
</table>
View
2 app/views/relationships/create.js.erb
@@ -0,0 +1,2 @@
+$("#follow_form").html("<%= escape_javascript(render('users/unfollow')) %>")
+$("#followers").html('<%= pluralize(@user.followers.count, "follower") %>')
View
2 app/views/relationships/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#follow_form").html("<%= escape_javascript(render('users/follow')) %>")
+$("#followers").html('<%= pluralize(@user.followers.count, "follower") %>')
View
21 app/views/shared/_stats.html.erb
@@ -0,0 +1,21 @@
+<% @user ||= current_user %>
+<div class="stats">
+ <table>
+ <tr>
+ <td>
+ <a href="<%= following_user_path(@user) %>">
+ <span id="following" class="stat">
+ <%= @user.followed_users.count %> following
+ </span>
+ </a>
+ </td>
+ <td>
+ <a href="<%= followers_user_path(@user) %>">
+ <span id="followers" class="stat">
+ <%= pluralize(@user.followers.count, "follower") %>
+ </span>
+ </a>
+ </td>
+ </tr>
+ </table>
+</div>
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>
+ <div class="actions"><%= f.submit "Follow" %></div>
+<% 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| %>
+ <div class="actions"><%= f.submit "Unfollow" %></div>
+<% end %>
View
9 app/views/users/show.html.erb
@@ -1,22 +1,23 @@
-<% provide :title, @user.name %>
<table class="profile">
<tr>
<td class = "main">
<h1>
<%= gravatar_for @user %>
<%= @user.name %>
</h1>
+ <%= render 'follow_form' if signed_in? %>
<% if @user.microposts.any? %>
<table class="microposts">
<%= render @microposts %>
</table>
- <%= will_paginate @microposts %>a
+ <%= will_paginate @microposts %>
<% end %>
</td>
<td class="sidebar round">
<strong>Name</strong> <%= @user.name %> <br />
- <strong>URL</strong> <%= link_to user_path(@user), @user %>
- <strong>Microposts</strong> <%= @user.microposts.count %>
+ <strong>URL</strong> <%= link_to user_path(@user), @user %> <br />
+ <strong>Microposts</strong> <%= @user.microposts.count %>
+ <%= render 'shared/stats' %>
</td>
</tr>
</table>
View
25 app/views/users/show_follow.html.erb
@@ -0,0 +1,25 @@
+<table>
+ <tr>
+ <td class="main">
+ <h1><%= @title %></h1>
+
+ <% if @users.any? %>
+ <ul class="users">
+ <%= render @users %>
+ </ul>
+ <%= will_paginate @users %>
+ <% end %>
+ </td>
+ <td class="sidebar round">
+ <strong>Name</strong> <%= @user.name %><br />
+ <strong>URL</strong> <%= link_to user_path(@user), @user %><br />
+ <strong>Microposts</strong> <%= @user.microposts.count %>
+ <%= render 'shared/stats' %>
+ <% unless @users.empty? %>
+ <% @users.each do |user| %>
+ <%= link_to gravatar_for(user, size: 30), user %>
+ <% end %>
+ <% end %>
+ </td>
+ </tr>
+</table>
View
7 config/routes.rb
@@ -1,8 +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/20120219200726_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 => 20120217224649) do
+ActiveRecord::Schema.define(:version => 20120219200726) 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
55 lib/tasks/sample_data.rake
@@ -2,25 +2,42 @@ namespace :db do
desc "Fill database with sample data"
task populate: :environment do
Rake::Task['db:reset'].invoke
- 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[1..50]
+ followers = users[3..40]
+ followed_users.each { |followed| user.follow!(followed) }
+ followers.each { |follower| follower.follow!(user) }
+end
View
29 spec/controllers/relationships_controller_spec.rb
@@ -0,0 +1,29 @@
+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 "decrement the Relationship count" do
+ expect do
+ xhr :post, :create, relationship: { followed_id: other_user.id }
+ end.should change(Relationship, :count).by(1)
+ 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 destroy a relationship using Ajax" do
+ expect do
+ xhr :delete, :destroy, id: relationship.id
+ end.should change(Relationship, :count).by(-1)
+ end
+ end
+end
View
9 spec/factories/relationships.rb
@@ -0,0 +1,9 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :relationship do
+ follower_id 1
+ followed_id "MyString"
+ integer "MyString"
+ end
+end
View
19 spec/models/micropost_spec.rb
@@ -30,4 +30,23 @@
before { @micropost.content = "a" * 141 }
it { should_not be_valid }
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
31 spec/models/relationship_spec.rb
@@ -0,0 +1,31 @@
+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
56 spec/models/user_spec.rb
@@ -25,6 +25,13 @@
it { should respond_to(:remember_token) }
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 be_valid }
it { should_not be_admin }
@@ -141,7 +148,54 @@
its(:feed) { should include(newer_micropost) }
its(:feed) { should include(older_micropost) }
its(:feed) { should_not include(unfollowed_post) }
-
+ end
+
+ describe "status" do
+ 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) }
+
+ 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
+
+ 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
+
+ end
end
+
View
27 spec/requests/authentication_pages_spec.rb
@@ -32,7 +32,7 @@
let(:user) { FactoryGirl.create(:user) }
before { valid_signin(user) }
- it { should have_selector('title', text: user.name) }
+ it { should have_selector('h1', text: user.name) }
it { should have_link('Users', text: users_path) }
it { should have_link('Profile', href: user_path(user)) }
it { should have_selector('a', text: 'Profile',) }
@@ -69,7 +69,7 @@
end
it "should render the default (profile) page" do
- page.should have_selector('title', text: user.name)
+ page.should have_selector('h1', text: user.name)
end
end
end
@@ -108,6 +108,29 @@
specify { response.should redirect_to(signin_path) }
end
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
+
+ describe "in the Relationships controller" do
+
+ describe "submitting to the create action" do
+ before { post relationships_path }
+ specify { response.should redirect_to(signin_path) }
+ end
+
+ describe "submitting to the destroy action" do
+ before { delete relationship_path(1) }
+ specify { response.should redirect_to(signin_path) }
+ end
+ end
end
describe "as wrong user" do
View
11 spec/requests/layout_links_spec.rb
@@ -24,9 +24,18 @@
page.should have_selector("tr##{item.id}", text: item.content)
end
end
+
+ describe "follower/following counts" do
+ let(:other_user) { FactoryGirl.create(:user) }
+ before { user.follow!(other_user) }
+
+ it { should have_selector('a', href: following_user_path(user),
+ content: "0 following") }
+ it { should have_selector('a', href: following_user_path(user),
+ content: "1 follower") }
+ end
end
end
-
describe "Help page" do
before { visit help_path }
View
82 spec/requests/user_pages_spec.rb
@@ -74,13 +74,63 @@
before { visit user_path(user) }
it { should have_selector('h1', text: user.name) }
- it { should have_selector('title', text: user.name) }
+ it { should have_selector('title', text: "Ruby on Rails Tutorial Sample App") }
describe "microposts" do
it { should have_content(m1.content) }
it { should have_content(m2.content) }
it { should have_content(user.microposts.count) }
end
+
+ describe "follow/unfollow buttons" do
+ let(:other_user) { FactoryGirl.create(:user) }
+ before { sign_in(user) }
+
+ describe "following a user" do
+ before { visit user_path(other_user) }
+
+ it "should increment the followed user count" do
+ expect do
+ click_button "Follow"
+ end.to change(user.followed_users, :count).by(1)
+ end
+
+ it "should increment the other user's followers count" do
+ expect do
+ click_button "Follow"
+ end.to change(other_user.followers, :count).by(1)
+ end
+
+ describe "toggling the button" do
+ before { click_button "Follow" }
+ it { should have_selector('input', value: 'Unfollow') }
+ end
+ end
+
+ describe "unfollowing a user" do
+ before do
+ user.follow!(other_user)
+ visit user_path(other_user)
+ end
+
+ it "should decrement the followed user count" do
+ expect do
+ click_button "Unfollow"
+ end.to change(user.followed_users, :count).by(-1)
+ end
+
+ it "should decrement the other user's followers count" do
+ expect do
+ click_button "Unfollow"
+ end.to change(other_user.followers, :count).by(-1)
+ end
+
+ describe "toggling the button" do
+ before { click_button "Unfollow" }
+ it { should have_selector('input', value: 'Follow') }
+ end
+ end
+ end
end
describe "signup" do
@@ -115,7 +165,7 @@
describe "after saving the user" do
before { click_button "Sign up" }
let (:user) { User.find_by_email('user@example.com') }
- it { should have_selector('title', text: user.name) }
+ it { should have_selector('h1', text: user.name) }
it { should have_selector('div.flash.success', text: 'Welcome') }
end
@@ -170,11 +220,37 @@
click_button "Update"
end
- it { should have_selector('title', text: new_name) }
+ it { should have_selector('h1', text: new_name) }
it { should have_selector('div.flash.success') }
specify { user.reload.name.should == new_name }
specify { user.reload.email == 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_selector('a', href: user_path(other_user),
+ text: other_user.name) }
+ end
+
+ describe "followers" do
+ before do
+ sign_in(other_user)
+ visit followers_user_path(other_user)
+ end
+
+ it { should have_selector('a', href: user_path(user),
+ text: user.name) }
+ end
+ end
end

No commit comments for this range

Something went wrong with that request. Please try again.