Best practices code changes

app/controllers/debates_controller.rb

@@ -18,6 +18,11 @@ class DebatesController < ApplicationController
   helper_method :resource_model, :resource_name
   respond_to :html, :js
 
+  def index
+    super
+    @featured_debates = @debates.featured
+  end 
+
   def show
     super
     redirect_to debate_path(@debate), status: :moved_permanently if request.path != debate_path(@debate)
@@ -28,12 +33,12 @@ class DebatesController < ApplicationController
     set_debate_votes(@debate)
   end
 
-  def remove_feature
+  def unmark_featured
     @debate.update_attribute(:featured_at, nil)
     redirect_to request.query_parameters.merge(action: :index)
   end
 
-  def feature
+  def mark_featured
     @debate.update_attribute(:featured_at, Time.now)
     redirect_to request.query_parameters.merge(action: :index)
   end

app/helpers/debates_helper.rb

@@ -1,6 +1,6 @@
 module DebatesHelper
 
-  def has_featured 
+  def has_featured? 
     Debate.all.featured.count > 0
   end
 end

app/models/abilities/administrator.rb

@@ -30,9 +30,8 @@ module Abilities
       can :confirm_hide, User
       cannot :confirm_hide, User, hidden_at: nil
 
-      can :feature, Debate
-
-      can :remove_feature, Debate
+      can :mark_featured, Debate
+      can :unmark_featured, Debate
 
       can :comment_as_administrator, [Debate, Comment, Proposal]
 

app/models/debate.rb

@@ -134,7 +134,7 @@ class Debate < ActiveRecord::Base
   end
 
   def featured?
-    ! self.featured_at.nil?
+    self.featured_at.present?
   end
 
 end

app/views/debates/_actions.html.erb

@@ -9,13 +9,13 @@
               method: :put, data: { confirm: t('admin.actions.confirm') } %>
 <% end %>
 
-<% if can? :feature, debate %>
-  &nbsp;|&nbsp;   
+<% if can? :mark_featured, debate %>
+  &nbsp;|&nbsp;
   <% if debate.featured? %>
-  <%= link_to t("admin.actions.remove_feature").capitalize,  remove_feature_debate_path(debate),
+    <%= link_to t("admin.actions.unmark_featured").capitalize, unmark_featured_debate_path(debate),
               method: :put, data: { confirm: t('admin.actions.confirm') } %>
   <% else %>
-  <%= link_to t("admin.actions.feature").capitalize, feature_debate_path(debate),
+    <%= link_to t("admin.actions.mark_featured").capitalize, mark_featured_debate_path(debate),
               method: :put, data: { confirm: t('admin.actions.confirm') } %>
   <% end %>
 <% end %>

app/views/debates/_featured_debates.html.erb

@@ -4,7 +4,7 @@
     <h2><%= t("debates.index.featured_debates") %></h2>
   </div>
 
-  <% @debates.featured.each do |debate| %>
+  <% @featured_debates.each do |debate| %>
     <div class="small-12 medium-6 column end">
       <h3><%= link_to debate.title, debate %></h3>
       <%= link_to debate.author.name, user_path(debate.author)%>

app/views/debates/index.html.erb

@@ -25,8 +25,8 @@
         <% end %>
       </div>
 
-      <% unless @tag_filter || @search_terms ||  !has_featured %>
-        <%= render "featured_debates", debate: @debates.featured %>
+      <% unless @tag_filter || @search_terms || !has_featured? %>
+        <%= render "featured_debates" %>
       <% end %>
 
       <%= render "shared/advanced_search", search_path: debates_path(page: 1) %>

config/locales/admin.en.yml

@@ -7,8 +7,8 @@ en:
       hide: Hide
       hide_author: Hide author
       restore: Restore
-      feature: Feature
-      remove_feature: Remove feature
+      mark_featured: Featured
+      unmark_featured: Unmark featured
     activity:
       show:
         action: Action

config/locales/admin.es.yml

@@ -7,8 +7,8 @@ es:
       hide: Ocultar
       hide_author: Bloquear al autor
       restore: Volver a mostrar
-      feature: Destacar
-      remove_feature: Quitar destacado
+      mark_featured: Destacar
+      unmark_featured: Quitar destacado
     activity:
       show:
         action: Acción

config/routes.rb

@@ -36,8 +36,8 @@ Rails.application.routes.draw do
       post :vote
       put :flag
       put :unflag
-      put :remove_feature
-      put :feature
+      put :mark_featured
+      put :unmark_featured
     end
     collection do
       get :map