From 2f8e93637202e3eeba88a2e9f35f422ae9f19130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Bucho=CC=88ster?=
 <tbuchoester.mmt-b2009@fh-salzburg.ac.at>
Date: Thu, 7 Jul 2011 10:31:38 +0200
Subject: [PATCH] added redis settings to config, changed config keys to
 uppercase

---
 config/config.yml.template          | 4 +++-
 config/initializers/app_config.rb   | 4 ++--
 config/initializers/devise.rb       | 4 ++--
 config/initializers/lastfm.rb       | 2 +-
 config/initializers/redis.rb        | 7 ++++---
 config/initializers/secret_token.rb | 2 +-
 lib/last_fm/request.rb              | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config/config.yml.template b/config/config.yml.template
index 9395e75..2335351 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -3,4 +3,6 @@ lastfm_api_key: ""
 facebook:
   app_id: ""
   secret: ""
-request_timeout: ""
\ No newline at end of file
+redis:
+  development: ""
+  production: ""
\ No newline at end of file
diff --git a/config/initializers/app_config.rb b/config/initializers/app_config.rb
index 24207cc..a9716b6 100644
--- a/config/initializers/app_config.rb
+++ b/config/initializers/app_config.rb
@@ -3,10 +3,10 @@ if Rails.env !=~ /production/
   APP_CONFIG.each do |key, value|
     if value.is_a?(Hash)
       value.each do |k,v|
-        ENV["#{key}_#{k}"] = v
+        ENV["#{key}_#{k}".upcase] = v
       end
     else
-      ENV[key] = value
+      ENV[(key.upcase)] = value
     end
   end
 end
\ No newline at end of file
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 8ec438c..3e088f0 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -185,10 +185,10 @@ Devise.setup do |config|
   
   # Facebook-Setting for Heroku
   if Rails.env =~ /production/
-    config.omniauth :facebook, ENV['facebook_app_id'], ENV['facebook_secret']
+    config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_SECRET']
       {:scope => 'email, offline_access', :client_options => {:ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'}}}
   else
-    config.omniauth :facebook, ENV['facebook_app_id'], ENV['facebook_secret']
+    config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_SECRET']
   end
   
   config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp')
diff --git a/config/initializers/lastfm.rb b/config/initializers/lastfm.rb
index 77a5880..eaee98b 100644
--- a/config/initializers/lastfm.rb
+++ b/config/initializers/lastfm.rb
@@ -1,3 +1,3 @@
 ActionDispatch::Callbacks.to_prepare do
-  LastFM::Request::api_key = ENV['lastfm_api_key']
+  LastFM::Request::api_key = ENV['LASTFM_API_KEY']
 end
\ No newline at end of file
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index 75c6c6c..b7a0a4e 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -1,8 +1,9 @@
-$redis = Redis.new(:host => 'localhost', :port => 6379)
+uri = Rails.env ==~ /production/ ? URI.parse(ENV['REDIS_PRODUCTION']) : URI.parse(ENV['REDIS_DEVELOPMENT'])
+$redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
 
 begin
   $redis.ping
-  puts "=> Established connection to redis server"
+  puts "=> Established connection to redis server on '#{uri.host}' (port #{uri.port})!"
 rescue
-  puts "=> CAUTION: cound not establish connection to redis server! Check settings in initializer!"
+  puts "=> CAUTION: cound not establish connection to redis server on '#{uri.host}' (port #{uri.port})! Check settings in initializer!"
 end
\ No newline at end of file
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 28b7b6b..a1f7be5 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Nineminutes::Application.config.secret_token = ENV['secret_token']
+Nineminutes::Application.config.secret_token = ENV['SECRET_TOKEN']
diff --git a/lib/last_fm/request.rb b/lib/last_fm/request.rb
index 72f8730..724cdaf 100644
--- a/lib/last_fm/request.rb
+++ b/lib/last_fm/request.rb
@@ -67,7 +67,7 @@ module LastFM
     private
 
     def self.create_and_queue_request method, node, block, request_params
-      request = Typhoeus::Request.new(base_uri, :params => request_params) # :timeout => ENV["request_timeout"],
+      request = Typhoeus::Request.new(base_uri, :params => request_params)
       handle_response request, method, node, block
 
       puts "=> lastfm: '#{current_class_name}.#{method}' request is queued" if @@hydra.queue request