From e0226b4cc063048e271255752c44c20f2305b81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Bucho=CC=88ster?= Date: Sat, 2 Jul 2011 16:49:00 +0200 Subject: [PATCH] minor style fixes, prepared environment variables for deploy on heroku --- Gemfile.lock | 2 +- app/views/users/_show.html.haml | 2 +- config/application.rb | 1 - config/initializers/app_config.rb | 5 ++++- config/initializers/devise.rb | 11 +++++------ config/initializers/lastfm.rb | 2 +- config/initializers/sass_config.rb | 2 +- config/initializers/secret_token.rb | 2 +- lib/last_fm/request.rb | 2 +- public/javascripts/config.js | 1 + public/javascripts/layout.js | 4 ++++ 11 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3904bce..c3645d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,7 +53,7 @@ GEM faraday (0.6.1) addressable (~> 2.2.4) multipart-post (~> 1.1.0) - rack (>= 1.1.0, < 2) + rack (< 2, >= 1.1.0) gem_plugin (0.2.3) haml (3.1.2) haml-rails (0.3.4) diff --git a/app/views/users/_show.html.haml b/app/views/users/_show.html.haml index be664c1..000ed27 100644 --- a/app/views/users/_show.html.haml +++ b/app/views/users/_show.html.haml @@ -10,7 +10,7 @@ %li="#{user.playlist.count} Playlists" .tabs.tabs_js.w02 %ul.nav - %li profile + %li favourite artists - if user == current_user %li settings .content diff --git a/config/application.rb b/config/application.rb index 54ebd04..1f9c228 100644 --- a/config/application.rb +++ b/config/application.rb @@ -5,7 +5,6 @@ Bundler.require(:default, Rails.env) if defined?(Bundler) module Nineminutes class Application < Rails::Application - config.autoload_paths += %W(#{config.root}/lib) # enable caching in development mode config.action_controller.perform_caching = true diff --git a/config/initializers/app_config.rb b/config/initializers/app_config.rb index c489a4c..c80eeb5 100644 --- a/config/initializers/app_config.rb +++ b/config/initializers/app_config.rb @@ -1 +1,4 @@ -APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml')))) \ No newline at end of file +APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml')))) +APP_CONFIG.each do |key, value| + ENV[key] = value +end \ No newline at end of file diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 7a9ebcd..0a5126f 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -184,14 +184,13 @@ Devise.setup do |config| # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' # Facebook-Setting for Heroku - # config.omniauth :facebook, 'APP_ID', 'APP_SECRET', - # {:scope => 'email, offline_access', :client_options => {:ssl => {:ca_file => '/usr/lib/ssl/certs/ca-certificates.crt'}}} - - if Rails.env =~ /development/ - config.omniauth :facebook, APP_CONFIG['facebook']['app_id'], APP_CONFIG['facebook']['secret'] + if Rails.env =~ /production/ + 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, 'APP_ID', 'APP_SECRET' + config.omniauth :facebook, ENV['facebook']['app_id'], ENV['facebook']['secret'] end + config.omniauth :open_id, OpenID::Store::Filesystem.new('/tmp') # config.omniauth :google_apps, OpenID::Store::Filesystem.new('/tmp'), :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id' # config.omniauth :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET' diff --git a/config/initializers/lastfm.rb b/config/initializers/lastfm.rb index 1601a07..77a5880 100644 --- a/config/initializers/lastfm.rb +++ b/config/initializers/lastfm.rb @@ -1,3 +1,3 @@ ActionDispatch::Callbacks.to_prepare do - LastFM::Request::api_key = APP_CONFIG['lastfm_api_key'] + LastFM::Request::api_key = ENV['lastfm_api_key'] end \ No newline at end of file diff --git a/config/initializers/sass_config.rb b/config/initializers/sass_config.rb index 2ae2d5f..cbbde7a 100644 --- a/config/initializers/sass_config.rb +++ b/config/initializers/sass_config.rb @@ -1,3 +1,3 @@ -output_style = RAILS_ENV == "production" ? :compressed : :nested +output_style = ::Rails.env == "production" ? :compressed : :nested Sass::Plugin.options[:style] = output_style \ No newline at end of file diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 472c797..28b7b6b 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 = APP_CONFIG['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 adaa05e..72f8730 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 => APP_CONFIG["request_timeout"], + request = Typhoeus::Request.new(base_uri, :params => request_params) # :timeout => ENV["request_timeout"], handle_response request, method, node, block puts "=> lastfm: '#{current_class_name}.#{method}' request is queued" if @@hydra.queue request diff --git a/public/javascripts/config.js b/public/javascripts/config.js index 2033e8b..dcb50f7 100644 --- a/public/javascripts/config.js +++ b/public/javascripts/config.js @@ -8,6 +8,7 @@ var charts_path = "/charts"; var search_path = "/search/"; var search_autocomplete_path = "/autocomplete/"; var user_path = "/users/"; +var profile_path = "/profile"; var register_path = "/register"; var login_path = "/login"; var logout_path = "/logout"; diff --git a/public/javascripts/layout.js b/public/javascripts/layout.js index 3065967..b3a6b71 100644 --- a/public/javascripts/layout.js +++ b/public/javascripts/layout.js @@ -134,6 +134,9 @@ function init_site(link){ set_active_navigation(charts_path); break; case user_path: + init_tabs(); + set_active_navigation(profile_path); + break; case register_path: init_tabs(); set_active_navigation(register_path); @@ -141,6 +144,7 @@ function init_site(link){ case login_path: init_tabs(); set_active_navigation(home_path); + break; } }