fixing conflicts [#7]

app/assets/stylesheets/debates.scss

@@ -0,0 +1,7 @@
+#tag_cloud {
+  width: 400px;
+  line-height: 1.6em;
+  .s { font-size: 0.8em; }
+  .m { font-size: 1.2em; }
+  .l { font-size: 1.8em; }
+}

app/controllers/debates_controller.rb

@@ -3,7 +3,11 @@ class DebatesController < ApplicationController
   before_action :authenticate_user!, only: [:new, :create]
   
   def index
-    @debates = Debate.all
+    if params[:tag]
+      @debates = Debate.tagged_with(params[:tag])
+    else
+      @debates = Debate.all
+    end
   end
 
   def show
@@ -35,7 +39,7 @@ class DebatesController < ApplicationController
     end
 
     def debate_params
-      params.require(:debate).permit(:title, :description, :external_link, :terms_of_service)
+      params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service)
     end
 
 end

app/helpers/application_helper.rb

@@ -1,2 +1,7 @@
 module ApplicationHelper
+
+  def tags(debate)
+    debate.tag_list.map { |tag| link_to sanitize(tag), debates_path(tag: tag) }.join(', ').html_safe
+  end
+
 end

app/models/debate.rb

@@ -1,5 +1,6 @@
 class Debate < ActiveRecord::Base
   acts_as_commentable
+  acts_as_taggable
   
   belongs_to :author, class_name: 'User', foreign_key: 'author_id'
 

app/views/debates/_debate.html.erb

@@ -1,9 +1,12 @@
-<div class='debate'>
+<div id="debate-<%= debate.id %>" class='debate'>
   <p><%= link_to debate.title, debate %></p>
   <p><%= debate.description %></p>
+
   <p>
     Creado el: <%= l debate.created_at.to_date %>
     por: <%= debate.author.name %>
   </p>
+
+  <p><%= render 'shared/tags', debate: debate %></p>
 </div>
-<br/><br/>
+<br/><br/><br/><br/>

app/views/debates/_form.html.erb

@@ -20,6 +20,11 @@
   <p>Explica con todo el detalle que puedas y de una manera sencilla la idea y que crees que conseguiríamos con ella</p>
   <%= f.text_area  :description %>
 
+  <div>
+    <%= f.label :tag_list, "Temas (separados por comas)" %><br />
+    <%= f.text_field :tag_list, value: @debate.tag_list.to_s %>
+  </div>
+
   <% if @debate.new_record? %>
     <%= f.check_box :terms_of_service %>
     Acepto la política de privacidad y el aviso legal 

app/views/debates/index.html.erb

@@ -4,5 +4,7 @@
   <%= render @debates %>
 </div>
 
-<br>
+<%= render 'shared/tag_cloud' %>
+
+<br/><br/>
 <%= link_to 'New Debate', new_debate_path %>

app/views/debates/show.html.erb

@@ -7,6 +7,9 @@
   </p>
 </div>
 
+<%= render 'shared/tags', debate: @debate %>
+
+<br/><br/>
 Deja tu comentario
 <%= render 'comments/form', parent: @debate %>
 

app/views/shared/_tag_cloud.html.erb

@@ -0,0 +1,5 @@
+<div id="tag-cloud">
+  <% tag_cloud Debate.tag_counts, %w[s m l] do |tag, css_class| %>
+    <%= link_to sanitize("#{tag.name}(#{tag.taggings_count})"), debates_path(tag: tag.name), class: css_class %>
+  <% end %>
+</div>

app/views/shared/_tags.html.erb

@@ -0,0 +1,3 @@
+<% if debate.tags.any? %>
+  Temas: <%= tags(debate) %>
+<% end %>