diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb
new file mode 100644
index 0000000..a49fa92
--- /dev/null
+++ b/app/controllers/api_v1/messages_controller.rb
@@ -0,0 +1,7 @@
+class ApiV1::MessagesController < ApplicationController
+ def index
+ @messages = Message.all
+ render :json => @messages.order("id DESC").to_json(only: [:id, :status, :category_name, :title, :content, :created_at])
+
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e9d6aaa..b1577e0 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -16,7 +16,9 @@ def destroy
@comment = current_user.comments.find( params[:id] )
@comment.destroy
- redirect_to :back
+ respond_to do |format|
+ format.js
+ end
end
protected
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 96f65e5..561d78f 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,22 +1,22 @@
class MessagesController < ApplicationController
before_action :authenticate_user!, :except => [:index, :show]
-
+ before_action :set_message, :only => :like
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
- @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_days(params[:days].to_i)
end
end
@@ -58,11 +58,25 @@ def destroy
redirect_to root_path
end
+ def like
+ if current_user.liked_message?(@message)
+ current_user.liked_messages.delete(@message)
+ else
+ current_user.liked_messages << @message
+ end
+ respond_to do |format|
+ format.html {redirect_to message_path(@message)}
+ format.js
+ end
+ end
protected
def message_params
params.require(:message).permit(:title, :content, :category_name)
end
+ def set_message
+ @message = Message.find( params[:id] )
+ end
end
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 e24a8b2..ea0bbed 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -3,9 +3,17 @@ class Message < ActiveRecord::Base
belongs_to :user
has_many :comments, :dependent => :destroy
+ has_many :likes, :dependent => :destroy
+ has_many :likes_users, :through => :likes, :source => :user
+ has_many :subscribes, :dependent => :destroy
+ has_many :subscribes_users, :through => :subscribes, :source => :user
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_days, -> {where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )}
+
end
diff --git a/app/models/subscribe.rb b/app/models/subscribe.rb
new file mode 100644
index 0000000..63706d8
--- /dev/null
+++ b/app/models/subscribe.rb
@@ -0,0 +1,4 @@
+class Subscribe < ActiveRecord::Base
+ belongs_to :user
+ belongs_to :message
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6d01aa9..7a6ad55 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,13 +6,21 @@ class User < ActiveRecord::Base
has_many :messages
has_many :comments
-
+ has_many :likes, :dependent => :destroy
+ has_many :liked_messages, :through => :likes, :source => :message
+ has_many :subscribes, :dependent => :destroy
+ has_many :subscribed_messages, :through => :subscribes, :source => :message
+
def display_name
- self.email.split("@").first
+ self.email.split("@").firstpe
+ end
+ def liked_message?(message) # "?"是希望得到true/false
+ self.liked_messages.include?(message)
end
def posts_count
# TODO: 請完成我
+ self.messages.count + self.comments.count
end
def words_count
@@ -28,5 +36,4 @@ def words_count
return count
end
-
end
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..30ae41f
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1 @@
+$('#c-<%= @comment.id %>').remove();
\ No newline at end of file
diff --git a/app/views/messages/_like.html.erb b/app/views/messages/_like.html.erb
new file mode 100644
index 0000000..cc2d814
--- /dev/null
+++ b/app/views/messages/_like.html.erb
@@ -0,0 +1,5 @@
+<%if current_user.liked_message?(@message)%>
+<%= button_to "Unlike", like_message_path(@message), :remote => true %>
+<%else%>
+<%= button_to "Like", like_message_path(@message), :remote => true %>
+<%end%>
\ No newline at end of file
diff --git a/app/views/messages/like.js.erb b/app/views/messages/like.js.erb
new file mode 100644
index 0000000..3b0c621
--- /dev/null
+++ b/app/views/messages/like.js.erb
@@ -0,0 +1,5 @@
+<% if current_user.liked_message?(@message)%>
+$("#like input[type=submit]").val("Unlike");
+<%else%>
+$("#like input[type=submit]").val("Like");
+<%end%>
\ No newline at end of file
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 41401f6..9ac7e70 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -14,18 +14,40 @@
<%= f.submit %>
+
<% end %>
+
+ <%= render :partial => "like"%>
+
+
+ <% @message.comments.each do |comment| %>
+
+
+<% 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 %>
-
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 74d4dbf..b29d6ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,8 +3,19 @@
resources :messages do
resources :comments
+ member do
+ post :like
+ end
end
+
+ scope :path => "/api/v1", :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do
+ resources :messages
+ end
+
+
+
+
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".
diff --git a/db/schema.rb b/db/schema.rb
index ef7b5c0..b8ae6c3 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: 20161009042845) 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.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "user_id"
+ t.integer "message_id"
+ 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/user_spec.rb b/spec/models/user_spec.rb
index 528cc38..3b3794d 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: "global disaster", content: "cause many damage")
+ Comment.create!(user: @user, content: "typhoon is terrible", message: m)
end
it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
# TODO: 測試 words_count 方法
-
+ expect(@user.words_count).to eq(8)
end
end