consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds comment show view

Browse Source
This commit is contained in:
rgarcia
2016-01-07 14:19:05 +01:00
parent 5e9240e25c
commit 816a95b7b7
11 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/comments_controller.rb
View File

@@ -1,5 +1,5 @@
class CommentsController < ApplicationController
before_action :authenticate_user!
before_action :authenticate_user!, only: :create
before_action :load_commentable, only: :create
before_action :build_comment, only: :create
@@ -14,6 +14,11 @@ class CommentsController < ApplicationController
end
end
def show
@comment = Comment.find(params[:id])
set_comment_flags(@comment.subtree)
end
def vote
@comment.vote_by(voter: current_user, vote: params[:value])
respond_with @comment

7
app/helpers/comments_helper.rb
View File

@@ -13,8 +13,11 @@ module CommentsHelper
end
def child_comments_of(parent)
return [] unless @comment_tree
@comment_tree.children_of(parent)
if @comment_tree.present?
@comment_tree.ordered_children_of(parent)
else
parent.children
end
end
def user_level_class(comment)

1
app/models/abilities/everyone.rb
View File

@@ -5,6 +5,7 @@ module Abilities
def initialize(user)
can :read, Debate
can :read, Proposal
can :read, Comment
can :read, Legislation
can :read, User
can [:search, :read], Annotation

13
app/views/comments/_comment.html.erb
View File

@@ -1,9 +1,9 @@
<% cache [locale_and_user_status(comment), comment, commentable_cache_key(@commentable), comment.author, (@comment_flags[comment.id] if @comment_flags)] do %>
<% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (@comment_flags[comment.id] if @comment_flags)] do %>
<div class="row">
<div id="<%= dom_id(comment) %>" class="comment small-12 column">
<% if comment.hidden? || comment.user.hidden? %>
<% if child_comments_of(comment).size > 0 %>
<% if comment.children.size > 0 %>
<div class="is-deleted">
<p><%= t("comments.comment.deleted") %></p>
</div>
@@ -49,7 +49,7 @@
<%= t("shared.collective") %>
</span>
<% end %>
<% if comment.user_id == @commentable.author_id %>
<% if comment.user_id == comment.commentable.author_id %>
&nbsp;&bull;&nbsp;
<span class="label round is-author">
<%= t("comments.comment.author") %>
@@ -63,7 +63,7 @@
<div class="comment-user
<%= user_level_class comment %>
<%= comment_author_class comment, @commentable.author_id %>">
<%= comment_author_class comment, comment.commentable.author_id %>">
<%= simple_format text_with_links comment.body %>
</div>
@@ -72,7 +72,7 @@
</span>
<div class="reply">
<%= t("comments.comment.responses", count: child_comments_of(comment).size) %>
<%= t("comments.comment.responses", count: comment.children.size) %>
<% if user_signed_in? %>
<span class="divider">&nbsp;|&nbsp;</span>
@@ -81,11 +81,12 @@
<%= render 'comments/actions', comment: comment %>
<%= render 'comments/form', {commentable: @commentable, parent_id: comment.id, toggeable: true} %>
<%= render 'comments/form', {commentable: comment.commentable, parent_id: comment.id, toggeable: true} %>
<% end %>
</div>
</div>
<% end %>
<div class="comment-children">
<% child_comments_of(comment).each do |child| %>
<%= render 'comments/comment', comment: child %>

12
app/views/comments/show.html.erb Normal file
View File

@@ -0,0 +1,12 @@
<div>
<%= link_to t("comments.show.return_to_commentable") + @comment.commentable.title,
@comment.commentable %>
</div>
<section class="row-full comments">
<div class="row">
<div id="comments" class="small-12 column">
<%= render @comment %>
</div>
</div>
</section>

2
config/locales/en.yml
View File

@@ -244,6 +244,8 @@ en:
form:
submit_button: "Save changes"
comments:
show:
return_to_commentable: "Go back to "
select_order: "Sort by"
orders:
most_voted: "Most voted"

2
config/locales/es.yml
View File

@@ -244,6 +244,8 @@ es:
form:
submit_button: "Guardar cambios"
comments:
show:
return_to_commentable: "Volver a "
select_order: "Ordenar por"
orders:
most_voted: "Más votados"

2
config/routes.rb
View File

@@ -53,7 +53,7 @@ Rails.application.routes.draw do
end
end
resources :comments, only: :create, shallow: true do
resources :comments, only: [:create, :show], shallow: true do
member do
post :vote
put :flag

15
spec/features/comments/debates_spec.rb
View File

@@ -20,6 +20,21 @@ feature 'Commenting debates' do
end
end
scenario 'Show' do
parent_comment = create(:comment, commentable: debate)
first_child = create(:comment, commentable: debate, parent: parent_comment)
second_child = create(:comment, commentable: debate, parent: parent_comment)
visit comment_path(parent_comment)
expect(page).to have_css(".comment", count: 3)
expect(page).to have_content parent_comment.body
expect(page).to have_content first_child.body
expect(page).to have_content second_child.body
expect(page).to have_link "Go back to #{debate.title}", debate_path(debate)
end
scenario 'Comment order' do
c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)

15
spec/features/comments/proposals_spec.rb
View File

@@ -20,6 +20,21 @@ feature 'Commenting proposals' do
end
end
scenario 'Show' do
parent_comment = create(:comment, commentable: proposal)
first_child = create(:comment, commentable: proposal, parent: parent_comment)
second_child = create(:comment, commentable: proposal, parent: parent_comment)
visit comment_path(parent_comment)
expect(page).to have_css(".comment", count: 3)
expect(page).to have_content parent_comment.body
expect(page).to have_content first_child.body
expect(page).to have_content second_child.body
expect(page).to have_link "Go back to #{proposal.title}", proposal_path(proposal)
end
scenario 'Comment order' do
c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)

2
spec/models/abilities/everyone_spec.rb
View File

@@ -21,4 +21,6 @@ describe "Abilities::Everyone" do
it { should_not be_able_to(:vote, Proposal) }
it { should_not be_able_to(:flag, Proposal) }
it { should_not be_able_to(:unflag, Proposal) }
it { should be_able_to(:show, Comment) }
end