From 7a50d2064cbf5e36f950a32f81974a7d8dfd6677 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 2 Aug 2015 13:35:48 +0200 Subject: [PATCH 1/9] adds voting methods to comment model [#25] --- app/models/comment.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/comment.rb b/app/models/comment.rb index 91d7447c0..e99ef15e3 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,5 +1,6 @@ class Comment < ActiveRecord::Base acts_as_nested_set scope: [:commentable_id, :commentable_type] + acts_as_votable validates :body, presence: true validates :user, presence: true From 44ae7078ea95d78b5c9fbc565a38378fc9275819 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 2 Aug 2015 13:36:08 +0200 Subject: [PATCH 2/9] adds routes to votable comments and debates [#25] [#25] --- config/routes.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index f5afd988c..58e23310d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,9 +6,17 @@ Rails.application.routes.draw do # You can have the root of your site routed with "root" root 'debates#index' + + concern :votable do |options| + resources :votes, options.merge(only: :create) + end + resources :debates do - resources :votes, only: :create - resources :comments, only: :create + concerns :votable, votable_type: 'debate' + + resources :comments, only: :create do + concerns :votable, votable_type: 'comment' + end end resource :account, controller: "account", only: [:show, :update] From 2a3086010ec14992bcc0b4fbc92934df90193495 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 2 Aug 2015 13:37:37 +0200 Subject: [PATCH 3/9] adds voting for comments functionality [#25] --- app/controllers/votes_controller.rb | 23 +++++++++++++++++--- app/views/comments/_comment.html.erb | 5 +++++ app/views/comments/_votes.html.erb | 11 ++++++++++ app/views/{votes => debates}/_votes.html.erb | 0 app/views/debates/show.html.erb | 4 ++-- app/views/votes/create.js.erb | 3 ++- 6 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 app/views/comments/_votes.html.erb rename app/views/{votes => debates}/_votes.html.erb (100%) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index e93968f35..c42935ddf 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,21 +1,38 @@ class VotesController < ApplicationController before_action :set_debate + before_action :set_resource before_action :authenticate_user! respond_to :html, :js - + def create register_vote - notice = @debate.vote_registered? ? I18n.t("votes.notice_thanks") : I18n.t("votes.notice_already_registered") respond_with @debate end private + def set_resource + @resource = resource_model.find(params["#{resource_name + "_id"}"]) + end + + def resource_name + @resource_name ||= params[:votable_type] + end + + def resource_model + resource_name.capitalize.constantize + end + def set_debate @debate = Debate.find(params[:debate_id]) end def register_vote - @debate.vote_by voter: current_user, vote: params[:value] + @resource.vote_by voter: current_user, vote: params[:value] end + + def notice + @resource.vote_registered? ? I18n.t("votes.notice_thanks") : I18n.t("votes.notice_already_registered") + end + end diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 0d152d928..50c033670 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -8,6 +8,11 @@ <%= comment.user.name %> • <%= time_ago_in_words(comment.created_at) %>

<%= comment.body %>

+ + + <%= render 'comments/votes', comment: comment %> + +

<%= render 'comments/form', parent: comment %>

diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb new file mode 100644 index 000000000..24b7dd869 --- /dev/null +++ b/app/views/comments/_votes.html.erb @@ -0,0 +1,11 @@ + + <%= link_to "up", debate_comment_votes_path(@debate, comment, value: 'yes'), + method: "post", remote: true %> + <%= comment.get_likes.size %> + + + + <%= link_to "down", debate_comment_votes_path(@debate, comment, value: 'no'), + method: "post", remote: true %> + <%= comment.get_dislikes.size %> + \ No newline at end of file diff --git a/app/views/votes/_votes.html.erb b/app/views/debates/_votes.html.erb similarity index 100% rename from app/views/votes/_votes.html.erb rename to app/views/debates/_votes.html.erb diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 3ae0cace4..8ea945eee 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -17,8 +17,8 @@

<%= render 'shared/tags', debate: @debate %>

-
- <%= render 'votes/votes' %> +
+ <%= render 'debates/votes' %>
diff --git a/app/views/votes/create.js.erb b/app/views/votes/create.js.erb index 5e855e40e..2953d8a25 100644 --- a/app/views/votes/create.js.erb +++ b/app/views/votes/create.js.erb @@ -1 +1,2 @@ -$("#votes").html("<%= j render('votes') %>"); \ No newline at end of file +$("#<%= dom_id(@resource) %>_votes"). + html('<%= j render("#{@resource_name.pluralize}/votes", comment: @resource) %>'); \ No newline at end of file From cce6ca2fb9792559a613ae1500c23b27c6de3ec1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 2 Aug 2015 13:37:50 +0200 Subject: [PATCH 4/9] adds feature specs [#25] --- spec/features/votes_spec.rb | 199 +++++++++++++++++++++++++----------- 1 file changed, 139 insertions(+), 60 deletions(-) diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index d1aabd84a..4d20724b2 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -2,74 +2,153 @@ require 'rails_helper' feature 'Votes' do - background do - @manuela = create(:user) - @pablo = create(:user) - @debate = create(:debate) + feature 'Debates' do + + background do + @manuela = create(:user) + @pablo = create(:user) + @debate = create(:debate) + + login_as(@manuela) + visit debate_path(@debate) + end + + scenario 'Show' do + vote = create(:vote, voter: @manuela, votable: @debate, vote_flag: true) + vote = create(:vote, voter: @pablo, votable: @debate, vote_flag: false) + + visit debate_path(@debate) + + expect(page).to have_content "2 votes" + + within('#in_favor') do + expect(page).to have_content "50%" + end + + within('#against') do + expect(page).to have_content "50%" + end + end + + scenario 'Create', :js do + find('#in_favor a').click + + within('#in_favor') do + expect(page).to have_content "100%" + end + + within('#against') do + expect(page).to have_content "0%" + end + + expect(page).to have_content "1 vote" + end + + scenario 'Update', :js do + find('#in_favor a').click + find('#against a').click + + within('#in_favor') do + expect(page).to have_content "0%" + end + + within('#against') do + expect(page).to have_content "100%" + end + + expect(page).to have_content "1 vote" + end + + scenario 'Trying to vote multiple times', :js do + find('#in_favor a').click + find('#in_favor a').click + + within('#in_favor') do + expect(page).to have_content "100%" + end + + within('#against') do + expect(page).to have_content "0%" + end + + expect(page).to have_content "1 vote" + end - login_as(@manuela) - visit debate_path(@debate) end - scenario 'Show' do - vote = create(:vote, voter: @manuela, votable: @debate, vote_flag: true) - vote = create(:vote, voter: @pablo, votable: @debate, vote_flag: false) - visit debate_path(@debate) + feature 'Comments' do - expect(page).to have_content "2 votes" + background do + @manuela = create(:user) + @pablo = create(:user) + @debate = create(:debate) + @comment = create(:comment, commentable: @debate) - within('#in_favor') do - expect(page).to have_content "50%" + login_as(@manuela) + visit debate_path(@debate) end - within('#against') do - expect(page).to have_content "50%" + scenario 'Show' do + vote = create(:vote, voter: @manuela, votable: @comment, vote_flag: true) + vote = create(:vote, voter: @pablo, votable: @comment, vote_flag: false) + + visit debate_path(@debate) + + within("#comment_#{@comment.id}_votes") do + within(".in_favor") do + expect(page).to have_content "1" + end + + within(".against") do + expect(page).to have_content "1" + end + end end + + scenario 'Create', :js do + within("#comment_#{@comment.id}_votes") do + find(".in_favor a").click + + within(".in_favor") do + expect(page).to have_content "1" + end + + within(".against") do + expect(page).to have_content "0" + end + end + end + + scenario 'Update', :js do + within("#comment_#{@comment.id}_votes") do + find('.in_favor a').click + find('.against a').click + + within('.in_favor') do + expect(page).to have_content "0" + end + + within('.against') do + expect(page).to have_content "1" + end + end + end + + scenario 'Trying to vote multiple times', :js do + within("#comment_#{@comment.id}_votes") do + find('.in_favor a').click + find('.in_favor a').click + + within('.in_favor') do + expect(page).to have_content "1" + end + + within('.against') do + expect(page).to have_content "0" + end + end + end + end - - scenario 'Create', :js do - find('#in_favor a').click - - within('#in_favor') do - expect(page).to have_content "100%" - end - - within('#against') do - expect(page).to have_content "0%" - end - - expect(page).to have_content "1 vote" - end - - scenario 'Update', :js do - find('#in_favor a').click - find('#against a').click - - within('#in_favor') do - expect(page).to have_content "0%" - end - - within('#against') do - expect(page).to have_content "100%" - end - - expect(page).to have_content "1 vote" - end - - scenario 'Trying to vote multiple times', :js do - find('#in_favor a').click - find('#in_favor a').click - - within('#in_favor') do - expect(page).to have_content "100%" - end - - within('#against') do - expect(page).to have_content "0%" - end - - expect(page).to have_content "1 vote" - end - end \ No newline at end of file From 91b52ad8d2df3c772cf9011d25173095ec5d38e2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 5 Aug 2015 12:12:56 +0200 Subject: [PATCH 5/9] refactors voting implementation [#25] --- app/controllers/comments_controller.rb | 8 +++++- app/controllers/debates_controller.rb | 10 +++++-- app/controllers/votes_controller.rb | 38 -------------------------- app/views/comments/_votes.html.erb | 4 +-- app/views/comments/vote.js.erb | 1 + app/views/debates/_votes.html.erb | 6 ++-- app/views/debates/vote.js.erb | 1 + app/views/votes/create.js.erb | 2 -- config/routes.rb | 17 ++++++------ 9 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 app/controllers/votes_controller.rb create mode 100644 app/views/comments/vote.js.erb create mode 100644 app/views/debates/vote.js.erb delete mode 100644 app/views/votes/create.js.erb diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 00fd20653..409bb7c9b 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,6 +1,6 @@ class CommentsController < ApplicationController before_action :authenticate_user! - before_action :set_debate, :set_parent + before_action :set_debate, :set_parent, only: :create respond_to :html, :js def create @@ -10,6 +10,12 @@ class CommentsController < ApplicationController respond_with @comment end + def vote + @comment = Comment.find(params[:id]) + @comment.vote_by(voter: current_user, vote: params[:value]) + respond_with @comment + end + private def comment_params params.require(:comments).permit(:commentable_type, :commentable_id, :body) diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 672f41d20..fe572abe4 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -1,7 +1,7 @@ class DebatesController < ApplicationController - include RecaptchaHelper - before_action :set_debate, only: [:show, :edit, :update] - before_action :authenticate_user!, except: [:show, :index] + include RecaptchaHelper + before_action :set_debate, only: [:show, :edit, :update, :vote] + before_action :authenticate_user!, except: [:index, :show, :vote] before_action :validate_ownership, only: [:edit, :update] def index @@ -37,6 +37,10 @@ class DebatesController < ApplicationController respond_with @debate end + def vote + @debate.vote_by(voter: current_user, vote: params[:value]) + end + private def set_debate diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb deleted file mode 100644 index c42935ddf..000000000 --- a/app/controllers/votes_controller.rb +++ /dev/null @@ -1,38 +0,0 @@ -class VotesController < ApplicationController - before_action :set_debate - before_action :set_resource - before_action :authenticate_user! - respond_to :html, :js - - def create - register_vote - respond_with @debate - end - - private - - def set_resource - @resource = resource_model.find(params["#{resource_name + "_id"}"]) - end - - def resource_name - @resource_name ||= params[:votable_type] - end - - def resource_model - resource_name.capitalize.constantize - end - - def set_debate - @debate = Debate.find(params[:debate_id]) - end - - def register_vote - @resource.vote_by voter: current_user, vote: params[:value] - end - - def notice - @resource.vote_registered? ? I18n.t("votes.notice_thanks") : I18n.t("votes.notice_already_registered") - end - -end diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb index 24b7dd869..2f92ff246 100644 --- a/app/views/comments/_votes.html.erb +++ b/app/views/comments/_votes.html.erb @@ -1,11 +1,11 @@ - <%= link_to "up", debate_comment_votes_path(@debate, comment, value: 'yes'), + <%= link_to "up", vote_comment_path(comment, value: 'yes'), method: "post", remote: true %> <%= comment.get_likes.size %> - <%= link_to "down", debate_comment_votes_path(@debate, comment, value: 'no'), + <%= link_to "down", vote_comment_path(comment, value: 'no'), method: "post", remote: true %> <%= comment.get_dislikes.size %> \ No newline at end of file diff --git a/app/views/comments/vote.js.erb b/app/views/comments/vote.js.erb new file mode 100644 index 000000000..11f0ad905 --- /dev/null +++ b/app/views/comments/vote.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@comment) %>_votes").html('<%= j render("comments/votes", comment: @comment) %>'); \ No newline at end of file diff --git a/app/views/debates/_votes.html.erb b/app/views/debates/_votes.html.erb index fd2704ed4..1ed675ef1 100644 --- a/app/views/debates/_votes.html.erb +++ b/app/views/debates/_votes.html.erb @@ -1,6 +1,7 @@
- <%= link_to debate_votes_path(@debate, value: 'yes'), class: 'in-favor', method: "post", remote: true do %> + <%= link_to vote_debate_path(@debate, value: 'yes', partial: 'votes'), + class: 'in-favor', method: "post", remote: true do %> <%= percentage('likes', @debate) %> <% end %> @@ -9,7 +10,8 @@
- <%= link_to debate_votes_path(@debate, value: 'no'), class: 'against', method: "post", remote: true do %> + <%= link_to vote_debate_path(@debate, value: 'no', partial: 'votes'), + class: 'against', method: "post", remote: true do %> <%= percentage('dislikes', @debate) %> <% end %> diff --git a/app/views/debates/vote.js.erb b/app/views/debates/vote.js.erb new file mode 100644 index 000000000..e98725bb2 --- /dev/null +++ b/app/views/debates/vote.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@debate) %>_votes").html('<%= j render("debates/#{params[:partial]}", debate: @debate) %>'); \ No newline at end of file diff --git a/app/views/votes/create.js.erb b/app/views/votes/create.js.erb deleted file mode 100644 index 2953d8a25..000000000 --- a/app/views/votes/create.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#<%= dom_id(@resource) %>_votes"). - html('<%= j render("#{@resource_name.pluralize}/votes", comment: @resource) %>'); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 58e23310d..ce179d8ac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,16 +7,17 @@ Rails.application.routes.draw do # You can have the root of your site routed with "root" root 'debates#index' - concern :votable do |options| - resources :votes, options.merge(only: :create) - end - resources :debates do - concerns :votable, votable_type: 'debate' - - resources :comments, only: :create do - concerns :votable, votable_type: 'comment' + member do + post :vote end + + resources :comments, only: :create, shallow: true do + member do + post :vote + end + end + end resource :account, controller: "account", only: [:show, :update] From 5ce8db002bd0e31dd06ddd8512d5941be6cc0681 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 5 Aug 2015 12:13:27 +0200 Subject: [PATCH 6/9] adds vote partial for debate index [#25] --- app/views/debates/_debate.html.erb | 23 +++-------------------- app/views/debates/_votes_min.html.erb | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 app/views/debates/_votes_min.html.erb diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index 4253143a6..e30cb9f90 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -9,25 +9,8 @@

<%= render 'shared/tags', debate: debate %>

-
-
- - <%= link_to debate_votes_path(debate, value: 'yes'), class: 'in-favor', method: "post" do %> - - <%= percentage('likes', debate) %> - <% end %> - - - - <%= link_to debate_votes_path(debate, value: 'no'), class: 'against', method: "post" do %> - - <%= percentage('dislikes', debate) %> - <% end %> -
- -
-

<%= pluralize(debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>

-
-
+
+ <%= render 'debates/votes_min', debate: debate %> +
diff --git a/app/views/debates/_votes_min.html.erb b/app/views/debates/_votes_min.html.erb new file mode 100644 index 000000000..af793a280 --- /dev/null +++ b/app/views/debates/_votes_min.html.erb @@ -0,0 +1,25 @@ +
+
+ <%= link_to vote_debate_path(debate, value: 'yes', partial: 'votes_min'), + class: 'in-favor', method: "post", remote: true do %> + + <%= percentage('likes', debate) %> + <% end %> +
+ + + +
+ <%= link_to vote_debate_path(debate, value: 'no', partial: 'votes_min'), + class: 'against', method: "post", remote: true do %> + + <%= percentage('dislikes', debate) %> + <% end %> +
+
+ +
+

+ <%= pluralize(debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %> +

+
\ No newline at end of file From c2e7ff32b1ebd3a7ace0f61901e24cad12dcf365 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 5 Aug 2015 12:13:49 +0200 Subject: [PATCH 7/9] adds spec for voting from debate index [#25] --- spec/features/votes_spec.rb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index 4d20724b2..a2adbe117 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -30,7 +30,7 @@ feature 'Votes' do end end - scenario 'Create', :js do + scenario 'Create from debate show', :js do find('#in_favor a').click within('#in_favor') do @@ -44,6 +44,23 @@ feature 'Votes' do expect(page).to have_content "1 vote" end + scenario 'Create from debate index', :js do + visit debates_path + + find('#in_favor a').click + + within('#in_favor') do + expect(page).to have_content "100%" + end + + within('#against') do + expect(page).to have_content "0%" + end + + expect(page).to have_content "1 vote" + expect(URI.parse(current_url).path).to eq(debates_path) + end + scenario 'Update', :js do find('#in_favor a').click find('#against a').click From dda5963641f98b3e309859fbe8c26080c2eec10d Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 5 Aug 2015 13:50:15 +0200 Subject: [PATCH 8/9] adds spec for voting a featured debate [#25] --- spec/features/votes_spec.rb | 40 +++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index a2adbe117..3e44f4f0e 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -44,20 +44,44 @@ feature 'Votes' do expect(page).to have_content "1 vote" end - scenario 'Create from debate index', :js do + scenario 'Create from debate featured', :js do visit debates_path - find('#in_favor a').click + within("#featured-debates") do + find('#in_favor a').click - within('#in_favor') do - expect(page).to have_content "100%" + within('#in_favor') do + expect(page).to have_content "100%" + end + + within('#against') do + expect(page).to have_content "0%" + end + + expect(page).to have_content "1 vote" end + expect(URI.parse(current_url).path).to eq(debates_path) + end - within('#against') do - expect(page).to have_content "0%" + scenario 'Create from debate index', :js do + 3.times { create(:debate) } + visit debates_path + + within("#debates") do + expect(page).to have_css(".debate", count: 1) + + find('#in_favor a').click + + within('#in_favor') do + expect(page).to have_content "100%" + end + + within('#against') do + expect(page).to have_content "0%" + end + + expect(page).to have_content "1 vote" end - - expect(page).to have_content "1 vote" expect(URI.parse(current_url).path).to eq(debates_path) end From 062ef365adc06ae0784f0efb77d6571f7b7db060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Wed, 5 Aug 2015 14:34:55 +0200 Subject: [PATCH 9/9] vote action not allowed for unauthenticated users --- app/controllers/debates_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 03afc1c8e..8ccf33f6a 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -1,7 +1,7 @@ class DebatesController < ApplicationController include RecaptchaHelper before_action :set_debate, only: [:show, :edit, :update, :vote] - before_action :authenticate_user!, except: [:index, :show, :vote] + before_action :authenticate_user!, except: [:index, :show] before_action :validate_ownership, only: [:edit, :update] def index