From 8d87a69e0fe07f61ff2423014c652b599518d176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 5 Aug 2015 14:12:58 +0200
Subject: [PATCH] hides comment forms from not logged users Closes #66

---
 app/views/comments/_comment.html.erb |  4 +++-
 app/views/comments/_form.html.erb    |  4 ++--
 app/views/debates/show.html.erb      |  8 +++++++-
 config/locales/en.yml                |  1 +
 config/locales/es.yml                |  1 +
 spec/features/comments_spec.rb       | 17 +++++++++++++++--
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 0d152d928..31b448088 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -8,7 +8,9 @@
 	 			<%= comment.user.name %>&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
 	 		</span>
 	  		<p><%= comment.body %></p>
-	  		<p class="reply"><%= render 'comments/form', parent: comment %></p>
+	  		<% if user_signed_in? %>
+	  		<p class="reply"><%= render 'comments/form', {parent: comment, toggeable: true} %></p>
+	  		<% end %>
 	  	</div>
 
 	  	<div class="comment-children">
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 01661221f..da2b3bb61 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,6 +1,6 @@
-<%= link_to comment_link_text(parent), "", class: "js-add-comment-link", data: {'id': dom_id(parent)} %>
+<%= link_to(comment_link_text(parent), "", class: "js-add-comment-link", data: {'id': dom_id(parent)}) if toggeable %>
 
-<div id="js-comment-form-<%= dom_id(parent) %>" style="display:none">
+<div id="js-comment-form-<%= dom_id(parent) %>" <%= "style='display:none'".html_safe if toggeable %>>
   <%= form_for [@debate, Comment.new], remote: true do |f| %>
     <%= f.text_area :body %>
     <%= f.hidden_field :commentable_type, value: parent.class %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 76c76e71c..e1bc3ba20 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -13,7 +13,11 @@
     <div id="votes" class="small-12 medium-3 column votes">
       <%= render 'votes/votes' %>
       <div class="text-center">
+      <% if user_signed_in? %>
         <%= link_to t("debates.show.leave_comment"), "#comments", class: "leave-comment" %>
+      <% else %>
+        <%= link_to t("debates.show.login_to_comment"), new_user_session_path, class: "leave-comment" %>
+      <% end %>
       </div>
     </div>
   </div>
@@ -23,10 +27,12 @@
   <div class="row">
     <div id="comments" class="small-12 column">
       <h2><%= t("debates.show.comments") %></h2>
+      <% if user_signed_in? %>
         <div>
           <%= t("debates.show.leave_comment") %>
-          <%= render 'comments/form', parent: @debate %>
+          <%= render 'comments/form', {parent: @debate, toggeable: false} %>
         </div>
+      <% end %>
       <%= render @debate.root_comments %>
     </div>
     <% if current_user && @debate.editable_by?(current_user) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 75e5bd1af..caf4bdbad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,6 +38,7 @@ en:
       comment: Comment
       comments: Comments
       leave_comment: Write a comment
+      login_to_comment: Log in to participate
       edit_debate_link: Edit
     edit:
       editing: Edit debate
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1cb2dd4c3..98f75bac7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -37,6 +37,7 @@ es:
       comment: Comentario
       comments: Comentarios
       leave_comment: Deja tu comentario
+      login_to_comment: Entra para participar
       edit_debate_link: Editar
     edit:
       editing: Editar debate
diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb
index b5293afa0..3d215ef00 100644
--- a/spec/features/comments_spec.rb
+++ b/spec/features/comments_spec.rb
@@ -19,6 +19,21 @@ feature 'Comments' do
     end
   end
 
+  feature 'Not logged user' do
+    scenario 'can not see comments forms' do
+      debate = create(:debate)
+      create(:comment, commentable: debate)
+      visit debate_path(debate)
+
+      expect(page).to have_content 'Log in to participate'
+      within ('#comments') do
+        expect(page).to_not have_content 'Write a comment'
+        expect(page).to_not have_content 'Reply'
+        expect(page).to_not have_css('form')
+      end
+    end
+  end
+
   scenario 'Create', :js do
     user = create(:user)
     debate = create(:debate)
@@ -26,8 +41,6 @@ feature 'Comments' do
     login_as(user)
     visit debate_path(debate)
 
-    click_on 'Comment'
-
     fill_in 'comment_body', with: '¿Has pensado en esto...?'
     click_button 'Publish comment'