fix watch spec

app/controllers/posts_controller.rb

@@ -110,9 +110,9 @@ class PostsController < ApplicationController
 
 
   def watch
   def watch
     if current_user.watching?(post: @post)
     if current_user.watching?(post: @post)
-      @post.watchings.where(user: current_user).destroy_all
+      current_user.unwatch!(post: @post)
     else
     else
-      @post.watchings.create!(user: current_user)
+      current_user.watch!(post: @post)
     end
     end
 
 
     respond_to do |format|
     respond_to do |format|

app/models/user.rb

@@ -33,14 +33,16 @@ class User < ActiveRecord::Base
   devise :omniauthable, omniauth_providers: [:google_oauth2]
   devise :omniauthable, omniauth_providers: [:google_oauth2]
 
 
   ######################################################################
   ######################################################################
-  # association
+  # Associations
   ######################################################################
   ######################################################################
   has_many :posts, foreign_key: 'author_id'
   has_many :posts, foreign_key: 'author_id'
   has_many :comments, foreign_key: 'author_id'
   has_many :comments, foreign_key: 'author_id'
   has_many :notifications
   has_many :notifications
   has_many :footprints
   has_many :footprints
 
 
-  has_many :watches
+  has_many :watches, :as => :watchable, :dependent => :destroy
+  has_many :watchers, :through => :watches
+
   has_many :watchings, class_name: 'Watch', foreign_key: 'watcher_id'
   has_many :watchings, class_name: 'Watch', foreign_key: 'watcher_id'
   has_many :watching_posts, :through => :watchings, :source => :watchable, :source_type => "Post"
   has_many :watching_posts, :through => :watchings, :source => :watchable, :source_type => "Post"
   # has_many :watchings, :as => :resource
   # has_many :watchings, :as => :resource
@@ -58,7 +60,7 @@ class User < ActiveRecord::Base
 
 
 
 
   ######################################################################
   ######################################################################
-  # validations
+  # Validations
   ######################################################################
   ######################################################################
   validates :name, presence: true
   validates :name, presence: true
   validates :email, presence: true
   validates :email, presence: true
@@ -125,13 +127,41 @@ class User < ActiveRecord::Base
     footprints.create!(post: post)
     footprints.create!(post: post)
   end
   end
 
 
+  def watch!(hash)
+    if hash[:post]
+      watching_posts << hash[:post] unless watching_posts.include?(hash[:post])
+    elsif hash[:tag]
+      raise 'Not Implemented.'
+    elsif hash[:user]
+      raise 'Not Implemented.'
+    else
+      raise 'No hash argument set.'
+    end
+  end
+
+  def unwatch!(hash)
+    if hash[:post]
+      hash[:post].watches.where(watcher: self).destroy_all
+    elsif hash[:tag]
+      raise 'Not Implemented.'
+    elsif hash[:user]
+      raise 'Not Implemented.'
+    else
+      raise 'No hash argument set.'
+    end
+  end
+
   # check if user watching post/tag/user
   # check if user watching post/tag/user
   # TODO: tag/user
   # TODO: tag/user
   def watching?(hash)
   def watching?(hash)
     if hash[:post]
     if hash[:post]
-      hash[:post].watchings.where(user_id: self.id).exists?
+      hash[:post].watches.where(watcher: self).exists?
+    elsif hash[:tag]
+      raise 'Not Implemented.'
+    elsif hash[:user]
+      raise 'Not Implemented.'
     else
     else
-      false
+      raise 'No hash argument set.'
     end
     end
   end
   end
 
 

app/models/watch.rb

 class Watch < ActiveRecord::Base
 class Watch < ActiveRecord::Base
+
+  ######################################################################
+  # Associations
+  ######################################################################
   belongs_to :watcher, class_name: 'User'
   belongs_to :watcher, class_name: 'User'
   belongs_to :watchable, polymorphic: true
   belongs_to :watchable, polymorphic: true
+
+  ######################################################################
+  # Validations
+  ######################################################################
+  validates :watcher_id, uniqueness: { scope: [:watchable_type, :watchable_id] }
+
 end
 end

