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.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/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.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the api controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
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
6 changes: 6 additions & 0 deletions app/controllers/api_v1/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class ApiV1::MessagesController < ApiController
def messages

render :json => Message.all
end
end
7 changes: 5 additions & 2 deletions app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ def create
def destroy
@comment = current_user.comments.find( params[:id] )
@comment.destroy

redirect_to :back

respond_to do |format|
format.js
end
# redirect_to :back
end

protected
Expand Down
13 changes: 8 additions & 5 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ 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(: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

Expand Down Expand Up @@ -55,7 +56,9 @@ def update
def destroy
@message = current_user.messages.find( params[:id] )
@message.destroy




redirect_to root_path
end

Expand Down
2 changes: 2 additions & 0 deletions app/helpers/api_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module ApiHelper
end
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
1 change: 1 addition & 0 deletions app/models/comment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ class Comment < ActiveRecord::Base
belongs_to :user
belongs_to :message


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

belongs_to :user
belongs_to :message


end
27 changes: 27 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,35 @@ class Message < ActiveRecord::Base

has_many :comments, :dependent => :destroy


has_many :like_users, :through => :likes, :source => :user
has_many :likes




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, -> (days){ where( "created_at >= ?", Time.now - 7.days ) }
# def pending
# self.where( :status => "pending" )
# end

# def completed
# self.where( :status => "completed" )
# end

# def within_days(aaa)
# self.where( ["created_at >= ?", Time.now - aaa.to_i.days ] )
# end





end
4 changes: 4 additions & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ class User < ActiveRecord::Base
has_many :messages
has_many :comments


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

def display_name
self.email.split("@").first
end
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 @@
$("#comment-<%= @comment.id %>").remove();
7 changes: 4 additions & 3 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
<% end %>

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

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

</div>
<!-- :data => { :confirm => "Are u sure?"}, -->
<% end %>

5 changes: 5 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
devise_for :users

resources :messages do
resources :likes
resources :comments
end

scope :path => '/api/v1/', :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do
get "/messages" => "messages#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
10 changes: 10 additions & 0 deletions db/migrate/20160429090646_create_likes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class CreateLikes < ActiveRecord::Migration
def change
create_table :likes do |t|
t.integer :user_id
t.integer :message_id

t.timestamps null: false
end
end
end
9 changes: 8 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: 20160429090646) 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 Down
5 changes: 5 additions & 0 deletions spec/controllers/api_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe ApiController, type: :controller do

end
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_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 ApiHelper. For example:
#
# describe ApiHelper 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 ApiHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
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