Load banner config from config/banners.yml

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index 589df769a2f244403e4e6fcb4e4c9de149e6d46e..af7d5a643a737966f4c3fe38a439318ec3084b50 100644 (file)
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -1,26 +1,7 @@
 module BannerHelper
 
 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()
   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?
       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 (file)
index 0000000..040b40e
--- /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 (file)
index 0000000..5409f45
--- /dev/null
+++ b/config/initializers/banners.rb
@@ -0,0 +1 @@
+BANNERS = YAML.load_file("#{Rails.root}/config/banners.yml").deep_symbolize_keys rescue {}