From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 22 Jun 2016 17:37:57 +0000 (-0400)
Subject: Load banner config from config/banners.yml
X-Git-Tag: live~4372^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9e3dc420f334c936c6d4287a0898cebc2177a852

Load banner config from config/banners.yml
---

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index 589df769a..af7d5a643 100644
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -1,26 +1,7 @@
 module BannerHelper
 
-  def all_banners()
-    {
-      :sotmus2016 => {
-        :id => 'sotmus2016',
-        :alt => 'State of the Map US 2016',
-        :link => 'http://stateofthemap.us/',
-        :img => 'banners/sotmus-2016.jpg',
-        :enddate => '2016-jul-23'
-      },
-      :sotm2016 => {
-        :id => 'sotm2016',
-        :alt => 'State of the Map 2016',
-        :link => 'http://2016.stateofthemap.org/',
-        :img => 'banners/sotm-2016.jpg',
-        :enddate => '2016-sep-23'
-      }
-    }
-  end
-
   def active_banners()
-    all_banners().reject do |k,v|
+    BANNERS.reject do |k,v|
       enddate = v[:enddate]
       parsed = (enddate and Date.parse enddate rescue nil)
       parsed.is_a?(Date) and parsed.past?
diff --git a/config/banners.yml b/config/banners.yml
new file mode 100644
index 000000000..040b40e18
--- /dev/null
+++ b/config/banners.yml
@@ -0,0 +1,13 @@
+sotmus2016:
+  id: sotmus2016
+  alt: State of the Map US 2016
+  link: http://stateofthemap.us/
+  img: banners/sotmus-2016.jpg
+  enddate: 2016-jul-23
+
+sotm2016:
+  id: sotm2016
+  alt: State of the Map 2016
+  link: http://2016.stateofthemap.org/
+  img: banners/sotm-2016.jpg
+  enddate: 2016-sep-23
diff --git a/config/initializers/banners.rb b/config/initializers/banners.rb
new file mode 100644
index 000000000..5409f4531
--- /dev/null
+++ b/config/initializers/banners.rb
@@ -0,0 +1 @@
+BANNERS = YAML.load_file("#{Rails.root}/config/banners.yml").deep_symbolize_keys rescue {}