renamed pinned link 'present' filter to 'current' to avoid confusion with built-in methods such as 'present?', 'presence', etc

Author: Oaphi

app/controllers/pinned_links_controller.rb

@@ -4,7 +4,7 @@ class PinnedLinksController < ApplicationController
   before_action :verify_mod_on_current_community, only: [:edit, :update]
 
   def index
-    @period = params[:period].presence || 'present'
+    @period = params[:period].presence || 'current'
 
     @links = if current_user.at_least_global_moderator? && params[:global] == '2'
                PinnedLink.unscoped
@@ -17,8 +17,8 @@ def index
     @links = case @period
              when 'past'
                @links.past
-             when 'present'
-               @links.present
+             when 'current'
+               @links.current
              when 'future'
                @links.future
              else

app/models/pinned_link.rb

@@ -12,8 +12,8 @@ class PinnedLink < ApplicationRecord
     timed.where('shown_before < ?', DateTime.now)
   }
 
-  # a present link is not timed or started in the past and ends in the future
-  scope :present, lambda {
+  # a current link is not timed or started in the past and ends in the future
+  scope :current, lambda {
     where(shown_after: nil, shown_before: nil).or(
       timed.where('shown_after <= ?', DateTime.now)
            .where('shown_before > ?', DateTime.now)

app/views/pinned_links/index.html.erb

@@ -33,9 +33,9 @@
             <%= link_to 'past',
                         query_url(period: 'past'),
                         class: "button is-muted is-outlined #{'is-active' if @period == 'past'}" %>
-            <%= link_to 'present',
-                        query_url(period: 'present'),
-                        class: "button is-muted is-outlined #{'is-active' if @period == 'present'}" %>
+            <%= link_to 'current',
+                        query_url(period: 'current'),
+                        class: "button is-muted is-outlined #{'is-active' if @period == 'current'}" %>
             <%= link_to 'future',
                         query_url(period: 'future'),
                         class: "button is-muted is-outlined #{'is-active' if @period == 'future'}" %>

test/controllers/pinned_links_controller_test.rb

@@ -61,7 +61,7 @@ class PinnedLinksControllerTest < ActionController::TestCase
       assert link.timed? && link.shown_before < now
     end
 
-    get :index, params: { period: 'present' }
+    get :index, params: { period: 'current' }
     @links = assigns(:links)
     assert_response(:success)
     assert @links.any?

test/models/pinned_link_test.rb

@@ -11,13 +11,13 @@ class PinnedLinkTest < ActiveSupport::TestCase
     end
   end
 
-  test ':present scope should return non-timed or current links' do
+  test ':current scope should return non-timed or current links' do
     now = DateTime.now
-    present = PinnedLink.present
+    current = PinnedLink.current
 
-    assert present.any?
+    assert current.any?
 
-    present.each do |link|
+    current.each do |link|
       assert !link.timed? || (link.shown_before > now && link.shown_after <= now)
     end
   end