Added the Gruff library to the lib/ directory of the the rails folder, and the

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index ba927343d1dc89aca7a36e7ee2b63e0eaadb4623..49b0c48a0334cacd9e1f4c35038b7cbb176f3606 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,8 +63,11 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
+require 'gruff-0.2.8/lib/gruff'
+require 'sparklines'
+
 require 'rubyvote'
-require 'gruff'
+ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
 
 class String
   # alternate capitalization method that does not lowercase the rest of
@@ -84,6 +87,10 @@ class String
   end
 end
 
+#Change the session store key, so that it will not conflict with other webapps
+ActionController::Base.session_options[:session_key] = 'selectricity_session_id'
+CGI::Session.expire_after 1.year
+
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"