Skip to content

S
sample_app
Commit e1383332 by Tan Phat Nguyen
Options

Modify coding convention

parent 974672c5
Showing with 177 additions and 173 deletions
.gitignore
...@@ -14,3 +14,4 @@ ...@@ -14,3 +14,4 @@
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
/log/*.log /log/*.log
/tmp /tmp
#/public/uploads
app/controllers/application_controller.rb
...@@ -14,4 +14,4 @@ class ApplicationController < ActionController::Base ...@@ -14,4 +14,4 @@ class ApplicationController < ActionController::Base
redirect_to login_url redirect_to login_url
end end
end end
end end
\ No newline at end of file
app/controllers/microposts_controller.rb
...@@ -3,19 +3,20 @@ class MicropostsController < ApplicationController ...@@ -3,19 +3,20 @@ class MicropostsController < ApplicationController
before_action :correct_user, only: :destroy before_action :correct_user, only: :destroy
def create def create
@feed_items = current_user.microposts.paginate(page: params[:page])
@micropost = current_user.microposts.build(micropost_params) @micropost = current_user.microposts.build(micropost_params)
if @micropost.save if @micropost.save
flash[:success] = "Micropost created!" flash[:success] = 'Micropost created!'
redirect_to root_url redirect_to root_url
else else
@feed_items = []
render 'static_pages/home' render 'static_pages/home'
end end
end end
def destroy def destroy
@micropost.destroy @micropost.destroy
flash[:success] = "Micropost deleted" flash[:success] = 'Micropost deleted'
redirect_to request.referrer || root_url redirect_to request.referrer || root_url
end end
...@@ -27,6 +28,6 @@ class MicropostsController < ApplicationController ...@@ -27,6 +28,6 @@ class MicropostsController < ApplicationController
def correct_user def correct_user
@micropost = current_user.microposts.find_by(id: params[:id]) @micropost = current_user.microposts.find_by(id: params[:id])
redirect_to root_url if @micropost.nil? redirect_to root_url if @micropost
end end
end end
app/controllers/sessions_controller.rb
class SessionsController < ApplicationController class SessionsController < ApplicationController
def new def new
end end
......
app/controllers/static_pages_controller.rb
class StaticPagesController < ApplicationController class StaticPagesController < ApplicationController
def home def home
@micropost = current_user.microposts.build if logged_in? if logged_in?
@feed_items = current_user.feed.paginate(page: params[:page]) @micropost = current_user.microposts.build
@feed_items = current_user.microposts.paginate(page: params[:page])
end
end end
def help def help
......
app/controllers/users_controller.rb
...@@ -2,6 +2,7 @@ class UsersController < ApplicationController ...@@ -2,6 +2,7 @@ class UsersController < ApplicationController
before_action :logged_in_user, only: [:index, :edit, :update, :destroy] before_action :logged_in_user, only: [:index, :edit, :update, :destroy]
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 :set_user, only: [:show, :edit, :update, :destroy]
def index def index
...@@ -9,12 +10,13 @@ class UsersController < ApplicationController ...@@ -9,12 +10,13 @@ class UsersController < ApplicationController
end end
def show def show
@user = User.find(params[:id])
@microposts = @user.microposts.paginate(page: params[:page]) @microposts = @user.microposts.paginate(page: params[:page])
end end
def new def new
@user = User.new @user = User.new
end end
def create def create
@user = User.new(user_params) @user = User.new(user_params)
if @user.save if @user.save
...@@ -27,11 +29,9 @@ class UsersController < ApplicationController ...@@ -27,11 +29,9 @@ class UsersController < ApplicationController
end end
def edit def edit
@user = User.find(params[:id])
end end
def update def update
@user = User.find(params[:id])
if @user.update_attributes(user_params) if @user.update_attributes(user_params)
flash[:success] = "Profile updated" flash[:success] = "Profile updated"
redirect_to @user redirect_to @user
...@@ -41,29 +41,27 @@ class UsersController < ApplicationController ...@@ -41,29 +41,27 @@ class UsersController < ApplicationController
end end
def destroy def destroy
User.find(params[:id]).destroy @user.destroy
flash[:success] = "User deleted" flash[:success] = "User deleted"
redirect_to users_url redirect_to users_url
end end
def user_params private
params.require(:user).permit(:name, :email, :password, :password_confirmation)
end
def logged_in_user def user_params
unless logged_in? params.require(:user).permit(:name, :email, :password, :password_confirmation)
store_location end
flash[:danger] = "Please log in."
redirect_to login_url def set_user
end @user = User.find(params[:id])
end end
def correct_user def correct_user
@user = User.find(params[:id]) @user = User.find(params[:id])
redirect_to(root_url) unless current_user?(@user) redirect_to(root_url) unless current_user?(@user)
end end
def admin_user def admin_user
redirect_to(root_url) unless current_user.admin? redirect_to(root_url) unless current_user.admin?
end end
end end
app/helpers/sessions_helper.rb
...@@ -6,13 +6,13 @@ module SessionsHelper ...@@ -6,13 +6,13 @@ module SessionsHelper
def current_user def current_user
if (user_id = session[:user_id]) if (user_id = session[:user_id])
@current_user ||= User.find_by(id: user_id) @current_user ||= User.find_by(id: user_id)
elsif (user_id = cookies.signed[:user_id]) elsif (user_id = cookies.signed[:user_id])
user = User.find_by(id: user_id) user = User.find_by(id: user_id)
if user && user.authenticated?(cookies[:remember_token]) if user && user.authenticated?(cookies[:remember_token])
log_in user log_in user
@current_user = user @current_user = user
end end
end end
end end
def logged_in? def logged_in?
...@@ -20,16 +20,16 @@ module SessionsHelper ...@@ -20,16 +20,16 @@ module SessionsHelper
end end
def log_out def log_out
forget(current_user) forget(current_user)
session.delete(:user_id) session.delete(:user_id)
@current_user = nil @current_user = nil
end end
def remember(user) def remember(user)
user.remember user.remember
cookies.permanent.signed[:user_id] = user.id cookies.permanent.signed[:user_id] = user.id
cookies.permanent[:remember_token] = user.remember_token cookies.permanent[:remember_token] = user.remember_token
end end
# Forgets a persistent session. # Forgets a persistent session.
def forget(user) def forget(user)
...@@ -39,8 +39,8 @@ module SessionsHelper ...@@ -39,8 +39,8 @@ module SessionsHelper
end end
def current_user?(user) def current_user?(user)
user == current_user user == current_user
end end
# Redirects to stored location (or to the default). # Redirects to stored location (or to the default).
def redirect_back_or(default) def redirect_back_or(default)
......
app/models/micropost.rb
class Micropost < ActiveRecord::Base class Micropost < ActiveRecord::Base
belongs_to :user
default_scope -> { order('created_at DESC') } default_scope -> { order('created_at DESC') }
mount_uploader :picture, PictureUploader
belongs_to :user
validates :user_id, presence: true validates :user_id, presence: true
validates :content, presence: true, length: { maximum: 140 } validates :content, presence: true, length: { maximum: 140 }
validate :picture_size validate :picture_size
mount_uploader :picture, PictureUploader
private private
def picture_size def picture_size
...@@ -13,5 +16,4 @@ class Micropost < ActiveRecord::Base ...@@ -13,5 +16,4 @@ class Micropost < ActiveRecord::Base
errors.add(:picture, "should be less than 5MB") errors.add(:picture, "should be less than 5MB")
end end
end end
end end
app/models/user.rb
class User < ActiveRecord::Base class User < ActiveRecord::Base
has_many :microposts, dependent: :destroy attr_accessor :remember_token
attr_accessor :remember_token
before_save {self.email = email.downcase}
validates :name, presence: true, length: {maximum: 50}
VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
validates :email, presence: true, length: {maximum: 255}, format: {with: VALID_EMAIL_REGEX}, uniqueness: {case_sensitive: false} has_many :microposts, dependent: :destroy
has_secure_password
validates :password, length: {minimum: 6}, allow_blank: true validates :name, presence: true, length: { maximum: 50 }
validates :email, presence: true, length: { maximum: 255 }, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
validates :password, length: { minimum: 6 }, allow_blank: true
has_secure_password before_save { self.email = email.downcase }
def self.digest(string) def self.digest(string)
cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST :
BCrypt::Engine.cost BCrypt::Engine.cost
BCrypt::Password.create(string, cost: cost) BCrypt::Password.create(string, cost: cost)
end end
def self.new_token def self.new_token
SecureRandom.urlsafe_base64 SecureRandom.urlsafe_base64
end end
def remember def remember
self.remember_token = User.new_token self.remember_token = User.new_token
update_attribute(:remember_digest, User.digest(remember_token)) update_attribute(:remember_digest, User.digest(remember_token))
end end
def authenticated?(remember_token) def authenticated?(remember_token)
return false if remember_digest.nil? return false if remember_digest
BCrypt::Password.new(remember_digest).is_password?(remember_token) BCrypt::Password.new(remember_digest).is_password?(remember_token)
end end
def forget def forget
update_attribute(:remember_digest, nil) update_attribute(:remember_digest, nil)
end end
def feed
# This is preliminary. See "Following users" for the full implementation.
Micropost.where("user_id = ?", id)
end
end end
app/views/layouts/_header.html.erb
<header class="navbar navbar-fixed-top navbar-inverse"> <header class="navbar navbar-fixed-top navbar-inverse">
<div class="container"> <div class="container">
<%= link_to "sample app", root_path, id: "logo" %> <%= link_to "sample app", root_path, id: "logo" %>
<nav> <nav>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li><%= link_to "Home", root_path %></li> <li><%= link_to "Home", root_path %></li>
<li><%= link_to "Help", help_path %></li> <li><%= link_to "Help", help_path %></li>
<% if logged_in? %> <% if logged_in? %>
<li><%= link_to "Users", users_path %></li> <li><%= link_to "Users", users_path %></li>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
Account <b class="caret"></b> Account <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><%= link_to "Profile", current_user %></li> <li><%= link_to "Profile", current_user %></li>
<li><%= link_to "Settings", edit_user_path(current_user) %></li> <li><%= link_to "Settings", edit_user_path(current_user) %></li>
<li class="divider"></li> <li class="divider"></li>
<li><%= link_to "Log out", logout_path, method: "delete" %></li> <li><%= link_to "Log out", logout_path, method: "delete" %></li>
</ul> </ul>
</li> </li>
<% else %> <% else %>
<li><%= link_to "Log in", login_path %></li> <li><%= link_to "Log in", login_path %></li>
<% end %> <% end %>
</ul> </ul>
</nav> </nav>
</div> </div>
</header> </header>
app/views/users/_fields.html.erb
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
<%= f.label :password %> <%= f.label :password %>
<%= f.password_field :password, class: 'form-control' %> <%= f.password_field :password, class: 'form-control' %>
<%= f.label :password_confirmation, "Confirmation" %> <%= f.label :password_confirmation, 'Confirmation' %>
<%= f.password_field :password_confirmation, class: 'form-control' %> <%= f.password_field :password_confirmation, class: 'form-control' %>
\ No newline at end of file
test/integration/microposts_interface_test.rb
...@@ -2,32 +2,32 @@ require 'test_helper' ...@@ -2,32 +2,32 @@ require 'test_helper'
class MicropostInterfaceTest < ActionDispatch::IntegrationTest class MicropostInterfaceTest < ActionDispatch::IntegrationTest
def setup def setup
@user = users(:michael) @user = users(:michael)
end end
test "micropost interface" do test "micropost interface" do
log_in_as(@user) log_in_as(@user)
get root_path get root_path
assert_select 'div.pagination' assert_select 'div.pagination'
# Invalid submission # Invalid submission
post microposts_path, micropost: { content: "" } post microposts_path, micropost: { content: "" }
assert_select 'div#error_explanation' assert_select 'div#error_explanation'
# Valid submission # Valid submission
content = "This micropost really ties the room together" content = "This micropost really ties the room together"
assert_difference 'Micropost.count', 1 do assert_difference 'Micropost.count', 1 do
post microposts_path, micropost: { content: content } post microposts_path, micropost: { content: content }
end end
follow_redirect! follow_redirect!
assert_match content, response.body assert_match content, response.body
# Delete a post. # Delete a post.
assert_select 'a', 'delete' assert_select 'a', 'delete'
first_micropost = @user.microposts.paginate(page: 1).first first_micropost = @user.microposts.paginate(page: 1).first
assert_difference 'Micropost.count', -1 do assert_difference 'Micropost.count', -1 do
delete micropost_path(first_micropost) delete micropost_path(first_micropost)
end end
# Visit a different user. # Visit a different user.
get user_path(users(:archer)) get user_path(users(:archer))
assert_select 'a', { text: 'delete', count: 0 } assert_select 'a', { text: 'delete', count: 0 }
end end
end end
test/models/user_test.rb
...@@ -4,57 +4,58 @@ class UserTest < ActiveSupport::TestCase ...@@ -4,57 +4,58 @@ class UserTest < ActiveSupport::TestCase
def setup def setup
@user = User.new(name: "Example User", email: "user@example.com", password: "foobar", password_confirmation: "foobar") @user = User.new(name: "Example User", email: "user@example.com", password: "foobar", password_confirmation: "foobar")
end end
test "should be valid" do
assert @user.valid?
end
test "name should be present" do test "should be valid" do
@user.name = "" assert @user.valid?
assert_not @user.valid? end
end
test "name should be present" do
@user.name = ""
assert_not @user.valid?
end
should validate_presence_of(:name) should validate_presence_of(:name)
test "email should be present" do test "email should be present" do
@user.email = " " @user.email = " "
assert_not @user.valid? assert_not @user.valid?
end end
test "name should not be too long" do test "name should not be too long" do
@user.name = "a" * 51 @user.name = "a" * 51
assert_not @user.valid? assert_not @user.valid?
end end
test "email should not be too long" do test "email should not be too long" do
@user.email = "a" * 256 @user.email = "a" * 256
assert_not @user.valid? assert_not @user.valid?
end end
test "email validation should accept valid addresses" do test "email validation should accept valid addresses" do
valid_addresses = %w[user@example,com user_at_foo.org user.name@example. foo@bar_baz.com foo@bar+baz.com] valid_addresses = %w(user@example,com user_at_foo.org user.name@example. foo@bar_baz.com foo@bar+baz.com)
valid_addresses.each do |valid_address| valid_addresses.each do |valid_address|
@user.email = valid_address @user.email = valid_address
assert_not @user.valid?, "#{valid_address.inspect} should be valid" assert_not @user.valid?, "#{valid_address.inspect} should be valid"
end end
end end
test "email addresses should be unique" do test "email addresses should be unique" do
duplicate_user = @user.dup duplicate_user = @user.dup
duplicate_user.email = @user.email.upcase duplicate_user.email = @user.email.upcase
@user.save @user.save
assert_not duplicate_user.valid? assert_not duplicate_user.valid?
end end
test "password should have a minimum length" do test "password should have a minimum length" do
@user.password = @user.password_confirmation = "a" * 5 @user.password = @user.password_confirmation = "a" * 5
assert_not @user.valid? assert_not @user.valid?
end end
test "authenticated? should return false for a user with nil digest" do test "authenticated? should return false for a user with nil digest" do
assert_not @user.authenticated?('') assert_not @user.authenticated?('')
end end
test "associated microposts should be destroyed" do test "associated microposts should be destroyed" do
@user.save @user.save
@user.microposts.create!(content: "Lorem ipsum") @user.microposts.create!(content: "Lorem ipsum")
assert_difference 'Micropost.count', -1 do assert_difference 'Micropost.count', -1 do
......
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