Skip to content
Open
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/
7 changes: 7 additions & 0 deletions app/controllers/api_v1/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class ApiV1::MessagesController < ApplicationController

def index
@messages = Message.all
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
13 changes: 7 additions & 6 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ 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
@messages = @messages.where( :status => "pending" )
@messages = @messages.pending
# @messages = @messages.where( :status => "pending" )
elsif params[:status] == "completed"
# TODO: @messages = @messages.completed
@messages = @messages.where( :status => "completed" )
@messages = @messages.completed
# @messages = @messages.where( :status => "completed" )
end

if params[:days]
# TODO: @messages = @messages.within_days(params[:days].to_i)
# @messages = @messages.within_days(params[:days].to_i)
@messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )
end
end
Expand Down Expand Up @@ -57,6 +57,7 @@ def destroy
@message.destroy

redirect_to root_path

end

protected
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
10 changes: 10 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ class Message < ActiveRecord::Base

has_many :comments, :dependent => :destroy

has_many :likes, :dependent => :destroy
has_many :likes_by, :through => :likes, :source => :user, :dependent => :destroy

has_many :subscriptions, :dependent => :destroy
has_many :subscriptions_by, :through => :likes, :source => :user, :dependent => :destroy

scope :pending, -> {where( :status => "pending" )}
scope :completed, -> {where( :status => "completed" )}
scope :within_days , ->(time) { where "created_at >= ?", Time.now - time.to_i.days }

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

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

has_many :subscriptions, :dependent => :destroy
has_many :subscriptions_by, :through => :likes, :source => :message, :dependent => :destroy

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

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

def words_count
Expand Down
10 changes: 10 additions & 0 deletions app/views/api_v1/messages/index.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
json.data do
json.array!(@message) do |message|
json.id message.id
json.status message.status
json.category_name message.category_name
json.title message.title
json.content message.content
json.created_at message.created_at
end
end
1 change: 1 addition & 0 deletions app/views/messages/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$("#delete-block %>").remove();
22 changes: 16 additions & 6 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

<%= simple_format @message.content %>

<h4>Likes</h4>
<% @message.likes_by.each do |user| %>
<p><%= user.email.split("@").first%></p>
<% end %>
<h4>Subscribed</h4>
<% @message.subscriptions_by.each do |user| %>
<p><%= user.email.split("@").first%></p>
<% end %>

<h2>Comments list</h2>

<%= form_for [@message, @comment] do |f| %>
Expand All @@ -19,13 +28,14 @@

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

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

<% if comment.user == current_user %>
<% if comment.user == current_user %>
<%# TODO: 修改成 AJAX 版本的刪除 %>
<%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :data => { :confirm => "Are u sure?"} %>
<% end %>
</p>

<span id ="delete-block %>">
<%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :remote => true %>
</span>
<% end %>
</p>
<% end %>

16 changes: 16 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
Rails.application.routes.draw do
devise_for :users



resources :messages do
resources :comments

member do
post :like
post :dislike
post :subscribe
post :unsubscribe
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".

Expand Down
11 changes: 11 additions & 0 deletions db/migrate/20160722090200_create_subscriptions.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class CreateSubscriptions < ActiveRecord::Migration
def change
create_table :subscriptions do |t|

t.integer :user_id, :index=> true
t.integer :message_id, :index => true

t.timestamps null: false
end
end
end
9 changes: 9 additions & 0 deletions db/migrate/20160722090224_create_likes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class CreateLikes < ActiveRecord::Migration
def change
create_table :likes do |t|
t.integer :user_id, :index=> true
t.integer :message_id, :index => true
t.timestamps null: false
end
end
end
22 changes: 21 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: 20160722090224) do

create_table "comments", force: :cascade do |t|
t.text "content"
Expand All @@ -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"
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ namespace :dev do
:content => Faker::Lorem.paragraph,
:user => users.sample,
:created_at => Time.now - rand(30).days )
users.sample(2).each do |u|
Subscription.create!(:user => u, :message => m)
end
users.sample(2).each do |u|
Like.create!(:user => u, :message => m)
end
5.times do
m.comments.create!( :content => Faker::Lorem.paragraph,
:user => users.sample )
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/subscription_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe Subscription, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end
14 changes: 13 additions & 1 deletion spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,23 @@
describe "#words_count" do
before do
# TODO: 加 Message 和 Comment 測試資料
@other_user = User.create!(:email => "ooxx@example.org", :password => "12345678")

m1 =Message.create!(:user => @user,
:title => Faker::Lorem.words(5),
:content => Faker::Lorem.words(5))
Comment.create!(:user => @other_user,
:content => Faker::Lorem.words(20),
:message_id => m1)
Comment.create!(:user => @user,
:content => Faker::Lorem.words(5),
:message_id => m1)
end

it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
# TODO: 測試 words_count 方法

expect(@user.words_count).to eq(15)
expect(@other_user.words_count).to eq(20)
end
end

Expand Down