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/
5 changes: 5 additions & 0 deletions app/controllers/api_v1/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
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 @@ -15,8 +15,11 @@ def create
def destroy
@comment = current_user.comments.find( params[:id] )
@comment.destroy
respond_to do |format|
format.html { redirect_to :back }
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,22 @@ class MessagesController < ApplicationController

def index
# TODO: fix N+1 queries for user and comments
@messages = Message.order("id DESC").page( params[:page] )

# @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.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]
# TODO: @messages = @messages.within_days(params[:days].to_i)
@messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )
# @messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )
@messages=@messages.within_days(params[:days].to_i)
end
end

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
8 changes: 7 additions & 1 deletion app/models/message.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
class Message < ActiveRecord::Base

belongs_to :user

has_many :subscriptions
has_many :likes
has_many :comments, :dependent => :destroy
scope :within_days, lambda{ |t| where( ["created_at >= ?", Time.now-t.days ] )}
scope :pending, -> {where( :status => "pending" )}
scope :completed, ->{where( :status => "completed" )}



def last_comment_summary
self.comments.last.try(:content).try(:truncate, 20)
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
4 changes: 3 additions & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ class User < ActiveRecord::Base
# :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable

has_many :subscriptions
has_many :likes
has_many :messages
has_many :comments

Expand All @@ -13,6 +14,7 @@ def display_name

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

def words_count
Expand Down
6 changes: 6 additions & 0 deletions app/views/api_v1/messages/_msg.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
json.id m.id
json.status m.status
json.category_name m.category_name
json.title m.title
json.content m.content
json.created_at m.created_at
5 changes: 5 additions & 0 deletions app/views/api_v1/messages/index.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
json.results do
json.array!(@messages) do |m|
json.partial! 'msg', m: m
end
end
2 changes: 2 additions & 0 deletions app/views/comments/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alert("p-<%=@comment.id%>")
$('#p-<%=@comment.id%>').remove();
19 changes: 16 additions & 3 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,28 @@

<% end %>

<p>who like:</p>
<ul>
<% @message.likes.each do |l|%>
<li><%=l.user.display_name%></li>
<%end%>
</ul>
<p>who subscribe:</p>
<ul>
<% @message.subscriptions.each do |s|%>
<li><%= s.user.display_name%></li>
<%end%>
</ul>
<% @message.comments.each do |comment| %>

<div id="p-<%=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, :data => { :confirm => "Are u sure?"} %>
<%= link_to ' delete by AJAX', message_comment_path(@message, comment), :remote=>true, :method => :delete%>
<% end %>
</p>

</div>
<% end %>

3 changes: 3 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
resources :messages do
resources :comments
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
10 changes: 10 additions & 0 deletions db/migrate/20160429094848_create_subscriptions.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class CreateSubscriptions < ActiveRecord::Migration
def change
create_table :subscriptions do |t|
t.integer :user_id
t.integer :message_id

t.timestamps null: false
end
end
end
10 changes: 10 additions & 0 deletions db/migrate/20160429095039_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
16 changes: 15 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: 20160429095039) 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,13 @@
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

create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
Expand Down
4 changes: 4 additions & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ namespace :dev do
:content => Faker::Lorem.paragraph,
:user => users.sample,
:created_at => Time.now - rand(30).days )
2.times do
m.subscriptions.create(:user => users.sample)
m.likes.create(:user => users.sample)
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
6 changes: 4 additions & 2 deletions spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
describe "#words_count" do
before do
# TODO: 加 Message 和 Comment 測試資料
m2=@user.messages.create!(:title =>"haha", :content=>"wa" )
@user.comments.create!(:message => m2, :content => "hey" )
end

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

expect( @user.words_count ).to eq(9)
end
end

Expand Down