From 9c137d5f00adc797fa643f26bb0408fba82a11f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 11:19:59 +0800 Subject: [PATCH 1/8] Comment delete amazed --- app/controllers/comments_controller.rb | 6 +++++- app/views/comments/destroy.js.erb | 1 + app/views/messages/show.html.erb | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 app/views/comments/destroy.js.erb diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index e9d6aaa..0f08afc 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -16,7 +16,11 @@ def destroy @comment = current_user.comments.find( params[:id] ) @comment.destroy - redirect_to :back + respond_to do |format| + format.html { redirect_to :back } + format.js + end + end protected diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb new file mode 100644 index 0000000..e02f77e --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1 @@ +$("#comment-<%= @comment.id %>").remove(); \ No newline at end of file diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 41401f6..b8d7488 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -19,13 +19,14 @@ <% @message.comments.each do |comment| %> -

<%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %> +

+ <%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %> <% if comment.user == current_user %> <%# TODO: 修改成 AJAX 版本的刪除 %> - <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :data => { :confirm => "Are u sure?"} %> + <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :remote => true, :data => { :confirm => "Are u sure?"} %> <% end %> -

+
<% end %> From 163ad3ad6998f639ad8f31f4e971745df61d3298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 11:25:03 +0800 Subject: [PATCH 2/8] N+1 queries upgrade --- app/controllers/messages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 96f65e5..4d3d6ee 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -4,7 +4,7 @@ class MessagesController < ApplicationController def index # TODO: fix N+1 queries for user and comments - @messages = Message.order("id DESC").page( params[:page] ) + @messages = Message.includes(:comments, :user).order("id DESC").page( params[:page] ) if params[:status] == "pending" # TODO: @messages = @messages.pending From 3a3f9aebbe1c8bc352c51140504081d10e6d0668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 11:58:09 +0800 Subject: [PATCH 3/8] ActiveRecord Scope message sort update --- app/controllers/messages_controller.rb | 6 +++--- app/models/message.rb | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 4d3d6ee..fd9f63a 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -8,15 +8,15 @@ def index if params[:status] == "pending" # TODO: @messages = @messages.pending - @messages = @messages.where( :status => "pending" ) + @messages = @messages.pending elsif params[:status] == "completed" # TODO: @messages = @messages.completed - @messages = @messages.where( :status => "completed" ) + @messages = @messages.completed end if params[:days] # TODO: @messages = @messages.within_days(params[:days].to_i) - @messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] ) + @messages = @messages.within_week end end diff --git a/app/models/message.rb b/app/models/message.rb index e24a8b2..d386902 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -8,4 +8,8 @@ def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end + scope :pending, -> { where( :status => "pending") } + scope :completed, -> { where( :status => "completed") } + scope :within_week, -> { where( ["created_at >= ?", Time.now - 7.days] ) } + end From 0a95a86e5777818df60dfb6219619d40f7044c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 13:28:17 +0800 Subject: [PATCH 4/8] post_count test succeed --- app/models/user.rb | 1 + spec/models/user_spec.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 6d01aa9..883d1d9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,6 +13,7 @@ def display_name def posts_count # TODO: 請完成我 + self.messages.count + self.comments.count end def words_count diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 528cc38..a5d50e7 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -22,15 +22,15 @@ end end - describe "#words_count" do - before do - # TODO: 加 Message 和 Comment 測試資料 - end + # describe "#words_count" do + # before do + # # TODO: 加 Message 和 Comment 測試資料 + # end - it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do - # TODO: 測試 words_count 方法 + # it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do + # # TODO: 測試 words_count 方法 - end - end + # end + # end end From 1fed9a035a3f341604a0c85403b31c39a9344c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 13:59:02 +0800 Subject: [PATCH 5/8] Rspec words_count solved --- spec/models/user_spec.rb | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index a5d50e7..5c3e892 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -22,15 +22,23 @@ end end - # describe "#words_count" do - # before do - # # TODO: 加 Message 和 Comment 測試資料 - # end + describe "#words_count" do + before do + # TODO: 加 Message 和 Comment 測試資料 + @other_user = User.create!( :email => Faker::Internet.email.to_s, :password => "12345678") + + m = Message.create!( :title => "Hello world", + :content => "where is the classroom", + :user => @other_user ) - # it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do - # # TODO: 測試 words_count 方法 + m.comments.create!( :content => "Give me some space", :user => @other_user ) + + end - # end - # end + it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do + # TODO: 測試 words_count 方法 + expect( @other_user.words_count ).to eq(10) + end + end end From 76b5e25e1ef97bced5f8c9f0ba5ab3c5d2d55213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 14:28:58 +0800 Subject: [PATCH 6/8] API Messages index complete --- app/controllers/api_controller.rb | 17 +++++++++++++++++ app/controllers/api_v1/messages_controller.rb | 7 +++++++ .../api_v1/messages/_messages.json.jbuilder | 1 + app/views/api_v1/messages/index.json.jbuilder | 1 + config/routes.rb | 4 ++++ 5 files changed, 30 insertions(+) create mode 100644 app/controllers/api_controller.rb create mode 100644 app/controllers/api_v1/messages_controller.rb create mode 100644 app/views/api_v1/messages/_messages.json.jbuilder create mode 100644 app/views/api_v1/messages/index.json.jbuilder diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb new file mode 100644 index 0000000..2afbd5c --- /dev/null +++ b/app/controllers/api_controller.rb @@ -0,0 +1,17 @@ +class ApiController < ActionController::Base + + # skip_before_action :verify_authenticity_token + before_action :enabled_cors + + + private + + def enabled_cors + headers['Access-Control-Allow-Origin'] = '*' + headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE' + headers['Access-Control-Allow-Headers'] = 'Origin, X-Atmosphere-tracking-id, X-Atmosphere-Framework, X-Cache-Date, Content-Type, X-Atmosphere-Transport, X-Remote, api_key, auth_token, *' + headers['Access-Control-Request-Method'] = 'GET, POST, PUT, DELETE' + headers['Access-Control-Request-Headers'] = 'Origin, X-Atmosphere-tracking-id, X-Atmosphere-Framework, X-Cache-Date, Content-Type, X-Atmosphere-Transport, X-Remote, api_key, *' + end + +end \ No newline at end of file diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb new file mode 100644 index 0000000..f7e6e7d --- /dev/null +++ b/app/controllers/api_v1/messages_controller.rb @@ -0,0 +1,7 @@ +class ApiV1::MessagesController < ApiController + + def index + @messages = Message.all + end + +end \ No newline at end of file diff --git a/app/views/api_v1/messages/_messages.json.jbuilder b/app/views/api_v1/messages/_messages.json.jbuilder new file mode 100644 index 0000000..7906cf8 --- /dev/null +++ b/app/views/api_v1/messages/_messages.json.jbuilder @@ -0,0 +1 @@ +json.( m, :id, :status, :category_name, :title, :content, :created_at) \ No newline at end of file diff --git a/app/views/api_v1/messages/index.json.jbuilder b/app/views/api_v1/messages/index.json.jbuilder new file mode 100644 index 0000000..adff53e --- /dev/null +++ b/app/views/api_v1/messages/index.json.jbuilder @@ -0,0 +1 @@ +json.messages @messages , partial: "messages" , as: :m \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 74d4dbf..f68d40b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,10 @@ resources :comments end + scope :path => '/api/v1/', :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do + resources :messages, :only => :index +end + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From 53d501e720a5b79e0c267d11056651500f38383b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 15:10:55 +0800 Subject: [PATCH 7/8] Subscribe and Like Associations build and create destroy --- app/controllers/likes_controller.rb | 25 +++++++++++++++++++ app/controllers/subscribes_controller.rb | 25 +++++++++++++++++++ app/models/like.rb | 6 +++++ app/models/message.rb | 4 +++ app/models/subscribe.rb | 6 +++++ app/models/user.rb | 8 ++++-- config/routes.rb | 2 ++ db/migrate/20161112063728_create_likes.rb | 11 ++++++++ .../20161112063936_create_subscribes.rb | 11 ++++++++ db/schema.rb | 22 +++++++++++++++- spec/models/like_spec.rb | 5 ++++ spec/models/subscribe_spec.rb | 5 ++++ 12 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 app/controllers/likes_controller.rb create mode 100644 app/controllers/subscribes_controller.rb create mode 100644 app/models/like.rb create mode 100644 app/models/subscribe.rb create mode 100644 db/migrate/20161112063728_create_likes.rb create mode 100644 db/migrate/20161112063936_create_subscribes.rb create mode 100644 spec/models/like_spec.rb create mode 100644 spec/models/subscribe_spec.rb diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb new file mode 100644 index 0000000..2b845a9 --- /dev/null +++ b/app/controllers/likes_controller.rb @@ -0,0 +1,25 @@ +class LikesController < ApplicationController + before_action :authenticate_user! + before_action :set_message + + def create + @subscribe = current_user.likes.build(:message_id => params[:message_id]) + @subscribe.save + + redirect_to message_path(@message) + end + + def destroy + @subscribe = current_user.likes.find_by_message_id(params[:message_id]) + @subscribe.destroy + + redirect_to message_path(@message) + end + + private + + def set_message + @message = Message.find(params[:message_id]) + end + +end \ No newline at end of file diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb new file mode 100644 index 0000000..68ed8a5 --- /dev/null +++ b/app/controllers/subscribes_controller.rb @@ -0,0 +1,25 @@ +class SubscribesController < ApplicationController + before_action :authenticate_user! + before_action :set_message + + def create + @subscribe = current_user.subscribes.build(:message_id => params[:message_id]) + @subscribe.save + + redirect_to message_path(@message) + end + + def destroy + @subscribe = current_user.subscribes.find_by_message_id(params[:message_id]) + @subscribe.destroy + + redirect_to message_path(@message) + end + + private + + def set_message + @message = Message.find(params[:message_id]) + end + +end \ No newline at end of file diff --git a/app/models/like.rb b/app/models/like.rb new file mode 100644 index 0000000..7f26420 --- /dev/null +++ b/app/models/like.rb @@ -0,0 +1,6 @@ +class Like < ActiveRecord::Base + + belongs_to :user + belongs_to :message + +end diff --git a/app/models/message.rb b/app/models/message.rb index d386902..e28d2c5 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -3,6 +3,10 @@ class Message < ActiveRecord::Base belongs_to :user has_many :comments, :dependent => :destroy + has_many :subscribes, :dependent => :destroy + has_many :subscribe_users, :through => :subscribes, :source => :user + has_many :likes, :dependent => :destroy + has_many :like_users, :through => :likes, :source => :user def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) diff --git a/app/models/subscribe.rb b/app/models/subscribe.rb new file mode 100644 index 0000000..23c4669 --- /dev/null +++ b/app/models/subscribe.rb @@ -0,0 +1,6 @@ +class Subscribe < ActiveRecord::Base + + belongs_to :user + belongs_to :message + +end diff --git a/app/models/user.rb b/app/models/user.rb index 883d1d9..b02eb2f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -4,8 +4,12 @@ class User < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable - has_many :messages - has_many :comments + has_many :messages, :dependent => :destroy + has_many :comments, :dependent => :destroy + has_many :subscribes, :dependent => :destroy + has_many :subscribe_message, :through => :subscribes, :source => :message + has_many :likes, :dependent => :destroy + has_many :like_message, :through => :likes, :source => :message def display_name self.email.split("@").first diff --git a/config/routes.rb b/config/routes.rb index f68d40b..e315bc5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,8 @@ resources :messages do resources :comments + resources :subscribes, only: [:create, :destroy] + resources :likes, only: [:create, :destroy] end scope :path => '/api/v1/', :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do diff --git a/db/migrate/20161112063728_create_likes.rb b/db/migrate/20161112063728_create_likes.rb new file mode 100644 index 0000000..c0e0909 --- /dev/null +++ b/db/migrate/20161112063728_create_likes.rb @@ -0,0 +1,11 @@ +class CreateLikes < ActiveRecord::Migration + def change + create_table :likes do |t| + t.integer :user_id + t.integer :message_id + t.timestamps null: false + end + add_index :likes, :user_id + add_index :likes, :message_id + end +end diff --git a/db/migrate/20161112063936_create_subscribes.rb b/db/migrate/20161112063936_create_subscribes.rb new file mode 100644 index 0000000..743c135 --- /dev/null +++ b/db/migrate/20161112063936_create_subscribes.rb @@ -0,0 +1,11 @@ +class CreateSubscribes < ActiveRecord::Migration + def change + create_table :subscribes do |t| + t.integer :user_id + t.integer :message_id + t.timestamps null: false + end + add_index :subscribes, :user_id + add_index :subscribes, :message_id + end +end diff --git a/db/schema.rb b/db/schema.rb index ef7b5c0..dbf62c5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150728165437) do +ActiveRecord::Schema.define(version: 20161112063936) do create_table "comments", force: :cascade do |t| t.text "content" @@ -23,6 +23,16 @@ add_index "comments", ["message_id"], name: "index_comments_on_message_id" + create_table "likes", force: :cascade do |t| + t.integer "user_id" + t.integer "message_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "likes", ["message_id"], name: "index_likes_on_message_id" + add_index "likes", ["user_id"], name: "index_likes_on_user_id" + create_table "messages", force: :cascade do |t| t.string "title" t.text "content" @@ -36,6 +46,16 @@ add_index "messages", ["status"], name: "index_messages_on_status" add_index "messages", ["user_id"], name: "index_messages_on_user_id" + create_table "subscribes", force: :cascade do |t| + t.integer "user_id" + t.integer "message_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "subscribes", ["message_id"], name: "index_subscribes_on_message_id" + add_index "subscribes", ["user_id"], name: "index_subscribes_on_user_id" + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb new file mode 100644 index 0000000..76ea93d --- /dev/null +++ b/spec/models/like_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Like, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/subscribe_spec.rb b/spec/models/subscribe_spec.rb new file mode 100644 index 0000000..545a45d --- /dev/null +++ b/spec/models/subscribe_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Subscribe, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 6e2ec86a689896f474d0d5ca6e528e1f41c54284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E7=92=9F=E7=9A=93?= Date: Sat, 12 Nov 2016 16:15:47 +0800 Subject: [PATCH 8/8] Subscribe and Like fake data generate and seen on SHOW --- app/models/user.rb | 4 ++++ app/views/messages/show.html.erb | 18 +++++++++++++++++- lib/tasks/dev.rake | 6 ++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index b02eb2f..56f2716 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -34,4 +34,8 @@ def words_count return count end + def short_name + self.email.split("@").first + end + end diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index b8d7488..899e945 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,6 +1,22 @@

<%= @message.title %>

-<%= simple_format @message.content %> +
<%= simple_format @message.content %>
+
+Subscriber: + <% if @message.subscribe_users %> + <% @message.subscribe_users.each do |su| %> + <%= su.short_name %> + <% end %> + <% end %> +
+
+ <% if @message.like_users %> + <% @message.like_users.each do |su| %> + <%= su.short_name %> + <% end %> + <% end %> + likes +

Comments list

diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4673e72..7f26ed7 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -17,10 +17,16 @@ namespace :dev do :content => Faker::Lorem.paragraph, :user => users.sample, :created_at => Time.now - rand(30).days ) + 5.times do m.comments.create!( :content => Faker::Lorem.paragraph, :user => users.sample ) end + + 2.times do + Subscribe.create!( :message_id => m.id, :user => users.sample ) + Like.create!( :message_id => m.id, :user => users.sample ) + end end end