config/environment.rb config/site.yml.tmpl @@ -2,8 +2,8 @@ .dotest /.emacs-project config/database.yml +config/site.yml config/deploy.rb -config/environment.rb db/*.sqlite3 db/data.yml db/schema.rb .gitignore @@ -20,7 +20,7 @@ class CannotAccessContext < RuntimeError; end class ApplicationController < ActionController::Base - protect_from_forgery :secret => SALT + protect_from_forgery :secret => SITE_CONFIG['salt'] helper :application include LoginSystem app/controllers/application.rb @@ -138,7 +138,7 @@ class ContextsController < ApplicationController @active_contexts = @contexts.active @hidden_contexts = @contexts.hidden @down_count = @active_contexts.size + @hidden_contexts.size - cookies[:mobile_url]= {:value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= {:value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} render :action => 'index_mobile' end end @@ -148,7 +148,7 @@ class ContextsController < ApplicationController @page_title = "TRACKS::List actions in "+@context.name @not_done = @not_done_todos.select {|t| t.context_id == @context.id } @down_count = @not_done.size - cookies[:mobile_url]= {:value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= {:value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} @mobile_from_context = @context.id render :action => 'mobile_show_context' end app/controllers/contexts_controller.rb @@ -21,10 +21,10 @@ class LoginController < ApplicationController session['noexpiry'] = params['user_noexpiry'] msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." notify :notice, "Login successful: session #{msg}" - cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => TRACKS_COOKIES_SECURE } + cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } unless should_expire_sessions? @user.remember_me - cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => TRACKS_COOKIES_SECURE } + cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } end redirect_back_or_home return @@ -100,10 +100,10 @@ class LoginController < ApplicationController session['user_id'] = @user.id msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." notify :notice, "Login successful: session #{msg}" - cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => TRACKS_COOKIES_SECURE } + cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] } unless should_expire_sessions? @user.remember_me - cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => TRACKS_COOKIES_SECURE } + cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } end redirect_back_or_home else app/controllers/login_controller.rb @@ -218,7 +218,7 @@ class ProjectsController < ApplicationController @hidden_projects = @projects.hidden @completed_projects = @projects.completed @down_count = @active_projects.size + @hidden_projects.size + @completed_projects.size - cookies[:mobile_url]= {:value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= {:value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} render :action => 'index_mobile' end end @@ -231,7 +231,7 @@ class ProjectsController < ApplicationController @project_default_context = "The default context for this project is "+ @project.default_context.name end - cookies[:mobile_url]= {:value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= {:value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} @mobile_from_project = @project.id render :action => 'project_mobile' end app/controllers/projects_controller.rb @@ -269,7 +269,7 @@ class TodosController < ApplicationController format.m do if @saved if cookies[:mobile_url] - cookies[:mobile_url] = {:value => nil, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']} redirect_to cookies[:mobile_url] else redirect_to formatted_todos_path(:m) @@ -422,7 +422,7 @@ class TodosController < ApplicationController @default_project_context_name_map = build_default_project_context_name_map(@projects).to_json } format.m { - cookies[:mobile_url]= {:value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= {:value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} render :action => "mobile_tag" } end @@ -720,7 +720,7 @@ class TodosController < ApplicationController lambda do @page_title = "All actions" @home = true - cookies[:mobile_url]= { :value => request.request_uri, :secure => TRACKS_COOKIES_SECURE} + cookies[:mobile_url]= { :value => request.request_uri, :secure => SITE_CONFIG['secure_cookies']} determine_down_count render :action => 'index' app/controllers/todos_controller.rb @@ -38,7 +38,7 @@ end # config.transactional_fixtures = true # config.instantiated_fixtures = false # config.pre_loaded_fixtures = false -SALT = "change-me" unless defined?( SALT ).nil? +SITE_CONFIG['salt'] ||= 'change-me' config.time_zone = 'UTC' config/environments/test.rb @@ -48,7 +48,7 @@ module LoginSystem session['user_id'] = user.id set_current_user(user) current_user.remember_me - cookies[:auth_token] = { :value => current_user.remember_token , :expires => current_user.remember_token_expires_at, :secure => TRACKS_COOKIES_SECURE } + cookies[:auth_token] = { :value => current_user.remember_token , :expires => current_user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] } flash[:notice] = "Logged in successfully. Welcome back!" end end lib/login_system.rb @@ -1,20 +1,15 @@ module Tracks - class Config - def self.salt - SALT + SITE_CONFIG['salt'] end def self.auth_schemes - AUTHENTICATION_SCHEMES + SITE_CONFIG['authentication_schemes'] || [] end def self.openid_enabled? auth_schemes.include?('open_id') end - - end - end \ No newline at end of file lib/tracks/config.rb config/environment.rb.tmpl 00e1d2994bcfb6f15ccb74b448d4d2be1266015d Eric Allen ericpallen@gmail.com http://github.com/bsag/tracks/commit/2ee84b8162694f587d578d485f1bd2696729de2a 2ee84b8162694f587d578d485f1bd2696729de2a 2009-02-01T11:47:05-08:00 2009-01-23T10:13:28-08:00 Move site-specific configuration out of environment.rb into a YAML file. This allows us to ship environment.rb with Tracks. Fixes #813. 56865c10cf5ff6fa7816b662cfa492644c402cf5 Eric Allen ericpallen@gmail.com