Pacify rubocop

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index af7d5a643a737966f4c3fe38a439318ec3084b50..92b633eca5f343c643601431675968c85f286c54 100644 (file)
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -1,47 +1,47 @@
 module BannerHelper
-
-  def active_banners()
-    BANNERS.reject do |k,v|
+  def active_banners
+    BANNERS.reject do |_k, v|
       enddate = v[:enddate]
-      parsed = (enddate and Date.parse enddate rescue nil)
-      parsed.is_a?(Date) and parsed.past?
+      begin
+        parsed = enddate && Date.parse(enddate)
+      rescue
+        parsed = nil
+      end
+      parsed.is_a?(Date) && parsed.past?
     end
   end
 
   # returns the least recently seen banner that is not hidden
-  def next_banner()
-    banners = active_banners()
-    bannerKey = nil
-    cookieKey = nil
-    queuePos = 9999
+  def next_banner
+    banners = active_banners
+    banner_key = nil
+    cookie_key = nil
+    min_index = 9999
 
     banners.each do |k, v|
       ckey = cookie_id(v[:id]).to_sym
       cval = cookies[ckey] || 0
-      next if cval == 'hide'
+      next if cval == "hide"
 
       # rotate all banner queue positions
       index = cval.to_i
-      if index > 0
-        cookies[ckey] = index - 1
-      end
+      cookies[ckey] = index - 1 if index > 0
 
       # pick banner with mininum queue position
-      if index <= queuePos
-        bannerKey = k
-        cookieKey = ckey
-        queuePos = index
-      end
+      next if index > min_index
+
+      banner_key = k
+      cookie_key = ckey
+      min_index = index
     end
 
-    unless bannerKey.nil?
-      cookies[cookieKey] = banners.length   # bump to end of queue
-      banners[bannerKey]
+    unless banner_key.nil?
+      cookies[cookie_key] = banners.length # bump to end of queue
+      banners[banner_key]
     end
   end
 
   def cookie_id(key)
     "_osm_banner_#{key}"
   end
-
 end

diff --git a/config/initializers/banners.rb b/config/initializers/banners.rb
index 5409f45313d8e5dd5807fcc1a9a5983739d354c4..cda96e038018e56263b3c836ea00850661534c3b 100644 (file)
--- a/config/initializers/banners.rb
+++ b/config/initializers/banners.rb
@@ -1 +1,5 @@
-BANNERS = YAML.load_file("#{Rails.root}/config/banners.yml").deep_symbolize_keys rescue {}
+begin
+  BANNERS = YAML.load_file("#{Rails.root}/config/banners.yml").deep_symbolize_keys
+rescue
+  BANNERS = {}.freeze
+end