From 4285ba4bb364a1ab2346ef6d4d9ced01701d3080 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Fri, 28 Aug 2015 12:41:10 +0200
Subject: [PATCH 1/5] Add tag filter to debates page

---
 app/assets/javascripts/application.js         |  1 +
 .../javascripts/debates_tag_filter.js.coffee  | 17 ++++++++++
 app/controllers/debates_controller.rb         |  7 +++-
 app/views/debates/index.html.erb              | 22 ++++++++++---
 spec/features/debates_spec.rb                 | 33 +++++++++++++++++++
 5 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/debates_tag_filter.js.coffee

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6e5b1df3d..c4134468a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -33,6 +33,7 @@ var initialize_modules = function() {
   App.Stats.initialize();
   App.LocaleSwitcher.initialize();
   App.DebatesOrderSelector.initialize();
+  App.DebatesTagFilter.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/debates_tag_filter.js.coffee b/app/assets/javascripts/debates_tag_filter.js.coffee
new file mode 100644
index 000000000..08b8c7712
--- /dev/null
+++ b/app/assets/javascripts/debates_tag_filter.js.coffee
@@ -0,0 +1,17 @@
+App.DebatesTagFilter =
+
+  href_with_params: (query_params) ->
+    loc = window.location
+
+    loc.protocol + "//" + loc.hostname +
+      (if loc.port then ':' + loc.port else '') +
+      loc.pathname +
+      loc.hash +
+      '?' + $.param(query_params)
+
+  initialize: ->
+    $('.js-tag-filter').on 'change', ->
+      query_params = window.getQueryParameters()
+      query_params['tag'] = $(this).val()
+      window.location.assign(App.DebatesTagFilter.href_with_params(query_params))
+
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index efa441d81..345853752 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -1,5 +1,5 @@
 class DebatesController < ApplicationController
-  before_action :parse_order, only: :index
+  before_action :parse_order, :parse_tag_filter, only: :index
   before_action :authenticate_user!, except: [:index, :show]
 
   load_and_authorize_resource
@@ -77,4 +77,9 @@ class DebatesController < ApplicationController
       @order = @valid_orders.include?(params[:order]) ? params[:order] : 'created_at'
     end
 
+    def parse_tag_filter
+      valid_tags = ActsAsTaggableOn::Tag.all.map(&:name)
+      @tag_filter = params[:tag] if valid_tags.include?(params[:tag])
+    end
+
 end
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 13600160c..759abfff5 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -12,11 +12,23 @@
   <!-- Filter topic results -->
   <div class="filters row">
     <div class="small-12 column">
-      <h2>
-        <%= t("debates.index.filter_topic",
-        number: "N",
-        topic: "topic").html_safe %>
-      </h2>
+      <% if @tag_filter %>
+        <h2>
+          <%= t("debates.index.filter_topic",
+                 number: @debates.size,
+                 # TODO translation
+                 topic: @tag_filter).html_safe %>
+        </h2>
+      <% else %>
+        <h2>Filtrar por tema:  </h2>
+        <form class="inline-block">
+           <select class="js-tag-filter" name="tag-filter"> 
+             <%# select_tag 'tag-filter', nil, {prompt: 'Temas --', class: 'js-tag-filter'} do %>
+             <option value="default" disabled="disabled" selected="selected">Temas --</option>
+             <%= options_from_collection_for_select(ActsAsTaggableOn::Tag.all, :name, :name, prompt: 'Temas...') %>
+           </select>
+        </form>
+      <% end %>
     </div>
   </div>
   <!-- /. Filter topic results -->
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index b9e174915..9018777d3 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -407,4 +407,37 @@ feature 'Debates' do
       expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
     end
   end
+
+  feature 'Debates can be filtered by tags', :js do
+    let!(:debate1) { create(:debate, tag_list: ["Deporte", "Corrupción"]) }
+    let!(:debate2) { create(:debate, tag_list: ["Deporte", "Corrupción", "Fiestas populares"]) }
+    let!(:debate3) { create(:debate, tag_list: ["Corrupción", "Fiestas populares"]) }
+
+    scenario 'By default no tag filter is applied' do
+      visit debates_path
+
+      expect(page).to have_content('Filtrar por tema')
+      expect(page).not_to have_content('con el tema')
+      expect(page).to have_selector('#debates .debate', count: 3)
+      expect(current_url).to_not include('tag=')
+    end
+
+    scenario 'Debates are filtered by single tag' do
+      visit debates_path
+
+      select('Deporte', from: 'tag-filter')
+
+      expect(page).not_to have_content('Filtrar por tema')
+      expect(page).to have_content('with the topic')
+      expect(page).not_to have_select('tag-filter')
+      expect(current_url).to include('tag=Deporte')
+      expect(page).to have_selector('#debates .debate', count: 2)
+
+      expect(page).to_not have_content(debate3.title) 
+      expect(page).to have_content(debate1.title) 
+      expect(page).to have_content(debate2.title) 
+    end
+
+  end
+
 end

From e35550dafa83bdb0a30ca6f926d4e343188e16a3 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Fri, 28 Aug 2015 15:43:09 +0200
Subject: [PATCH 2/5] Remove order_selector partial

Most of the logic was pulled out into DebatesHelper so having
the partial no longer makes sense.
---
 app/views/debates/_order_selector.erb | 5 -----
 app/views/debates/index.html.erb      | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 app/views/debates/_order_selector.erb

diff --git a/app/views/debates/_order_selector.erb b/app/views/debates/_order_selector.erb
deleted file mode 100644
index de18cfc45..000000000
--- a/app/views/debates/_order_selector.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<form class="inline-block">
-   <select class="js-order-selector" name="order-selector"> 
-     <%= available_options_for_order_selector(@valid_orders, @order) %>
-   </select>
-</form>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 759abfff5..9fa518db7 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -4,7 +4,11 @@
   <div class="filters row">
     <div class="small-12 column">
       <h2><%= t("debates.index.showing") %></h2>
-      <%= render 'order_selector' %>
+      <form class="inline-block">
+         <select class="js-order-selector" name="order-selector"> 
+           <%= available_options_for_order_selector(@valid_orders, @order) %>
+         </select>
+      </form>
     </div>
   </div>
   <!-- /. Filters -->

From d7c2dd3aacb820eb195b08e33598fd925d8aaa42 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Fri, 28 Aug 2015 16:55:19 +0200
Subject: [PATCH 3/5] Add translations for debate filters

---
 config/locales/en.yml | 3 +++
 config/locales/es.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a255991da..9648c018e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,11 +33,14 @@ en:
     index:
       create_debate: Create a debate
       showing: You are seeing debates
+      select_order: Order by 
       orders:
         created_at: newest
         total_votes: most voted
         likes: best rated
+      select_topic: "Filter by topic:"
       filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
+      all: All
     debate:
       debate: Debate
       comments:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f37bc0545..126b5d8ed 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -33,11 +33,14 @@ es:
     index:
       create_debate: Crea un debate
       showing: "Estás viendo los debates"
+      select_order: Ordenar por
       orders:
         created_at: "más nuevos"
         total_votes: "más votados"
         likes: mejor valorados
+      select_topic: "Filtrar por tema:"
       filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
+      all: Todos
     debate:
       debate: Debate
       comments:

From c11b611b1afbddcafea8e159f64df3c983d11aa2 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Fri, 28 Aug 2015 17:03:15 +0200
Subject: [PATCH 4/5] Combine debates topic and order filters

---
 app/views/debates/index.html.erb | 54 +++++++++++++++-----------------
 spec/features/debates_spec.rb    | 15 ++++-----
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 9fa518db7..8ab8366fc 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,41 +1,37 @@
 <section role="main">
 
-  <!-- Filters -->
   <div class="filters row">
-    <div class="small-12 column">
-      <h2><%= t("debates.index.showing") %></h2>
-      <form class="inline-block">
-         <select class="js-order-selector" name="order-selector"> 
-           <%= available_options_for_order_selector(@valid_orders, @order) %>
-         </select>
-      </form>
-    </div>
-  </div>
-  <!-- /. Filters -->
+    <div class="small-9 column">
 
-  <!-- Filter topic results -->
-  <div class="filters row">
-    <div class="small-12 column">
-      <% if @tag_filter %>
-        <h2>
-          <%= t("debates.index.filter_topic",
-                 number: @debates.size,
-                 # TODO translation
-                 topic: @tag_filter).html_safe %>
-        </h2>
-      <% else %>
-        <h2>Filtrar por tema:  </h2>
+      <div class="inline-block" >
+        <% if @tag_filter %>
+          <h2>
+            <%= t("debates.index.filter_topic",
+                   number: @debates.size,
+                   topic: @tag_filter).html_safe %>
+          </h2>
+        <% else %>
+          <h2><%= t("debates.index.select_topic") %></h2>
+          <form class="inline-block">
+             <select class="js-tag-filter" name="tag-filter"> 
+               <option value="all" selected="selected"><%= t("debates.index.all") %></option>
+               <%= options_from_collection_for_select(ActsAsTaggableOn::Tag.all, :name, :name) %>
+             </select>
+          </form>
+        <% end %>
+      </div>
+
+      <div class="inline-block right">
+        <h6 class="inline-block"><%= t("debates.index.select_order") %></h6>
         <form class="inline-block">
-           <select class="js-tag-filter" name="tag-filter"> 
-             <%# select_tag 'tag-filter', nil, {prompt: 'Temas --', class: 'js-tag-filter'} do %>
-             <option value="default" disabled="disabled" selected="selected">Temas --</option>
-             <%= options_from_collection_for_select(ActsAsTaggableOn::Tag.all, :name, :name, prompt: 'Temas...') %>
+           <select class="js-order-selector" name="order-selector"> 
+             <%= available_options_for_order_selector(@valid_orders, @order) %>
            </select>
         </form>
-      <% end %>
+      </div>
+
     </div>
   </div>
-  <!-- /. Filter topic results -->
 
   <div class="row">
     <div id="debates" class="debates-list small-12 medium-9 column">
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 9018777d3..c4d4d4487 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -410,16 +410,15 @@ feature 'Debates' do
 
   feature 'Debates can be filtered by tags', :js do
     let!(:debate1) { create(:debate, tag_list: ["Deporte", "Corrupción"]) }
-    let!(:debate2) { create(:debate, tag_list: ["Deporte", "Corrupción", "Fiestas populares"]) }
+    let!(:debate2) { create(:debate, tag_list: ["Deporte", "Fiestas populares"]) }
     let!(:debate3) { create(:debate, tag_list: ["Corrupción", "Fiestas populares"]) }
 
     scenario 'By default no tag filter is applied' do
       visit debates_path
 
-      expect(page).to have_content('Filtrar por tema')
-      expect(page).not_to have_content('con el tema')
+      expect(page).to have_content('Filter by topic')
+      expect(page).not_to have_content('with the topic')
       expect(page).to have_selector('#debates .debate', count: 3)
-      expect(current_url).to_not include('tag=')
     end
 
     scenario 'Debates are filtered by single tag' do
@@ -427,17 +426,15 @@ feature 'Debates' do
 
       select('Deporte', from: 'tag-filter')
 
-      expect(page).not_to have_content('Filtrar por tema')
-      expect(page).to have_content('with the topic')
+      expect(page).not_to have_content('Filter by topic')
       expect(page).not_to have_select('tag-filter')
+      expect(page).to have_content('with the topic')
       expect(current_url).to include('tag=Deporte')
-      expect(page).to have_selector('#debates .debate', count: 2)
 
+      expect(page).to have_selector('#debates .debate', count: 2)
       expect(page).to_not have_content(debate3.title) 
       expect(page).to have_content(debate1.title) 
       expect(page).to have_content(debate2.title) 
     end
-
   end
-
 end

From a52d79cebdaf20b82e8156b080c8cb0c24a959b9 Mon Sep 17 00:00:00 2001
From: Marko Lovic <markolovic@hotmail.com>
Date: Fri, 28 Aug 2015 17:31:53 +0200
Subject: [PATCH 5/5] Remove unused I18n keys

---
 config/locales/en.yml | 1 -
 config/locales/es.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9648c018e..5ef265900 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,7 +32,6 @@ en:
   debates:
     index:
       create_debate: Create a debate
-      showing: You are seeing debates
       select_order: Order by 
       orders:
         created_at: newest
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 126b5d8ed..b4bd0e050 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -32,7 +32,6 @@ es:
   debates:
     index:
       create_debate: Crea un debate
-      showing: "Estás viendo los debates"
       select_order: Ordenar por
       orders:
         created_at: "más nuevos"