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
17 changes: 17 additions & 0 deletions app/controllers/api_controller.rb
Original file line number Diff line number Diff line change
@@ -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
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 < ApiController

def index
@messages = Message.all
end

end
6 changes: 5 additions & 1 deletion app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions app/controllers/likes_controller.rb
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ 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
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

Expand Down
25 changes: 25 additions & 0 deletions app/controllers/subscribes_controller.rb
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions app/models/like.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class Like < ActiveRecord::Base

belongs_to :user
belongs_to :message

end
8 changes: 8 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@ 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)
end

scope :pending, -> { where( :status => "pending") }
scope :completed, -> { where( :status => "completed") }
scope :within_week, -> { where( ["created_at >= ?", Time.now - 7.days] ) }

end
6 changes: 6 additions & 0 deletions app/models/subscribe.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class Subscribe < ActiveRecord::Base

belongs_to :user
belongs_to :message

end
13 changes: 11 additions & 2 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ 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
end

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

def words_count
Expand All @@ -29,4 +34,8 @@ def words_count
return count
end

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

end
1 change: 1 addition & 0 deletions app/views/api_v1/messages/_messages.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
json.( m, :id, :status, :category_name, :title, :content, :created_at)
1 change: 1 addition & 0 deletions app/views/api_v1/messages/index.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
json.messages @messages , partial: "messages" , as: :m
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 @@
$("#comment-<%= @comment.id %>").remove();
25 changes: 21 additions & 4 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<h2><%= @message.title %></h2>

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

<h2>Comments list</h2>

Expand All @@ -19,13 +35,14 @@

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

<p><%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %>
<div id="comment-<%= comment.id %>">
<%= 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 %>

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

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
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".

Expand Down
11 changes: 11 additions & 0 deletions db/migrate/20161112063728_create_likes.rb
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions db/migrate/20161112063936_create_subscribes.rb
Original file line number Diff line number Diff line change
@@ -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
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: 20161112063936) 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 "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
6 changes: 6 additions & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
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
10 changes: 9 additions & 1 deletion spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,19 @@
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 )

m.comments.create!( :content => "Give me some space", :user => @other_user )

end

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

expect( @other_user.words_count ).to eq(10)
end
end

Expand Down