Merge remote-tracking branch 'upstream/pull/4732'

[rails.git] / app / helpers / banner_helper.rb

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index 98308ae12a2b87e3a6f0bef937dd78a4a6206237..9048d484001d2d5c12ef23591798bac65532302e 100644 (file)
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -1,13 +1,19 @@
 module BannerHelper
   def active_banners
     BANNERS.reject do |_k, v|
-      enddate = v[:enddate]
       begin
-        parsed = enddate && Date.parse(enddate)
-      rescue
-        parsed = nil
+        startdate = v[:startdate] && Date.parse(v[:startdate])
+      rescue StandardError
+        startdate = nil
       end
-      parsed.is_a?(Date) && parsed.past?
+
+      begin
+        enddate = v[:enddate] && Date.parse(v[:enddate])
+      rescue StandardError
+        enddate = nil
+      end
+
+      startdate&.future? || enddate&.past?
     end
   end
 
@@ -17,6 +23,7 @@ module BannerHelper
     banner_key = nil
     cookie_key = nil
     min_index = 9999
+    min_date = Date.new(9999, 1, 1)
 
     banners.each do |k, v|
       ckey = banner_cookie(v[:id]).to_sym
@@ -25,14 +32,19 @@ module BannerHelper
 
       # rotate all banner queue positions
       index = cval.to_i
-      cookies[ckey] = index - 1 if index > 0
+      cookies[ckey] = index - 1 if index.positive?
 
-      # pick banner with mininum queue position
+      # pick banner with minimum queue position
       next if index > min_index
 
+      # or if equal queue position, pick banner with soonest end date (i.e. next expiring)
+      end_date = Date.parse(v[:enddate])
+      next if index == min_index && end_date > min_date
+
       banner_key = k
       cookie_key = ckey
       min_index = index
+      min_date = end_date
     end
 
     unless banner_key.nil?