Skip to content

T
ThaiMinhPhuc_training
Commit 0372f3d3 by Ba Toi Dang
Options

Merge branch 'following-users' into 'master' 

Add user following

See merge request !16
parents a8aa1d03 afdff75f
Showing with 406 additions and 8 deletions
Gemfile
...@@ -55,4 +55,5 @@ gem 'faker', '~> 1.9', '>= 1.9.1' ...@@ -55,4 +55,5 @@ gem 'faker', '~> 1.9', '>= 1.9.1'
gem 'will_paginate', '~> 3.1', '>= 3.1.6' gem 'will_paginate', '~> 3.1', '>= 3.1.6'
gem 'bootstrap-will_paginate', '~> 1.0' gem 'bootstrap-will_paginate', '~> 1.0'
gem 'carrierwave', '~> 1.2', '>= 1.2.3' gem 'carrierwave', '~> 1.2', '>= 1.2.3'
gem 'mini_magick', '~> 4.8' gem 'mini_magick', '~> 4.8'
\ No newline at end of file gem 'rails-erd', '~> 1.5', '>= 1.5.2'
\ No newline at end of file
Gemfile.lock
...@@ -74,6 +74,7 @@ GEM ...@@ -74,6 +74,7 @@ GEM
mime-types (>= 1.16) mime-types (>= 1.16)
childprocess (0.9.0) childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
choice (0.2.0)
chromedriver-helper (1.2.0) chromedriver-helper (1.2.0)
archive-zip (~> 0.10) archive-zip (~> 0.10)
nokogiri (~> 1.8) nokogiri (~> 1.8)
...@@ -311,6 +312,11 @@ GEM ...@@ -311,6 +312,11 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-erd (1.5.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.4) rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
railties (5.2.0) railties (5.2.0)
...@@ -335,6 +341,7 @@ GEM ...@@ -335,6 +341,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
ruby-graphviz (1.2.3)
ruby_dep (1.5.0) ruby_dep (1.5.0)
rubyzip (1.2.1) rubyzip (1.2.1)
sass (3.5.7) sass (3.5.7)
...@@ -409,6 +416,7 @@ DEPENDENCIES ...@@ -409,6 +416,7 @@ DEPENDENCIES
puma (~> 3.11) puma (~> 3.11)
rails (~> 5.2.0) rails (~> 5.2.0)
rails-controller-testing (~> 1.0, >= 1.0.2) rails-controller-testing (~> 1.0, >= 1.0.2)
rails-erd (~> 1.5, >= 1.5.2)
sass-rails (~> 5.0) sass-rails (~> 5.0)
selenium-webdriver selenium-webdriver
spring spring
......
app/assets/javascripts/relationships.js 0 → 100644
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
app/assets/stylesheets/custom.scss
...@@ -144,6 +144,44 @@ aside { ...@@ -144,6 +144,44 @@ aside {
margin-top: 15px; margin-top: 15px;
} }
.stats {
overflow: auto;
margin-top: 0;
padding: 0;
a {
float: left;
padding: 0 10px;
border-left: 1px solid $gray-lighter;
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;
}
a {
padding: 0;
}
}
.users.follow {
padding: 0;
}
// form // form
input, textarea, select, .uneditable-input { input, textarea, select, .uneditable-input {
border: 1px solid #bbb; border: 1px solid #bbb;
......
app/assets/stylesheets/relationships.scss 0 → 100644
// Place all the styles related to the relationships controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/controllers/relationships_controller.rb 0 → 100644
class RelationshipsController < ApplicationController
before_action :logged_in_user
def create
@user = User.find(params[: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
app/controllers/users_controller.rb
class UsersController < ApplicationController class UsersController < ApplicationController
before_action :logged_in_user, only: [:index, :edit, :update, :destroy] before_action :logged_in_user, only: [:index, :edit, :update, :destroy, :following, :followers]
before_action :correct_user, only: [:edit, :update] before_action :correct_user, only: [:edit, :update]
before_action :admin_user, only: [:destroy] before_action :admin_user, only: [:destroy]
before_action :find_user, only: [:show, :edit, :update, :destroy] before_action :find_user, only: [:show, :edit, :update, :destroy]
...@@ -45,6 +45,20 @@ class UsersController < ApplicationController ...@@ -45,6 +45,20 @@ class UsersController < ApplicationController
redirect_to users_url redirect_to users_url
end end
def following
@title = "Following"
@user = User.find(params[:id])
@users = @user.following.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 private
def user_params def user_params
params.require(:user).permit(:name, :email, :password, :password_confirmation) params.require(:user).permit(:name, :email, :password, :password_confirmation)
......
app/helpers/relationships_helper.rb 0 → 100644
module RelationshipsHelper
end
app/models/relationship.rb 0 → 100644
class Relationship < ApplicationRecord
belongs_to :follower, class_name: "User"
belongs_to :followed, class_name: "User"
validates :follower_id, presence: true
validates :followed_id, presence: true
end
app/models/user.rb
class User < ApplicationRecord class User < ApplicationRecord
has_many :microposts, dependent: :destroy has_many :microposts, dependent: :destroy
has_many :active_relationships, class_name: "Relationship",
foreign_key: "follower_id",
dependent: :destroy
has_many :passive_relationships, class_name: "Relationship",
foreign_key: "followed_id",
dependent: :destroy
has_many :following, through: :active_relationships, source: :followed
has_many :followers, through: :passive_relationships, source: :follower
attr_accessor :remember_token, :activation_token, :reset_token attr_accessor :remember_token, :activation_token, :reset_token
...@@ -66,7 +76,25 @@ class User < ApplicationRecord ...@@ -66,7 +76,25 @@ class User < ApplicationRecord
end end
def feed def feed
Micropost.where("user_id = ?", id) following_ids = "SELECT followed_id FROM relationships
WHERE follower_id = :user_id"
Micropost.where("user_id IN (#{following_ids}) OR user_id = :user_id",
user_id: id)
end
# Follows a user.
def follow(other_user)
following << other_user
end
# Unfollows a user.
def unfollow(other_user)
following.delete(other_user)
end
# Returns true if the current user is following the other user.
def following?(other_user)
following.include?(other_user)
end end
private private
......
app/views/relationships/create.js.erb 0 → 100644
$("#follow_form").html("<%= escape_javascript(render('users/unfollow')) %>");
$("#followers").html("<%= @user.followers.count %>");
\ No newline at end of file
app/views/relationships/destroy.js.erb 0 → 100644
$("#follow_form").html("<%= escape_javascript(render('users/follow')) %>");
$("#followers").html("<%= @user.followers.count %>");
\ No newline at end of file
app/views/shared/_stats.html.erb 0 → 100644
<% @user ||= current_user %>
<div class="stats">
<a href="<%= following_user_path(@user) %>">
<strong id="following" class="stat">
<%= @user.following.count %>
</strong>
following
</a>
<a href="<%= followers_user_path(@user) %>">
<strong id="followers" class="stat">
<%= @user.followers.count %>
</strong>
followers
</a>
</div>
\ No newline at end of file
app/views/static_pages/home.html.erb
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<section class="user_info"> <section class="user_info">
<%= render 'shared/user_info' %> <%= render 'shared/user_info' %>
</section> </section>
<section class="stats">
<%= render 'shared/stats' %>
</section>
<section class="micropost_form"> <section class="micropost_form">
<%= render "shared/micropost_form" %> <%= render "shared/micropost_form" %>
</section> </section>
......
app/views/users/_follow.html.erb 0 → 100644
<%= form_for(current_user.active_relationships.build, remote: true) do |f| %>
<div><%= hidden_field_tag :followed_id, @user.id %></div>
<%= f.submit "Follow", class: "btn btn-primary" %>
<% end %>
\ No newline at end of file
app/views/users/_follow_form.html.erb 0 → 100644
<% unless current_user?(@user) %>
<div id="follow_form">
<% if current_user.following?(@user) %>
<%= render 'unfollow' %>
<% else %>
<%= render 'follow' %>
<% end %>
</div>
<% end %>
app/views/users/_unfollow.html.erb 0 → 100644
<%= form_for(current_user.active_relationships.find_by(followed_id: @user.id),
html: { method: :delete },
remote: true) do |f| %>
<%= f.submit "Unfollow", class: "btn" %>
<% end %>
\ No newline at end of file
app/views/users/show.html.erb
...@@ -7,9 +7,13 @@ ...@@ -7,9 +7,13 @@
<%= @user.name %> <%= @user.name %>
</h1> </h1>
</section> </section>
<section class="stats">
<%= render 'shared/stats' %>
</section>
</aside> </aside>
<div class="col-md-8"> <div class="col-md-8">
<%= render 'follow_form' if logged_in? %>
<% if @user.microposts.any? %> <% if @user.microposts.any? %>
<h3>Microposts (<%= @user.microposts.count %>)</h3> <h3>Microposts (<%= @user.microposts.count %>)</h3>
<ol class="microposts"> <ol class="microposts">
......
app/views/users/show_follow.html.erb 0 → 100644
<% provide(:title, @title) %>
<div class="row">
<aside class="col-md-4">
<section class="user_info">
<%= 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 class="stats">
<%= render 'shared/stats' %>
<% if @users.any? %>
<div class="user_avatars">
<% @users.each do |user| %>
<%= link_to gravatar_for(user, size: 30), user %>
<% end %>
</div>
<% end %>
</section>
</aside>
<div class="col-md-8">
<h3><%= @title %></h3>
<% if @users.any? %>
<ul class="users follow">
<%= render @users %>
</ul>
<%= will_paginate %>
<% end %>
</div>
</div>
\ No newline at end of file
config/application.rb
...@@ -12,6 +12,7 @@ require "action_mailer/railtie" ...@@ -12,6 +12,7 @@ require "action_mailer/railtie"
require "action_view/railtie" require "action_view/railtie"
require "sprockets/railtie" require "sprockets/railtie"
require "rails/test_unit/railtie" require "rails/test_unit/railtie"
require "action_cable/engine"
# Require the gems listed in Gemfile, including any gems # Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
...@@ -26,5 +27,8 @@ module ThaiMinhPhucTraining ...@@ -26,5 +27,8 @@ module ThaiMinhPhucTraining
# Application configuration can go into files in config/initializers # Application configuration can go into files in config/initializers
# -- all .rb files in that directory are automatically loaded after loading # -- all .rb files in that directory are automatically loaded after loading
# the framework and any gems in your application. # the framework and any gems in your application.
# Include the authenticity token in remote forms.
config.action_view.embed_authenticity_token_in_remote_forms = true
end end
end end
config/routes.rb
...@@ -13,10 +13,15 @@ Rails.application.routes.draw do ...@@ -13,10 +13,15 @@ Rails.application.routes.draw do
post '/login', to: 'sessions#create' post '/login', to: 'sessions#create'
delete '/logout', to: 'sessions#destroy' delete '/logout', to: 'sessions#destroy'
resources :users resources :users do
member do
get :following, :followers
end
end
resources :account_activations, only: [:edit] resources :account_activations, only: [:edit]
resources :password_resets, only: [:new, :create, :edit, :update] resources :password_resets, only: [:new, :create, :edit, :update]
resources :microposts, only: [:create, :destroy] resources :microposts, only: [:create, :destroy]
resources :relationships, only: [:create, :destroy]
end end
db/migrate/20180815073538_create_relationships.rb 0 → 100644
class CreateRelationships < ActiveRecord::Migration[5.2]
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
db/schema.rb
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2018_08_15_014854) do ActiveRecord::Schema.define(version: 2018_08_15_073538) do
create_table "microposts", force: :cascade do |t| create_table "microposts", force: :cascade do |t|
t.text "content" t.text "content"
...@@ -22,6 +22,16 @@ ActiveRecord::Schema.define(version: 2018_08_15_014854) do ...@@ -22,6 +22,16 @@ ActiveRecord::Schema.define(version: 2018_08_15_014854) do
t.index ["user_id"], name: "index_microposts_on_user_id" t.index ["user_id"], name: "index_microposts_on_user_id"
end end
create_table "relationships", force: :cascade do |t|
t.integer "follower_id"
t.integer "followed_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["followed_id"], name: "index_relationships_on_followed_id"
t.index ["follower_id", "followed_id"], name: "index_relationships_on_follower_id_and_followed_id", unique: true
t.index ["follower_id"], name: "index_relationships_on_follower_id"
end
create_table "users", force: :cascade do |t| create_table "users", force: :cascade do |t|
t.string "name" t.string "name"
t.string "email" t.string "email"
......
db/seeds.rb
...@@ -22,4 +22,12 @@ users = User.order(:created_at).take(6) ...@@ -22,4 +22,12 @@ users = User.order(:created_at).take(6)
50.times do 50.times do
content = Faker::Lorem.sentence(5) content = Faker::Lorem.sentence(5)
users.each { |user| user.microposts.create!(content: content) } users.each { |user| user.microposts.create!(content: content) }
end end
\ No newline at end of file
# Following relationships
users = User.all
user = users.first
following = users[2..50]
followers = users[3..40]
following.each { |followed| user.follow(followed) }
followers.each { |follower| follower.follow(user) }
\ No newline at end of file
erd.pdf 0 → 100644
File added
lib/tasks/auto_generate_diagram.rake 0 → 100644
# NOTE: only doing this in development as some production environments (Heroku)
# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
# NOTE: to have a dev-mode tool do its thing in production.
if Rails.env.development?
RailsERD.load_tasks
end
test/controllers/relationships_controller_test.rb 0 → 100644
require 'test_helper'
class RelationshipsControllerTest < ActionDispatch::IntegrationTest
test "create should require logged-in user" do
assert_no_difference 'Relationship.count' do
post relationships_path
end
assert_redirected_to login_url
end
test "destroy should require logged-in user" do
assert_no_difference 'Relationship.count' do
delete relationship_path(relationships(:one))
end
assert_redirected_to login_url
end
end
test/controllers/users_controller_test.rb
...@@ -40,4 +40,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest ...@@ -40,4 +40,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
end end
assert_redirected_to root_url assert_redirected_to root_url
end end
test "should redirect following when not logged in" do
get following_user_path(@user)
assert_redirected_to login_url
end
test "should redirect followers when not logged in" do
get followers_user_path(@user)
assert_redirected_to login_url
end
end end
test/fixtures/relationships.yml 0 → 100644
one:
follower: michael
followed: lana
two:
follower: michael
followed: malory
three:
follower: lana
followed: michael
four:
follower: archer
followed: michael
\ No newline at end of file
test/integration/following_test.rb 0 → 100644
require 'test_helper'
class FollowingTest < ActionDispatch::IntegrationTest
def setup
@user = users(:michael)
@other = users(:archer)
log_in_as(@user)
end
test "following page" do
get following_user_path(@user)
assert_not @user.following.empty?
assert_match @user.following.count.to_s, response.body
@user.following.each do |user|
assert_select "a[href=?]", user_path(user)
end
end
test "followers page" do
get followers_user_path(@user)
assert_not @user.followers.empty?
assert_match @user.followers.count.to_s, response.body
@user.followers.each do |user|
assert_select "a[href=?]", user_path(user)
end
end
test "should follow a user the standard way" do
assert_difference '@user.following.count', 1 do
post relationships_path, params: { followed_id: @other.id }
end
end
test "should follow a user with Ajax" do
assert_difference '@user.following.count', 1 do
post relationships_path, xhr: true, params: { followed_id: @other.id }
end
end
test "should unfollow a user the standard way" do
@user.follow(@other)
relationship = @user.active_relationships.find_by(followed_id: @other.id)
assert_difference '@user.following.count', -1 do
delete relationship_path(relationship)
end
end
test "should unfollow a user with Ajax" do
@user.follow(@other)
relationship = @user.active_relationships.find_by(followed_id: @other.id)
assert_difference '@user.following.count', -1 do
delete relationship_path(relationship), xhr: true
end
end
end
test/models/relationship_test.rb 0 → 100644
require 'test_helper'
class RelationshipTest < ActiveSupport::TestCase
def setup
@relationship = Relationship.new(follower_id: users(:michael).id,
followed_id: users(:archer).id)
end
test "should be valid" do
assert @relationship.valid?
end
test "should require a follower_id" do
@relationship.follower_id = nil
assert_not @relationship.valid?
end
test "should require a followed_id" do
@relationship.followed_id = nil
assert_not @relationship.valid?
end
end
test/models/user_test.rb
...@@ -83,4 +83,33 @@ class UserTest < ActiveSupport::TestCase ...@@ -83,4 +83,33 @@ class UserTest < ActiveSupport::TestCase
@user.destroy @user.destroy
end end
end end
test "should follow and unfollow a user" do
michael = users(:michael)
archer = users(:archer)
assert_not michael.following?(archer)
michael.follow(archer)
assert michael.following?(archer)
assert archer.followers.include?(michael)
michael.unfollow(archer)
assert_not michael.following?(archer)
end
test "feed should have the right posts" do
michael = users(:michael)
archer = users(:archer)
lana = users(:lana)
# Posts from followed user
lana.microposts.each do |post_following|
assert michael.feed.include?(post_following)
end
# Posts from self
michael.microposts.each do |post_self|
assert michael.feed.include?(post_self)
end
# Posts from unfollowed user
archer.microposts.each do |post_unfollowed|
assert_not michael.feed.include?(post_unfollowed)
end
end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment