From 6b315db584b45019801fbe808b131f5cc8f70025 Mon Sep 17 00:00:00 2001
From: shanmon7799 <shanmon7799@hotmail.com>
Date: Fri, 22 Jul 2016 17:26:52 +0800
Subject: [PATCH 1/4] fork projeck and add comment ajax and add scope

---
 Gemfile.lock                           | 144 +++++++++++++------------
 app/controllers/comments_controller.rb |   5 +-
 app/controllers/messages_controller.rb |  11 +-
 app/models/message.rb                  |   7 +-
 app/views/comments/destroy.js.erb      |   1 +
 app/views/messages/show.html.erb       |   7 +-
 config/application.rb                  |   2 +-
 7 files changed, 94 insertions(+), 83 deletions(-)
 create mode 100644 app/views/comments/destroy.js.erb

diff --git a/Gemfile.lock b/Gemfile.lock
index e1b93b6..fcadcf3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,59 +36,61 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    bcrypt (3.1.10)
+    arel (6.0.3)
+    bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    coffee-rails (4.1.0)
+    byebug (9.0.5)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    columnize (0.9.0)
+    coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.2)
     debug_inspector (0.0.2)
-    devise (3.5.1)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.5.2)
-    faker (1.4.3)
+    execjs (2.7.0)
+    faker (1.6.5)
       i18n (~> 0.5)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    jbuilder (2.3.0)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.6.0)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    multi_json (1.11.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -105,69 +107,71 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (4.2.2)
       actionpack (= 4.2.2)
       activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rake (11.2.2)
+    rdoc (4.2.2)
+      json (~> 1.4)
+    responders (2.2.0)
+      railties (>= 4.2.0, < 5.1)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sass (3.4.15)
-    sass-rails (5.0.3)
-      railties (>= 4.0.0, < 5.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sass (3.4.22)
+    sass-rails (5.0.5)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (1.3.6)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    spring (1.7.2)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    turbolinks (2.5.3)
-      coffee-rails
+    tilt (2.0.5)
+    turbolinks (5.0.0)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    warden (1.2.3)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
+    warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.1.3)
+    web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
@@ -195,4 +199,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.10.5
+   1.12.5
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e9d6aaa..a52ce9a 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..05caf20 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -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.order("id DESC").includes(:user ,:comments).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
 
diff --git a/app/models/message.rb b/app/models/message.rb
index e24a8b2..ba6a4d9 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -4,7 +4,12 @@ class Message < ActiveRecord::Base
 
   has_many :comments, :dependent => :destroy
 
-  def last_comment_summary
+  scope :pending, -> { where status: "pending" }
+  scope :completed, -> {where status: "completed" }
+  scope :within_days, -> (time){ where "created_at >= ?", Time.now - time.days }
+
+
+	def last_comment_summary
     self.comments.last.try(:content).try(:truncate, 20)
   end
 
diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb
new file mode 100644
index 0000000..09028e8
--- /dev/null
+++ b/app/views/comments/destroy.js.erb
@@ -0,0 +1 @@
+$("#delete-<%= @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..5c3bf87 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -18,14 +18,15 @@
 <% end %>
 
 <% @message.comments.each do |comment| %>
-
+<div id = "delete-<%= 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>
 <% end %>
 
diff --git a/config/application.rb b/config/application.rb
index 4d3aa47..9ebd74d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-
+require 'yaml'
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)

From 075a27c61fb7e810a42d6c706fb3032faa78be19 Mon Sep 17 00:00:00 2001
From: shanmon7799 <shanmon7799@hotmail.com>
Date: Fri, 22 Jul 2016 18:22:39 +0800
Subject: [PATCH 2/4] rspec total words

---
 Gemfile                  |  1 -
 Gemfile.lock             |  9 ---------
 app/models/user.rb       |  2 +-
 spec/models/user_spec.rb | 10 +++++++++-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index bde2f2e..d9ae7a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,6 @@ group :development, :test do
   gem 'byebug'
 
   # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
diff --git a/Gemfile.lock b/Gemfile.lock
index fcadcf3..c5b945b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,8 +38,6 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     bcrypt (3.1.11)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (9.0.5)
     coffee-rails (4.1.1)
@@ -50,7 +48,6 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
-    debug_inspector (0.0.2)
     devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -171,11 +168,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.3.0)
-      activemodel (>= 4.0)
-      binding_of_caller (>= 0.7.2)
-      railties (>= 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
 
 PLATFORMS
   ruby
@@ -196,7 +188,6 @@ DEPENDENCIES
   sqlite3
   turbolinks
   uglifier (>= 1.3.0)
-  web-console (~> 2.0)
 
 BUNDLED WITH
    1.12.5
diff --git a/app/models/user.rb b/app/models/user.rb
index 6d01aa9..3af87ba 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,7 +12,7 @@ def display_name
   end
 
   def posts_count
-    # TODO: 請完成我
+    self.messages.count + self.comments.count
   end
 
   def words_count
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 528cc38..2d2f579 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -25,11 +25,19 @@
   describe "#words_count" do
     before do
       # TODO: 加 Message 和 Comment 測試資料
+      @other_user = User.create!( :email => "ooxx@example.org", :password => "12345678")
+      m1 = Message.create!( :user => @other_user, :title => "1", :content => "22" )
+      Comment.create!( :user => @other_user, :message_id => m1, :content => "66 66 66"  )
+
+      m2 = Message.create!( :user => @user, :title => "3 3 3", :content => "4444" )
+      Comment.create!( :user => @user, :message_id => m2, :content => "55555" )
+      Comment.create!( :user => @user, :message_id => m2, :content => "2 2" )
     end
 
     it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
       # TODO: 測試 words_count 方法
-
+      expect( @user.words_count ).to eq(7)
+      expect( @other_user.words_count ).to eq(5)
     end
   end
 

From 95ea97e72e57ea92108fde82e8cb8c33d75e45b3 Mon Sep 17 00:00:00 2001
From: shanmon7799 <shanmon7799@hotmail.com>
Date: Fri, 22 Jul 2016 18:47:26 +0800
Subject: [PATCH 3/4] JSON API

---
 app/assets/javascripts/api_v1/messages.coffee     |  3 +++
 app/assets/stylesheets/api_v1/messages.scss       |  3 +++
 app/controllers/api_controller.rb                 |  2 ++
 app/controllers/api_v1/messages_controller.rb     |  6 ++++++
 app/helpers/api_v1/messages_helper.rb             |  2 ++
 app/views/api_v1/messages/index.json.jbuilder     | 10 ++++++++++
 config/routes.rb                                  |  4 ++++
 .../api_v1/messages_controller_spec.rb            |  5 +++++
 spec/helpers/api_v1/messages_helper_spec.rb       | 15 +++++++++++++++
 9 files changed, 50 insertions(+)
 create mode 100644 app/assets/javascripts/api_v1/messages.coffee
 create mode 100644 app/assets/stylesheets/api_v1/messages.scss
 create mode 100644 app/controllers/api_controller.rb
 create mode 100644 app/controllers/api_v1/messages_controller.rb
 create mode 100644 app/helpers/api_v1/messages_helper.rb
 create mode 100644 app/views/api_v1/messages/index.json.jbuilder
 create mode 100644 spec/controllers/api_v1/messages_controller_spec.rb
 create mode 100644 spec/helpers/api_v1/messages_helper_spec.rb

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..20c2a29
--- /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..c9e4c74
--- /dev/null
+++ b/app/controllers/api_v1/messages_controller.rb
@@ -0,0 +1,6 @@
+class ApiV1::MessagesController < ApplicationController
+
+	def index
+		@messages = Massage.all
+	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/views/api_v1/messages/index.json.jbuilder b/app/views/api_v1/messages/index.json.jbuilder
new file mode 100644
index 0000000..d13131c
--- /dev/null
+++ b/app/views/api_v1/messages/index.json.jbuilder
@@ -0,0 +1,10 @@
+json.data do
+  json.array!(@message) do |message|
+    json.id message.id
+    json.status message.status
+    json.category_name message.category_name
+    json.title message.title
+    json.content message.content
+    json.created_at message.created_at
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 74d4dbf..c8016b9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,10 @@
     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/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

From 9507f1c55244c5138c626392809ff77b1e1f68ad Mon Sep 17 00:00:00 2001
From: shanmon7799 <shanmon7799@hotmail.com>
Date: Fri, 22 Jul 2016 22:00:48 +0800
Subject: [PATCH 4/4] create subscription & like model

---
 app/controllers/api_v1/messages_controller.rb |  2 +-
 app/models/like.rb                            |  5 +++++
 app/models/message.rb                         |  7 ++++++
 app/models/subscription.rb                    |  5 +++++
 app/models/user.rb                            |  6 +++++
 app/views/api_v1/messages/index.json.jbuilder |  2 +-
 app/views/messages/show.html.erb              | 11 ++++++++++
 .../20160722105026_create_subscriptions.rb    | 10 +++++++++
 db/migrate/20160722105033_create_likes.rb     | 10 +++++++++
 db/schema.rb                                  | 22 ++++++++++++++++++-
 lib/tasks/dev.rake                            |  8 +++++++
 spec/models/like_spec.rb                      |  5 +++++
 spec/models/subscription_spec.rb              |  5 +++++
 13 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 app/models/like.rb
 create mode 100644 app/models/subscription.rb
 create mode 100644 db/migrate/20160722105026_create_subscriptions.rb
 create mode 100644 db/migrate/20160722105033_create_likes.rb
 create mode 100644 spec/models/like_spec.rb
 create mode 100644 spec/models/subscription_spec.rb

diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb
index c9e4c74..b9989f5 100644
--- a/app/controllers/api_v1/messages_controller.rb
+++ b/app/controllers/api_v1/messages_controller.rb
@@ -1,6 +1,6 @@
 class ApiV1::MessagesController < ApplicationController
 
 	def index
-		@messages = Massage.all
+		@messages = Message.all
 	end
 end
diff --git a/app/models/like.rb b/app/models/like.rb
new file mode 100644
index 0000000..e8956a5
--- /dev/null
+++ b/app/models/like.rb
@@ -0,0 +1,5 @@
+class Like < ActiveRecord::Base
+
+	belongs_to :message
+	belongs_to :user
+end
diff --git a/app/models/message.rb b/app/models/message.rb
index ba6a4d9..5b89801 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -4,6 +4,13 @@ class Message < ActiveRecord::Base
 
   has_many :comments, :dependent => :destroy
 
+  has_many :likes, :dependent => :destroy
+  has_many :likes_by, :through => :likes, :source => :user, :dependent => :destroy
+
+  has_many :subscriptions, :dependent => :destroy
+  has_many :subscriptions_by, :through => :likes, :source => :user, :dependent => :destroy
+
+
   scope :pending, -> { where status: "pending" }
   scope :completed, -> {where status: "completed" }
   scope :within_days, -> (time){ where "created_at >= ?", Time.now - time.days }
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
new file mode 100644
index 0000000..ef0ac56
--- /dev/null
+++ b/app/models/subscription.rb
@@ -0,0 +1,5 @@
+class Subscription < ActiveRecord::Base
+
+	belongs_to :message
+	belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 3af87ba..ce14c6b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,6 +7,12 @@ class User < ActiveRecord::Base
   has_many :messages
   has_many :comments
 
+  has_many :likes, :dependent => :destroy
+  has_many :like_messages, :through => :likes, :source => :message, :dependent => :destroy
+
+  has_many :subscriptions, :dependent => :destroy
+  has_many :subscriptions_by, :through => :likes, :source => :message, :dependent => :destroy
+
   def display_name
     self.email.split("@").first
   end
diff --git a/app/views/api_v1/messages/index.json.jbuilder b/app/views/api_v1/messages/index.json.jbuilder
index d13131c..915f779 100644
--- a/app/views/api_v1/messages/index.json.jbuilder
+++ b/app/views/api_v1/messages/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.data do
-  json.array!(@message) do |message|
+  json.array!(@messages) do |message|
     json.id message.id
     json.status message.status
     json.category_name message.category_name
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 5c3bf87..58b17ba 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -2,6 +2,17 @@
 
 <%= simple_format @message.content %>
 
+<h3>Likes</h3>
+  <p><% @message.likes_by.each do |user| %></p>
+      <%= user.email%>
+  <% end %>
+
+<h3>Subscribed</h3>
+  <% @message.subscriptions_by.each do |user| %>
+     <p><%= user.email%></p>
+  <% end %>
+
+
 <h2>Comments list</h2>
 
 <%= form_for [@message, @comment] do |f| %>
diff --git a/db/migrate/20160722105026_create_subscriptions.rb b/db/migrate/20160722105026_create_subscriptions.rb
new file mode 100644
index 0000000..57674f0
--- /dev/null
+++ b/db/migrate/20160722105026_create_subscriptions.rb
@@ -0,0 +1,10 @@
+class CreateSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :subscriptions do |t|
+
+      t.integer :user_id, index: true
+      t.integer :message_id, index: true
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20160722105033_create_likes.rb b/db/migrate/20160722105033_create_likes.rb
new file mode 100644
index 0000000..6f668d2
--- /dev/null
+++ b/db/migrate/20160722105033_create_likes.rb
@@ -0,0 +1,10 @@
+class CreateLikes < ActiveRecord::Migration
+  def change
+    create_table :likes do |t|
+
+    	t.integer :user_id, index: true
+      t.integer :message_id, index: true
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ef7b5c0..1800945 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: 20160722105033) do
 
   create_table "comments", force: :cascade do |t|
     t.text     "content"
@@ -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"
@@ -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
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 4673e72..a2a2d39 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -17,6 +17,14 @@ namespace :dev do
                            :content => Faker::Lorem.paragraph,
                            :user => users.sample,
                            :created_at => Time.now - rand(30).days )
+
+                           users.sample(5).each do |s|
+                             Subscription.create!(:user => s, :message => m)
+                           end
+                           users.sample(5).each do |l|
+                             Like.create!(:user => l, :message => m)
+                           end
+
       5.times do
         m.comments.create!( :content => Faker::Lorem.paragraph,
                             :user => users.sample )
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