Merge Justin

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index dcc9fad3b4ee5a7d2a514c3533ba74394ad85b31..77d020c81efd5ccc126a529c6855f5161d05468b 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,17 +5,20 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '1.1.6'
+RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION

 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|

-  # Settings in config/environments/* take precedence those specified here
+  # Settings in config/environments/* take precedence over those specified here

   
   # Skip frameworks you're not going to use (only works if using vendor/rails)
   # config.frameworks -= [ :action_web_service, :action_mailer ]
 
   
   # Skip frameworks you're not going to use (only works if using vendor/rails)
   # config.frameworks -= [ :action_web_service, :action_mailer ]
 

+  # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
+  # config.plugins = %W( exception_notification ssl_requirement )
+

   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 


@@ -50,20 +53,38 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

-MAIL_CONFIG = { :from => 'VotingBooth <info@votingbooth.mako.cc>'} 
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register "application/x-mobile", :mobile

 
 # Include your application configuration below
 
 # Include your application configuration below

+
+MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
+

 require 'uniq_token'
 require 'randarray'
 require 'rubyvote'
 require 'uniq_token'
 require 'randarray'
 require 'rubyvote'

-
-module LoginEngine
-  config :salt, "voothingboat"
-  config :email_from, MAIL_CONFIG[:from]
+require 'gruff'
+
+class String
+  # alternate capitalization method that does not lowercase the rest of
+  # the string -- which is almost never what I want
+  def capitalize
+    if self.length <= 1
+      self.upcase
+    else
+      self.split(//)[0].upcase + self.split(//)[1..-1].join("")
+    end
+  end
+
+  # capitalize each word in a string unless it is specialcased word
+  def titlecase
+    words = %w{a the in to for an}
+    self.split.collect {|s| words.include?(s) ? s : s.capitalize }.join(" ")
+  end

 end
 
 end
 

-Engines.start :login
-

 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"

+