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
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ gem 'coffee-rails', '~> 4.1.0'
gem 'devise'
gem 'kaminari'
gem 'faker'
gem "turbolinks"
gem 'nested_form_fields'

# Use jquery as the JavaScript library
gem 'jquery-rails'
Expand Down
9 changes: 7 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ GEM
mini_portile (0.6.2)
minitest (5.7.0)
multi_json (1.11.1)
nested_form_fields (0.7.8)
coffee-rails (>= 3.2.1)
jquery-rails
rails (>= 3.2.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
Expand Down Expand Up @@ -147,7 +151,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.3.6)
spring (1.7.2)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.2)
Expand Down Expand Up @@ -184,6 +188,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
kaminari
nested_form_fields
rails (= 4.2.2)
rspec-rails
sass-rails (~> 5.0)
Expand All @@ -195,4 +200,4 @@ DEPENDENCIES
web-console (~> 2.0)

BUNDLED WITH
1.10.5
1.12.5
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/
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
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


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: 5 additions & 8 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ 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 ] )
if params[:time]
@messages = @messages.within_days(params[:time])
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
12 changes: 12 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@ class Message < ActiveRecord::Base

has_many :comments, :dependent => :destroy

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

has_many :subscriptions
has_many :subscribed_users, :through => :subscriptions, :source => :message


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, -> (time) { where "created_at >= ?", Time.now - time.to_i.days }


end
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
8 changes: 7 additions & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ class User < ActiveRecord::Base
has_many :messages
has_many :comments

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

has_many :subscriptions
has_many :subscribed_messages, :through => :subscriptions, :source => :message

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

def posts_count
# TODO: 請完成我
Comment.count
end

def words_count
Expand Down
13 changes: 13 additions & 0 deletions app/views/api_v1/index.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
json.data @messages do |msg|

json.id msg.id
json.status msg.status
json.category_name msg.category_name
json.title msg.title
json.content msg.content
json.created_at msg.created_at

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 @@
$("#comment-<%= @comment.id %>").remove();
alert("刪除成功!");
32 changes: 25 additions & 7 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@

<h2>Comments list</h2>

<h4>Likes</h4>

<% @message.liked_users.each do |user| %>
<p><%= user.email %></p>
<% end %>

<hr>

<h4>Subscriptions</h4>

<% @message.subscribed_users.each do |user| %>
<p><%= user.email %></p>
<% end %>

<% @message.liked_users.each do |user| %>
<p><%= user.email %></p>
<% end %>

<%= form_for [@message, @comment] do |f| %>

<p>
Expand All @@ -18,14 +36,14 @@
<% end %>

<% @message.comments.each do |comment| %>
<div id="comment-<%= comment.id %>">
<%= 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 %>
<%= link_to "Delete", message_comment_path(@message, comment), :method => :delete,:remote => true %>
<% end %>
</div>
<% end %>

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

<% end %>

5 changes: 3 additions & 2 deletions bin/rails
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
Expand Down
5 changes: 3 additions & 2 deletions bin/rake
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot'
require 'rake'
Expand Down
12 changes: 6 additions & 6 deletions bin/spring
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# It gets overwritten when you run the `spring binstub` command.

unless defined?(Spring)
require "rubygems"
require "bundler"
require 'rubygems'
require 'bundler'

if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem "spring", match[1]
require "spring/binstub"
if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m))
Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
gem 'spring', match[1]
require 'spring/binstub'
end
end
4 changes: 4 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
resources :comments
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
10 changes: 10 additions & 0 deletions db/migrate/20160722095429_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.references :user, index: true, foreign_key: true
t.references :message, index: true, foreign_key: true

t.timestamps null: false
end
end
end
10 changes: 10 additions & 0 deletions db/migrate/20160722095612_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.references :user, index: true, foreign_key: true
t.references :message, index: true, foreign_key: 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: 20160722095612) 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
8 changes: 8 additions & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ namespace :dev do
Message.delete_all
Comment.delete_all

Subscription.delete_all
Like.delete_all

users = []
10.times do
users << User.create!( :email => Faker::Internet.email,
Expand All @@ -17,6 +20,11 @@ namespace :dev do
:content => Faker::Lorem.paragraph,
:user => users.sample,
:created_at => Time.now - rand(30).days )
users.sample(3).each do |u|
Subscription.create!(:user => u, :message => m)
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
Loading