Fixed pages controller using :symbol values at runtime and wacky namespacing of initializer constants

just3ws · just3ws · commit 4bbe95cfa49c · 2014-05-19T16:44:09.000-05:00
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -3,6 +3,7 @@ class PagesController < ApplicationController
 
   def show
     show_pages_params = params.permit(:page, :layout)
+
     page_to_show = whitelist_page(show_pages_params[:page])
 
     render action: page_to_show, layout: whitelist_layout(show_pages_params[:layout])
@@ -12,15 +13,15 @@ def show
 
   # Checks whether the requested_page exists in app/views/pages/*.html.haml
   def whitelist_page(requested_page)
-    raise "Invalid page: #{requested_page}" unless STATIC_PAGES.include?(requested_page)
+    raise "Invalid page: #{requested_page}" unless ::STATIC_PAGES.include?(requested_page.to_s)
 
     requested_page
   end
 
   def whitelist_layout(requested_layout)
     return 'application' if requested_layout.nil?
 
-    raise "Invalid layout: #{requested_layout}" unless STATIC_PAGE_LAYOUTS.include?(requested_layout)
+    raise "Invalid layout: #{requested_layout}" unless ::STATIC_PAGE_LAYOUTS.include?(requested_layout.to_s)
 
     requested_layout
   end
