diff --git a/app/assets/javascripts/api_v1/messages.coffee b/app/assets/javascripts/api_v1/messages.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/api_v1/messages.coffee @@ -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/ diff --git a/app/assets/stylesheets/api_v1/messages.scss b/app/assets/stylesheets/api_v1/messages.scss new file mode 100644 index 0000000..db6f927 --- /dev/null +++ b/app/assets/stylesheets/api_v1/messages.scss @@ -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/ diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb new file mode 100644 index 0000000..75bb517 --- /dev/null +++ b/app/controllers/api_controller.rb @@ -0,0 +1,2 @@ +class ApiController < ActionController::Base +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..5bdcdcd --- /dev/null +++ b/app/controllers/api_v1/messages_controller.rb @@ -0,0 +1,11 @@ +class ApiV1::MessagesController < ApiController + def index + @messages = Message.all + render :json => @messages.to_json + end + + def show + @message = Message.find(params[:id]) + render :json => @message.to_json + end +end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index e9d6aaa..e03036d 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -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 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 96f65e5..2ef59c6 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -4,14 +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(:comments).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] @@ -22,6 +24,11 @@ def index def show @message = Message.find( params[:id] ) + + #Message.last.likes.first.user.email + @who_like_message = @message.likes + @who_subscribe_message = @message.subscribes + @comment = Comment.new end @@ -59,6 +66,29 @@ def destroy redirect_to root_path end + def like + @message = Message.find(params[:id]) + if current_user.like_message?(@message) + current_user.like_messages.delete(@message) + else + current_user.like_messages << @message + end + + redirect_to message_path(@message) + end + + def subscribe + @message = Message.find(params[:id]) + if current_user.subscribe_message?(@message) + current_user.subscribe_messages.delete(@message) + else + current_user.subscribe_messages << @message + end + + redirect_to message_path(@message) + end + + protected def message_params diff --git a/app/helpers/api_v1/messages_helper.rb b/app/helpers/api_v1/messages_helper.rb new file mode 100644 index 0000000..21af019 --- /dev/null +++ b/app/helpers/api_v1/messages_helper.rb @@ -0,0 +1,2 @@ +module ApiV1::MessagesHelper +end diff --git a/app/models/like.rb b/app/models/like.rb new file mode 100644 index 0000000..5519adf --- /dev/null +++ b/app/models/like.rb @@ -0,0 +1,4 @@ +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..bb8dba7 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -4,6 +4,18 @@ class Message < ActiveRecord::Base has_many :comments, :dependent => :destroy + has_many :likes + + has_many :subscribes + + scope :pending, -> {where(:status => :pending)} + + scope :completed, -> {where(:status => :completed)} + + scope :within_days, -> {where(':status => :created_at?', Time.now - params[:days].to_i.days)} + + #scope :who_like_it, -> {where(:status => :completed)} + def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end diff --git a/app/models/subscribe.rb b/app/models/subscribe.rb new file mode 100644 index 0000000..63706d8 --- /dev/null +++ b/app/models/subscribe.rb @@ -0,0 +1,4 @@ +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..73912e7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,12 +7,27 @@ class User < ActiveRecord::Base has_many :messages has_many :comments + has_many :likes + has_many :like_messages, :through => :likes, :source => :message + + has_many :subscribes + has_many :subscribe_messages, :through => :subscribes, :source => :message + + def like_message?(message) + self.like_messages.include?(message) + end + + def subscribe_message?(message) + self.subscribe_messages.include?(message) + end + def display_name self.email.split("@").first end def posts_count # TODO: 請完成我 + self.messages.size+self.comments.size end def words_count diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb new file mode 100644 index 0000000..840e620 --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1 @@ +$('#c-<%= @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..68ddc4f 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,9 +1,42 @@

<%= @message.title %>

+
+ <% if current_user.like_message?(@message) %> + <%= button_to "Unlike", like_message_path(@message) %> + <% else %> + <%= button_to "like", like_message_path(@message) %> + <% end %> +
+ +
+ <% if current_user.subscribe_message?(@message) %> + <%= button_to "Unsubscribe", subscribe_message_path(@message) %> + <% else %> + <%= button_to "subscribe", subscribe_message_path(@message) %> + <% end %> +
+ + +

Likes list

+<% @who_like_message.each do |message| %> + <%= message.user.email%> | +<% end %> + +

Subscribes list

+ +<% @who_subscribe_message.each do |message| %> + <% if message.user %> + <%= message.user.email%> | + <% else %> + Why not be the first to subscribe this + <% end %> +<% end %> + +
+ <%= simple_format @message.content %>

Comments list

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

@@ -18,14 +51,14 @@ <% end %> <% @message.comments.each do |comment| %> - +

<%= 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 %>

- +
<% end %> diff --git a/config/routes.rb b/config/routes.rb index 74d4dbf..36ecfcf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,16 @@ resources :messages do resources :comments + + member do + post :like + post :subscribe + end + + 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. diff --git a/db/migrate/20161008040352_create_likes.rb b/db/migrate/20161008040352_create_likes.rb new file mode 100644 index 0000000..718b22e --- /dev/null +++ b/db/migrate/20161008040352_create_likes.rb @@ -0,0 +1,12 @@ +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 :messages, :user_id + #add_index :messages, :message_id + end +end diff --git a/db/migrate/20161008052951_create_subscribes.rb b/db/migrate/20161008052951_create_subscribes.rb new file mode 100644 index 0000000..887e746 --- /dev/null +++ b/db/migrate/20161008052951_create_subscribes.rb @@ -0,0 +1,13 @@ +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, :message_id + add_index :subscribes, :user_id + end +end diff --git a/db/schema.rb b/db/schema.rb index ef7b5c0..93e04bb 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: 20161008052951) do create_table "comments", force: :cascade do |t| t.text "content" @@ -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" @@ -36,6 +43,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..a38d179 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -5,6 +5,10 @@ namespace :dev do Message.delete_all Comment.delete_all + #Assignment + Like.delete_all + Subscribe.delete_all + users = [] 10.times do users << User.create!( :email => Faker::Internet.email, @@ -20,7 +24,14 @@ namespace :dev do 5.times do m.comments.create!( :content => Faker::Lorem.paragraph, :user => users.sample ) + end + + 2.times do + m.likes.create!( :user => users.sample ) + + m.subscribes.create!( :user => users.sample ) + end end end diff --git a/spec/controllers/api_v1/messages_controller_spec.rb b/spec/controllers/api_v1/messages_controller_spec.rb new file mode 100644 index 0000000..e1f1525 --- /dev/null +++ b/spec/controllers/api_v1/messages_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ApiV1::MessagesController, type: :controller do + +end diff --git a/spec/helpers/api_v1/messages_helper_spec.rb b/spec/helpers/api_v1/messages_helper_spec.rb new file mode 100644 index 0000000..e078b0d --- /dev/null +++ b/spec/helpers/api_v1/messages_helper_spec.rb @@ -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 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..abcb8a4 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -25,6 +25,7 @@ describe "#words_count" do before do # TODO: 加 Message 和 Comment 測試資料 + end it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do