From 658dc5823baca37270c15e088e955cf446a8dad8 Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 20:43:40 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1.=20(=E6=94=B9=20Ajax)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/comments_controller.rb | 6 +++++- app/views/comments/destroy.js.erb | 1 + app/views/messages/show.html.erb | 18 +++++++++--------- 3 files changed, 15 insertions(+), 10 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..872880a --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1 @@ +$('.comment-<%= @comment.id%>').fadeOut(); \ No newline at end of file diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 41401f6..8156101 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -18,14 +18,14 @@ <% end %> <% @message.comments.each do |comment| %> - -

<%= 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?"} %> - <% end %> -

- +
+

<%= 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, remote: true %> + <% end %> +

+
<% end %> From 21d01beb2cbbeb732081013ed00b7c3d449413a1 Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 21:11:53 +0800 Subject: [PATCH 2/9] =?UTF-8?q?2.=20(=E4=BF=AE=20N+1=20queries)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..63a7909 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(:user, :comments).order("id DESC").page( params[:page] ) if params[:status] == "pending" # TODO: @messages = @messages.pending From 3356ba472a9c75aaaa99548bab1a5394d40d75ba Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 21:16:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?3.=20(=E6=94=B9=20ActiveRecord=20Scope)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 7 ++++--- app/models/message.rb | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 63a7909..797250b 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -5,13 +5,14 @@ class MessagesController < ApplicationController def index # TODO: fix N+1 queries for user and comments @messages = Message.includes(:user, :comments).order("id DESC").page( params[:page] ) - if params[:status] == "pending" # TODO: @messages = @messages.pending - @messages = @messages.where( :status => "pending" ) + # @messages = @messages.where( :status => "pending" ) + @messages = @messages.pending elsif params[:status] == "completed" # TODO: @messages = @messages.completed - @messages = @messages.where( :status => "completed" ) + # @messages = @messages.where( :status => "completed" ) + @messages = @messages.completed end if params[:days] diff --git a/app/models/message.rb b/app/models/message.rb index e24a8b2..c2d9a3a 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -4,6 +4,10 @@ class Message < ActiveRecord::Base has_many :comments, :dependent => :destroy + scope :pending, -> { where( :status => "pending" ) } + + scope :completed, -> { where( :status => "completed" ) } + def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end From d3937e153062ecd0a0f67a6a10c7555fd4e63559 Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 21:21:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?4.=20(=E5=96=AE=E5=85=83=E6=B8=AC=E8=A9=A6?= =?UTF-8?q?=E5=B7=B2=E7=B6=93=E5=AF=AB=E5=A5=BD=EF=BC=8C=E5=BE=85=E5=AF=A6?= =?UTF-8?q?=E4=BD=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) 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 From 0de763347c497730f478dc1e6e1be573305a61fd Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 21:37:27 +0800 Subject: [PATCH 5/9] =?UTF-8?q?5.=20(=E5=AF=A6=E4=BD=9C=E5=B7=B2=E7=B6=93?= =?UTF-8?q?=E5=AF=AB=E5=A5=BD=EF=BC=8C=E5=8A=A0=E5=96=AE=E5=85=83=E6=B8=AC?= =?UTF-8?q?=E8=A9=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/models/user_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 528cc38..c0593fb 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -25,11 +25,13 @@ describe "#words_count" do before do # TODO: 加 Message 和 Comment 測試資料 + m = Message.create!( user: @user, title: "I am Edward.", content: "I am Edward too.") + Comment.create!(user: @user, content: "I am Edward too too.", message: m) end it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do # TODO: 測試 words_count 方法 - + expect( @user.words_count ).to eq(12) end end From ed049b00b5d3f302854b4e8eefe79565eeeaab2f Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 22:16:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?6.=20=E8=AB=8B=E5=AF=A6=E4=BD=9C=E4=B8=80?= =?UTF-8?q?=E5=80=8B=20JSON=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/api_v1/messages.coffee | 3 +++ app/assets/stylesheets/api_v1/messages.scss | 3 +++ app/controllers/api_v1/messages_controller.rb | 9 +++++++++ app/helpers/api_v1/messages_helper.rb | 2 ++ app/views/api_v1/messages/index.json | 10 ++++++++++ config/routes.rb | 4 ++++ .../api_v1/messages_controller_spec.rb | 5 +++++ spec/helpers/api_v1/messages_helper_spec.rb | 15 +++++++++++++++ 8 files changed, 51 insertions(+) create mode 100644 app/assets/javascripts/api_v1/messages.coffee create mode 100644 app/assets/stylesheets/api_v1/messages.scss create mode 100644 app/controllers/api_v1/messages_controller.rb create mode 100644 app/helpers/api_v1/messages_helper.rb create mode 100644 app/views/api_v1/messages/index.json create mode 100644 spec/controllers/api_v1/messages_controller_spec.rb create mode 100644 spec/helpers/api_v1/messages_helper_spec.rb diff --git a/app/assets/javascripts/api_v1/messages.coffee b/app/assets/javascripts/api_v1/messages.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/api_v1/messages.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/api_v1/messages.scss b/app/assets/stylesheets/api_v1/messages.scss new file mode 100644 index 0000000..db6f927 --- /dev/null +++ b/app/assets/stylesheets/api_v1/messages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the api_v1::messages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb new file mode 100644 index 0000000..8ced6aa --- /dev/null +++ b/app/controllers/api_v1/messages_controller.rb @@ -0,0 +1,9 @@ +class ApiV1::MessagesController < ApplicationController + + def index + messages = Message.all + + render json: messages, only: [:id, :status, :category_name, :title, :content, :created_at] + end + +end diff --git a/app/helpers/api_v1/messages_helper.rb b/app/helpers/api_v1/messages_helper.rb new file mode 100644 index 0000000..21af019 --- /dev/null +++ b/app/helpers/api_v1/messages_helper.rb @@ -0,0 +1,2 @@ +module ApiV1::MessagesHelper +end diff --git a/app/views/api_v1/messages/index.json b/app/views/api_v1/messages/index.json new file mode 100644 index 0000000..c44b499 --- /dev/null +++ b/app/views/api_v1/messages/index.json @@ -0,0 +1,10 @@ +messages.each |message| + +{ + id: message.id + status: message.status + category_name: message.category_name + title: message.title + content: message.content + created_at: message.created_at +} \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 74d4dbf..753b1e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,4 +59,8 @@ # # (app/controllers/admin/products_controller.rb) # resources :products # end + + scope :path => '/api/v1/', :module => "api_v1", :defaults => { :format => :json }, :as => 'v1' do + resources :messages, only: [:index] + end end diff --git a/spec/controllers/api_v1/messages_controller_spec.rb b/spec/controllers/api_v1/messages_controller_spec.rb new file mode 100644 index 0000000..e1f1525 --- /dev/null +++ b/spec/controllers/api_v1/messages_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ApiV1::MessagesController, type: :controller do + +end diff --git a/spec/helpers/api_v1/messages_helper_spec.rb b/spec/helpers/api_v1/messages_helper_spec.rb new file mode 100644 index 0000000..e078b0d --- /dev/null +++ b/spec/helpers/api_v1/messages_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the ApiV1::MessagesHelper. For example: +# +# describe ApiV1::MessagesHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe ApiV1::MessagesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From f252c91dc5ff76806811386a647d9502051805b7 Mon Sep 17 00:00:00 2001 From: A-hu Date: Fri, 7 Oct 2016 22:30:44 +0800 Subject: [PATCH 7/9] =?UTF-8?q?(7-1)=20=E8=AB=8B=E6=96=B0=E5=A2=9E=20Subsc?= =?UTF-8?q?ription=20=E5=92=8C=20Like=20=E5=85=A9=E5=80=8B=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/like.rb | 4 ++++ app/models/message.rb | 6 +++++ app/models/subscription.rb | 4 ++++ app/models/user.rb | 7 ++++++ .../20161007141717_create_subscriptions.rb | 12 ++++++++++ db/migrate/20161007141726_create_likes.rb | 12 ++++++++++ db/schema.rb | 22 ++++++++++++++++++- spec/models/like_spec.rb | 5 +++++ spec/models/subscription_spec.rb | 5 +++++ 9 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 app/models/like.rb create mode 100644 app/models/subscription.rb create mode 100644 db/migrate/20161007141717_create_subscriptions.rb create mode 100644 db/migrate/20161007141726_create_likes.rb create mode 100644 spec/models/like_spec.rb create mode 100644 spec/models/subscription_spec.rb diff --git a/app/models/like.rb b/app/models/like.rb new file mode 100644 index 0000000..88c087f --- /dev/null +++ b/app/models/like.rb @@ -0,0 +1,4 @@ +class Like < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/message.rb b/app/models/message.rb index c2d9a3a..e1fda7f 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -8,6 +8,12 @@ class Message < ActiveRecord::Base scope :completed, -> { where( :status => "completed" ) } + has_many :subscriptions, dependent: :destroy + has_many :subscribed_users, through: :subscriptions, source: :user, dependent: :destroy + + has_many :likes, dependent: :destroy + has_many :liked_users, through: :likes, source: :user, dependent: :destroy + def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end diff --git a/app/models/subscription.rb b/app/models/subscription.rb new file mode 100644 index 0000000..24876ed --- /dev/null +++ b/app/models/subscription.rb @@ -0,0 +1,4 @@ +class Subscription < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/user.rb b/app/models/user.rb index 883d1d9..e636785 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,6 +7,13 @@ class User < ActiveRecord::Base has_many :messages has_many :comments + has_many :subscriptions, dependent: :destroy + has_many :subscription_messages, through: :subscriptions, source: :message, dependent: :destroy + + has_many :likes, dependent: :destroy + has_many :like_messages, through: :likes, source: :message, dependent: :destroy + + def display_name self.email.split("@").first end diff --git a/db/migrate/20161007141717_create_subscriptions.rb b/db/migrate/20161007141717_create_subscriptions.rb new file mode 100644 index 0000000..d9fc9af --- /dev/null +++ b/db/migrate/20161007141717_create_subscriptions.rb @@ -0,0 +1,12 @@ +class CreateSubscriptions < ActiveRecord::Migration + def change + create_table :subscriptions do |t| + t.integer :user_id + t.integer :message_id + + t.timestamps null: false + end + add_index :subscriptions, :user_id + add_index :subscriptions, :message_id + end +end diff --git a/db/migrate/20161007141726_create_likes.rb b/db/migrate/20161007141726_create_likes.rb new file mode 100644 index 0000000..6ea8a85 --- /dev/null +++ b/db/migrate/20161007141726_create_likes.rb @@ -0,0 +1,12 @@ +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/schema.rb b/db/schema.rb index ef7b5c0..d3bf66d 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: 20161007141726) 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 "subscriptions", 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 "subscriptions", ["message_id"], name: "index_subscriptions_on_message_id" + add_index "subscriptions", ["user_id"], name: "index_subscriptions_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/subscription_spec.rb b/spec/models/subscription_spec.rb new file mode 100644 index 0000000..d40bf0b --- /dev/null +++ b/spec/models/subscription_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Subscription, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From d26819be8a664529862c26709d4bbdd036d97e09 Mon Sep 17 00:00:00 2001 From: A-hu Date: Sat, 8 Oct 2016 00:32:27 +0800 Subject: [PATCH 8/9] =?UTF-8?q?(7-2)=20=E6=8E=A5=E8=91=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20bundle=20exec=20rake=20dev:fake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/dev.rake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4673e72..0a6d335 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -17,6 +17,14 @@ namespace :dev do :content => Faker::Lorem.paragraph, :user => users.sample, :created_at => Time.now - rand(30).days ) + a = (users[0].id..users[9].id).to_a.shuffle.take(2) + m.liked_users << User.find(a[0]) + m.liked_users << User.find(a[1]) + + b = (users[0].id..users[9].id).to_a.shuffle.take(2) + m.subscribed_users << User.find(b[0]) + m.subscribed_users << User.find(b[1]) + 5.times do m.comments.create!( :content => Faker::Lorem.paragraph, :user => users.sample ) From c0562986acccfb94e4352f02855ed53712e96f98 Mon Sep 17 00:00:00 2001 From: A-hu Date: Sat, 8 Oct 2016 00:51:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?(7-3)=20=E6=9C=80=E5=BE=8C=E5=9C=A8=20messa?= =?UTF-8?q?ges=20show=20=E9=A0=81=E9=9D=A2=E4=B8=8A=EF=BC=8C=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E6=9C=89=E8=AA=B0=E8=A8=82=E9=96=B1=E5=92=8C=E6=8C=89?= =?UTF-8?q?=E8=B4=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/show.html.erb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 8156101..5f9a0c8 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -17,6 +17,34 @@ <% end %> +


+ + + + + + + <% @message.liked_users.each do |liked_user| %> + + + <% end %> +
誰按LIKE
<%= liked_user.display_name %>
+ +


+ +
+ + + + + <% @message.subscribed_users.each do |subscribed_user| %> + + + <% end %> +
誰收藏
<%= subscribed_user.display_name %>
+ +


+ <% @message.comments.each do |comment| %>

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