From f7d2b97a6cf0893b250e418307d3d159f6be5218 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <m@ku1ik.com>
Date: Mon, 9 Dec 2013 23:55:12 +0100
Subject: [PATCH] Use the "method" API of CFG object everywhere

---
 app/controllers/home_controller.rb  |  2 +-
 app/views/layouts/_ga.html.erb      |  4 ++--
 app/views/shared/_add_this.html.erb |  2 +-
 config/initializers/carrierwave.rb  | 12 +++++-------
 config/initializers/errbit.rb       |  6 +++---
 config/initializers/omniauth.rb     |  4 ++--
 config/initializers/secret_token.rb |  2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 709510d..b736022 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -11,7 +11,7 @@ class HomeController < ApplicationController
   private
 
   def asciicast
-    id = CFG['HOME_CAST_ID']
+    id = CFG.home_cast_id
 
     asciicast = if id
       asciicast_repository.find(id)
diff --git a/app/views/layouts/_ga.html.erb b/app/views/layouts/_ga.html.erb
index df83e7a..a0267ce 100644
--- a/app/views/layouts/_ga.html.erb
+++ b/app/views/layouts/_ga.html.erb
@@ -1,8 +1,8 @@
-<% if CFG['GOOGLE_ANALYTICS_ID'] %>
+<% if CFG.google_analytics_id %>
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= CFG['GOOGLE_ANALYTICS_ID'] %>']);
+  _gaq.push(['_setAccount', '<%= CFG.google_analytics_id %>']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/app/views/shared/_add_this.html.erb b/app/views/shared/_add_this.html.erb
index 7518ef6..fb1619b 100644
--- a/app/views/shared/_add_this.html.erb
+++ b/app/views/shared/_add_this.html.erb
@@ -6,5 +6,5 @@
 <a class="addthis_button_facebook"></a>
 <a class="addthis_button_compact"></a>
 </div>
-<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<%= CFG['ADD_THIS_PROFILE_ID'] %>"></script>
+<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=<%= CFG.add_this_profile_id %>"></script>
 <!-- AddThis Button END -->
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index fd7a00e..55ddf12 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,15 +1,13 @@
 CarrierWave.configure do |config|
-  if CFG['CARRIERWAVE_STORAGE'].to_s == 'fog'
+  if CFG.carrierwave_storage == 'fog'
     config.storage = :fog
 
     config.fog_credentials = {
       :provider              => 'AWS',
-      :aws_access_key_id     => CFG['AWS_ACCESS_KEY_ID'],
-      :aws_secret_access_key => CFG['AWS_SECRET_ACCESS_KEY'],
-      :region                => CFG['AWS_REGION']
+      :aws_access_key_id     => CFG.aws_access_key_id,
+      :aws_secret_access_key => CFG.aws_secret_access_key,
+      :region                => CFG.aws_region
     }
-    config.fog_directory = CFG['AWS_BUCKET']
-  else
-    config.storage = :file
+    config.fog_directory = CFG.aws_bucket
   end
 end
diff --git a/config/initializers/errbit.rb b/config/initializers/errbit.rb
index 868a889..a93513a 100644
--- a/config/initializers/errbit.rb
+++ b/config/initializers/errbit.rb
@@ -1,7 +1,7 @@
-if CFG['AIRBRAKE_API_KEY']
+if CFG.airbrake_api_key
   Airbrake.configure do |config|
-    config.api_key = CFG['AIRBRAKE_API_KEY']
-    config.host    = CFG['AIRBRAKE_HOST'] if CFG['AIRBRAKE_HOST']
+    config.api_key = CFG.airbrake_api_key
+    config.host    = CFG.airbrake_host if CFG.airbrake_host
     config.port    = 80
     config.secure  = config.port == 443
   end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 9ee760a..9bc0f89 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,6 +1,6 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :twitter, CFG['TWITTER_CONSUMER_KEY'], CFG['TWITTER_CONSUMER_SECRET'], :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
-  provider :github, CFG['GITHUB_CONSUMER_KEY'], CFG['GITHUB_CONSUMER_SECRET'], :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
+  provider :twitter, CFG.twitter_consumer_key, CFG.twitter_consumer_secret, :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
+  provider :github, CFG.github_consumer_key, CFG.github_consumer_secret, :client_options => { :ssl => { :ca_path => "/etc/ssl/certs" } }
   provider :browser_id
 end
 
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index ea383ee..f45254c 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Asciinema::Application.config.secret_key_base = CFG['SECRET_TOKEN']
+Asciinema::Application.config.secret_key_base = CFG.secret_token