Skip to content
Open

EDVv #53

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/assets/javascripts/api_v1/messages.coffee
Original file line number Diff line number Diff line change
@@ -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/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/api_v1/messages.scss
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 2 additions & 0 deletions app/controllers/api_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class ApiController < ActionController::Base
end
11 changes: 11 additions & 0 deletions app/controllers/api_v1/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class ApiV1::MessagesController < ApiController
def index
@messages = Message.all
render :json => @messages.to_json
end

def show
@message = Message.find(params[:id])
render :json => @message.to_json
end
end
5 changes: 4 additions & 1 deletion app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ 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
Expand Down
36 changes: 33 additions & 3 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ 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).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]
Expand All @@ -22,6 +24,11 @@ def index

def show
@message = Message.find( params[:id] )

#Message.last.likes.first.user.email
@who_like_message = @message.likes
@who_subscribe_message = @message.subscribes

@comment = Comment.new
end

Expand Down Expand Up @@ -59,6 +66,29 @@ def destroy
redirect_to root_path
end

def like
@message = Message.find(params[:id])
if current_user.like_message?(@message)
current_user.like_messages.delete(@message)
else
current_user.like_messages << @message
end

redirect_to message_path(@message)
end

def subscribe
@message = Message.find(params[:id])
if current_user.subscribe_message?(@message)
current_user.subscribe_messages.delete(@message)
else
current_user.subscribe_messages << @message
end

redirect_to message_path(@message)
end


protected

def message_params
Expand Down
2 changes: 2 additions & 0 deletions app/helpers/api_v1/messages_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module ApiV1::MessagesHelper
end
4 changes: 4 additions & 0 deletions app/models/like.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class Like < ActiveRecord::Base
belongs_to :user
belongs_to :message
end
12 changes: 12 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ class Message < ActiveRecord::Base

has_many :comments, :dependent => :destroy

has_many :likes

has_many :subscribes

scope :pending, -> {where(:status => :pending)}

scope :completed, -> {where(:status => :completed)}

scope :within_days, -> {where(':status => :created_at?', Time.now - params[:days].to_i.days)}

#scope :who_like_it, -> {where(:status => :completed)}

def last_comment_summary
self.comments.last.try(:content).try(:truncate, 20)
end
Expand Down
4 changes: 4 additions & 0 deletions app/models/subscribe.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class Subscribe < ActiveRecord::Base
belongs_to :user
belongs_to :message
end
15 changes: 15 additions & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,27 @@ class User < ActiveRecord::Base
has_many :messages
has_many :comments

has_many :likes
has_many :like_messages, :through => :likes, :source => :message

has_many :subscribes
has_many :subscribe_messages, :through => :subscribes, :source => :message

def like_message?(message)
self.like_messages.include?(message)
end

def subscribe_message?(message)
self.subscribe_messages.include?(message)
end

def display_name
self.email.split("@").first
end

def posts_count
# TODO: 請完成我
self.messages.size+self.comments.size
end

def words_count
Expand Down
1 change: 1 addition & 0 deletions app/views/comments/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$('#c-<%= @comment.id%>').remove();
41 changes: 37 additions & 4 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
<h2><%= @message.title %></h2>

<div class ="like">
<% if current_user.like_message?(@message) %>
<%= button_to "Unlike", like_message_path(@message) %>
<% else %>
<%= button_to "like", like_message_path(@message) %>
<% end %>
</div>

<div class ="subscribe">
<% if current_user.subscribe_message?(@message) %>
<%= button_to "Unsubscribe", subscribe_message_path(@message) %>
<% else %>
<%= button_to "subscribe", subscribe_message_path(@message) %>
<% end %>
</div>


<h2>Likes list</h2>
<% @who_like_message.each do |message| %>
<%= message.user.email%> |
<% end %>

<h2>Subscribes list</h2>

<% @who_subscribe_message.each do |message| %>
<% if message.user %>
<%= message.user.email%> |
<% else %>
Why not be the first to subscribe this
<% end %>
<% end %>

<hr/>

<%= simple_format @message.content %>

<h2>Comments list</h2>

<%= form_for [@message, @comment] do |f| %>

<p>
Expand All @@ -18,14 +51,14 @@
<% end %>

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

<div id="c-<%= comment.id %>">
<p><%= 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 %>
</p>

</div>
<% end %>

10 changes: 10 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@

resources :messages do
resources :comments

member do
post :like
post :subscribe
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.
Expand Down
12 changes: 12 additions & 0 deletions db/migrate/20161008040352_create_likes.rb
Original file line number Diff line number Diff line change
@@ -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 :messages, :user_id
#add_index :messages, :message_id
end
end
13 changes: 13 additions & 0 deletions db/migrate/20161008052951_create_subscribes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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, :message_id
add_index :subscribes, :user_id
end
end
19 changes: 18 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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: 20161008052951) do

create_table "comments", force: :cascade do |t|
t.text "content"
Expand All @@ -23,6 +23,13 @@

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

create_table "messages", force: :cascade do |t|
t.string "title"
t.text "content"
Expand All @@ -36,6 +43,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
Expand Down
11 changes: 11 additions & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ namespace :dev do
Message.delete_all
Comment.delete_all

#Assignment
Like.delete_all
Subscribe.delete_all

users = []
10.times do
users << User.create!( :email => Faker::Internet.email,
Expand All @@ -20,7 +24,14 @@ namespace :dev do
5.times do
m.comments.create!( :content => Faker::Lorem.paragraph,
:user => users.sample )

end

2.times do
m.likes.create!( :user => users.sample )

m.subscribes.create!( :user => users.sample )
end
end
end

Expand Down
5 changes: 5 additions & 0 deletions spec/controllers/api_v1/messages_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe ApiV1::MessagesController, type: :controller do

end
15 changes: 15 additions & 0 deletions spec/helpers/api_v1/messages_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions spec/models/like_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe Like, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end
5 changes: 5 additions & 0 deletions spec/models/subscribe_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe Subscribe, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end
1 change: 1 addition & 0 deletions spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
describe "#words_count" do
before do
# TODO: 加 Message 和 Comment 測試資料

end

it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
Expand Down