app/views/posts/_large_item.html.slim

@@ -8,7 +8,7 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
         h4.text-link #{post.title}
         h4.text-link #{post.title}
       .col-xs-3
       .col-xs-3
         span.label.label-danger = post.display_specified_date if post.specified_date
         span.label.label-danger = post.display_specified_date if post.specified_date
-        small.pull-right "##{post.id}"
+        small.pull-right ##{post.id}
     .row
     .row
       .col-xs-8
       .col-xs-8
         small.text-success
         small.text-success

app/views/templates/_post.html.slim

@@ -7,7 +7,7 @@
       .col-xs-9
       .col-xs-9
         h4.text-link #{post.title}
         h4.text-link #{post.title}
       .col-xs-3
       .col-xs-3
-        small.pull-right "##{post.id}"
+        small.pull-right ##{post.id}
     .row
     .row
       .col-xs-8
       .col-xs-8
         p.small.text-success
         p.small.text-success

db/migrate/20140719145016_create_watches.rb

 class CreateWatches < ActiveRecord::Migration
 class CreateWatches < ActiveRecord::Migration
   def change
   def change
     create_table :watches do |t|
     create_table :watches do |t|
-      t.integer :user_id, null: false
+      t.integer :watcher_id, null: false
       t.string  :watchable_type, null: false
       t.string  :watchable_type, null: false
       t.integer :watchable_id, null: false
       t.integer :watchable_id, null: false
 
 
       t.timestamps
       t.timestamps
     end
     end
 
 
-    add_index :watches, [:user_id, :watchable_type, :watchable_id], unique: true
+    add_index :watches, [:watcher_id, :watchable_type, :watchable_id], unique: true
     add_index :watches, [:watchable_type, :watchable_id]
     add_index :watches, [:watchable_type, :watchable_id]
   end
   end
 end
 end

spec/models/user_spec.rb

@@ -31,9 +31,9 @@ describe User do
 
 
     let(:alice) { create(:alice) }
     let(:alice) { create(:alice) }
     let(:bob) { create(:bob) }
     let(:bob) { create(:bob) }
+    let(:post) { create(:post) }
 
 
     describe '#google_oauth_token_expired?' do
     describe '#google_oauth_token_expired?' do
-
       it 'not expired' do
       it 'not expired' do
         expect(alice.google_oauth_token_expired?).to be_falsey
         expect(alice.google_oauth_token_expired?).to be_falsey
       end
       end
@@ -41,7 +41,29 @@ describe User do
       it 'expired' do
       it 'expired' do
         expect(bob.google_oauth_token_expired?).to be_truthy
         expect(bob.google_oauth_token_expired?).to be_truthy
       end
       end
+    end
 
 
+    describe '#unwatch / #watch / #watching?' do
+      it 'not watching' do
+        expect(alice.watching?(post: post)).to be_falsey
+      end
+
+      it '#watch!' do
+        alice.watch!(post: post)
+        expect(alice.watching?(post: post)).to be_truthy
+      end
+
+      it '#watch! (uniqueness)' do
+        alice.watch!(post: post)
+        alice.watch!(post: post)
+        expect(alice.watching_posts.size).to be(1)
+      end
+
+      it '#unwatch!' do
+        alice.watch!(post: post)
+        alice.unwatch!(post: post)
+        expect(alice.watching?(post: post)).to be_falsey
+      end
     end
     end
   end
   end
 
 

spec/models/watch_spec.rb

 require 'rails_helper'
 require 'rails_helper'
 
 
 RSpec.describe Watch, :type => :model do
 RSpec.describe Watch, :type => :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  # describe "validations" do
+  #   let(:alice) { create(:alice) }
+  #   let(:post) { create(:post) }
+
+  #   describe "watcher_id" do
+  #     it "uniqueness" do
+  #       alice.watch!(post: post)
+  #       alice.watch!(post: post)
+  #       expect(alice.watching_posts.size).to be(1)
+  #     end
+  #   end
+  # end
 end
 end