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_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb new file mode 100644 index 0000000..7fb6dab --- /dev/null +++ b/app/controllers/api_v1/messages_controller.rb @@ -0,0 +1,5 @@ +class ApiV1::MessagesController < ApplicationController + def index + @messages=Message.all + end +end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index e9d6aaa..144e10a 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -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 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 96f65e5..970ac4e 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -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 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..88c087f --- /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..0bc930a 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -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) diff --git a/app/models/subscription.rb b/app/models/subscription.rb new file mode 100644 index 0000000..24876ed --- /dev/null +++ b/app/models/subscription.rb @@ -0,0 +1,4 @@ +class Subscription < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/user.rb b/app/models/user.rb index 6d01aa9..ea7f83c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 @@ -13,6 +14,7 @@ def display_name def posts_count # TODO: 請完成我 + self.comments.count+self.messages.count end def words_count diff --git a/app/views/api_v1/messages/_msg.json.jbuilder b/app/views/api_v1/messages/_msg.json.jbuilder new file mode 100644 index 0000000..3cf875d --- /dev/null +++ b/app/views/api_v1/messages/_msg.json.jbuilder @@ -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 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..bd700b4 --- /dev/null +++ b/app/views/api_v1/messages/index.json.jbuilder @@ -0,0 +1,5 @@ +json.results do + json.array!(@messages) do |m| + json.partial! 'msg', m: m + end +end diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb new file mode 100644 index 0000000..1339b7e --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1,2 @@ +alert("p-<%=@comment.id%>") +$('#p-<%=@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..c6bfc8e 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -17,15 +17,28 @@ <% end %> +

who like:

+ +

who subscribe:

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

- +
<% end %> diff --git a/config/routes.rb b/config/routes.rb index 74d4dbf..73e3581 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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". diff --git a/db/migrate/20160429094848_create_subscriptions.rb b/db/migrate/20160429094848_create_subscriptions.rb new file mode 100644 index 0000000..8657c7d --- /dev/null +++ b/db/migrate/20160429094848_create_subscriptions.rb @@ -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 diff --git a/db/migrate/20160429095039_create_likes.rb b/db/migrate/20160429095039_create_likes.rb new file mode 100644 index 0000000..76ba56a --- /dev/null +++ b/db/migrate/20160429095039_create_likes.rb @@ -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 diff --git a/db/schema.rb b/db/schema.rb index ef7b5c0..d8b69de 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: 20160429095039) 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,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 diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4673e72..1f4698b 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -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 ) 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/subscription_spec.rb b/spec/models/subscription_spec.rb new file mode 100644 index 0000000..d40bf0b --- /dev/null +++ b/spec/models/subscription_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Subscription, 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..0d0cada 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -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