diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
new file mode 100644
index 0000000..2afbd5c
--- /dev/null
+++ b/app/controllers/api_controller.rb
@@ -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
\ No newline at end of file
diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb
new file mode 100644
index 0000000..f7e6e7d
--- /dev/null
+++ b/app/controllers/api_v1/messages_controller.rb
@@ -0,0 +1,7 @@
+class ApiV1::MessagesController < ApiController
+
+ def index
+ @messages = Message.all
+ end
+
+end
\ No newline at end of file
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/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
new file mode 100644
index 0000000..2b845a9
--- /dev/null
+++ b/app/controllers/likes_controller.rb
@@ -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
\ No newline at end of file
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 96f65e5..fd9f63a 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -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
diff --git a/app/controllers/subscribes_controller.rb b/app/controllers/subscribes_controller.rb
new file mode 100644
index 0000000..68ed8a5
--- /dev/null
+++ b/app/controllers/subscribes_controller.rb
@@ -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
\ No newline at end of file
diff --git a/app/models/like.rb b/app/models/like.rb
new file mode 100644
index 0000000..7f26420
--- /dev/null
+++ b/app/models/like.rb
@@ -0,0 +1,6 @@
+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..e28d2c5 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 :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
diff --git a/app/models/subscribe.rb b/app/models/subscribe.rb
new file mode 100644
index 0000000..23c4669
--- /dev/null
+++ b/app/models/subscribe.rb
@@ -0,0 +1,6 @@
+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..56f2716 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,8 +4,12 @@ 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
@@ -13,6 +17,7 @@ def display_name
def posts_count
# TODO: 請完成我
+ self.messages.count + self.comments.count
end
def words_count
@@ -29,4 +34,8 @@ def words_count
return count
end
+ def short_name
+ self.email.split("@").first
+ end
+
end
diff --git a/app/views/api_v1/messages/_messages.json.jbuilder b/app/views/api_v1/messages/_messages.json.jbuilder
new file mode 100644
index 0000000..7906cf8
--- /dev/null
+++ b/app/views/api_v1/messages/_messages.json.jbuilder
@@ -0,0 +1 @@
+json.( m, :id, :status, :category_name, :title, :content, :created_at)
\ No newline at end of file
diff --git a/app/views/api_v1/messages/index.json.jbuilder b/app/views/api_v1/messages/index.json.jbuilder
new file mode 100644
index 0000000..adff53e
--- /dev/null
+++ b/app/views/api_v1/messages/index.json.jbuilder
@@ -0,0 +1 @@
+json.messages @messages , partial: "messages" , as: :m
\ No newline at end of file
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..e02f77e
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1 @@
+$("#comment-<%= @comment.id %>").remove();
\ No newline at end of file
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 41401f6..899e945 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,6 +1,22 @@
<%= @message.title %>
-<%= simple_format @message.content %>
+<%= simple_format @message.content %>
+
+Subscriber:
+ <% if @message.subscribe_users %>
+ <% @message.subscribe_users.each do |su| %>
+ <%= su.short_name %>
+ <% end %>
+ <% end %>
+
+
+ <% if @message.like_users %>
+ <% @message.like_users.each do |su| %>
+ <%= su.short_name %>
+ <% end %>
+ <% end %>
+ likes
+
Comments list
@@ -19,13 +35,14 @@
<% @message.comments.each do |comment| %>
- <%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %>
+
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 74d4dbf..e315bc5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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".
diff --git a/db/migrate/20161112063728_create_likes.rb b/db/migrate/20161112063728_create_likes.rb
new file mode 100644
index 0000000..c0e0909
--- /dev/null
+++ b/db/migrate/20161112063728_create_likes.rb
@@ -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
diff --git a/db/migrate/20161112063936_create_subscribes.rb b/db/migrate/20161112063936_create_subscribes.rb
new file mode 100644
index 0000000..743c135
--- /dev/null
+++ b/db/migrate/20161112063936_create_subscribes.rb
@@ -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
diff --git a/db/schema.rb b/db/schema.rb
index ef7b5c0..dbf62c5 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: 20161112063936) 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.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
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 4673e72..7f26ed7 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -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
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/subscribe_spec.rb b/spec/models/subscribe_spec.rb
new file mode 100644
index 0000000..545a45d
--- /dev/null
+++ b/spec/models/subscribe_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Subscribe, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 528cc38..5c3e892 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -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