Merge branch 'master' into 57-fix-html-escaping

Conflicts:
	spec/views/events/map.html.haml_spec.rb

.rvmrc

@@ -1 +1 @@
-rvm use ree@quorum2
+rvm use 1.9.2@quorum2

Gemfile

@@ -43,9 +43,10 @@ group :development do
 end
 
 group :test, :development do
-  gem 'ruby-debug'
+  gem 'ruby-debug19'
   gem 'autotest-rails', :require => false
   gem 'rspec-rails', '~> 2.6.1', :require => false
+  gem 'test-unit', '1.2.3', :require => false # amazingly, RSpec needs this
   gem 'cucumber-rails', :require => false
   gem 'pickle'
   gem 'database_cleaner'

Gemfile.lock

@@ -30,6 +30,7 @@ GEM
       activemodel (= 3.0.10)
       activesupport (= 3.0.10)
     activesupport (3.0.10)
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     authlogic (3.0.3)
       activerecord (>= 3.0.7)
@@ -81,12 +82,14 @@ GEM
       json (>= 1.4.6)
     haml (3.0.25)
     highline (1.6.2)
+    hoe (2.12.3)
+      rake (~> 0.8)
     i18n (0.5.0)
     json (1.5.4)
     json_pure (1.5.4)
       spruz (~> 0.2.8)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -129,7 +132,6 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rdiscount (1.6.8)
     rdoc (3.9.4)
     rspec (2.6.0)
@@ -145,11 +147,16 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
     sass (3.1.7)
     selenium-webdriver (2.5.0)
@@ -159,6 +166,8 @@ GEM
       rubyzip
     spruz (0.2.13)
     term-ansicolor (1.0.6)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
@@ -188,5 +197,6 @@ DEPENDENCIES
   rails (= 3.0.10)
   rdiscount
   rspec-rails (~> 2.6.1)
-  ruby-debug
+  ruby-debug19
   sass
+  test-unit (= 1.2.3)

app/controllers/admin_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AdminController < ApplicationController
   before_filter :check_admin
   layout 'standard'

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Filters added to this controller apply to all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 class ApplicationController < ActionController::Base

app/controllers/calendars_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CalendarsController < ApplicationController
   @nonadmin ||= [:new, :create]
   before_filter :check_admin, :except => @nonadmin

app/controllers/events_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # This is the controller for #Event instances. It supports the following make_resourceful[http://mr.hamptoncatlin.com] actions: :index, :create, :new, :edit, :update, :show.
 class EventsController < ApplicationController
   layout "standard", :except => [:export, :feed] # no layout needed on export, since it generates an iCal file

app/controllers/permissions_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class PermissionsController < ApplicationController
   @@nonadmin = :index, :subscribe, :destroy
   before_filter :check_admin, :except => @@nonadmin

app/controllers/user_sessions_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # This controller handles the login/logout function of the site.  
 class UserSessionsController < ApplicationController
   layout 'unauthenticated'

app/controllers/users_controller.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class UsersController < ApplicationController
   layout :get_layout
   before_filter :require_user, :only => [:edit, :regenerate_key]

app/helpers/admin_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module AdminHelper
 end

app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module ApplicationHelper
 end

app/helpers/calendars_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module CalendarsHelper
 end

app/helpers/events_helper.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module EventsHelper 
   # Returns #User's commitment status for #Event as a symbol -- :yes, :no, :or maybe.
   def attendance_status(event, user)

app/helpers/permissions_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module PermissionsHelper
 end

app/helpers/sessions_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module SessionsHelper
 end

app/helpers/users_helper.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 module UsersHelper
 end

app/models/calendar.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class Calendar < ActiveRecord::Base
   has_many :events
   has_many :permissions

app/models/commitment.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class Commitment < ActiveRecord::Base
   belongs_to :event
   belongs_to :user

app/models/event.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'geocoding_utilities'
 
 class Event < ActiveRecord::Base

app/models/permission.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class Permission < ActiveRecord::Base
   belongs_to :user
   belongs_to :calendar

app/models/role.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class Role < ActiveRecord::Base
   has_many :users
   validates_presence_of :name

app/models/search.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Module to extend #Hash objects used as search parameters.
 # Deals with #Date construction and #ActiveRecord-style hash-value accessors.
 

app/models/user.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'digest/sha1'
 require 'geocoding_utilities'
 

app/models/user_mailer.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class UserMailer < ActionMailer::Base
   # Sends an e-mail message to the #User with the supplied password.
   def reset(user)

app/models/user_session.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 class UserSession < Authlogic::Session::Base
 end

config/application.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'

config/boot.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.

config/deploy-orig.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'bundler/capistrano'
 
 set :application, "quorum2"

config/environment.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 

config/environments/cucumber.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 Quorum2::Application.configure do
   config.cache_classes = true # This must be true for Cucumber to operate correctly!
 

config/environments/development.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 Quorum2::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/environments/production.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 Quorum2::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/environments/test.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 Quorum2::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/initializers/app_globals.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Application globals go here.
 #require 'gettext/rails'
 require 'yaml'

config/initializers/fast_gettext.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'gettext_i18n_rails/string_interpolate_fix' # TODO: Do we actually need this?
 
 FastGettext.add_text_domain 'app', :path => File.join(Rails.root, 'locale'), :type => :po

config/initializers/haml.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 Haml::Template.options[:format] = :xhtml
 # We're still using HTML 5 for all actual HTML content, but since we need to generate XML as well, this is the easiest way.

config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

config/initializers/mail_setup.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # TODO: Consider using sendmail instead.
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false

config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

config/preinitializer.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # This is for Bundler.
 # TODO: Remove when we upgrade to Rails 3!
 

config/routes.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 Quorum2::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.

db/migrate/001_create_events.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateEvents < ActiveRecord::Migration
   def self.up
     create_table :events do |t|

db/migrate/002_remove_country_id_from_events.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class RemoveCountryIdFromEvents < ActiveRecord::Migration
   def self.up
     remove_column :events, :country_id

db/migrate/003_create_attendance_schema.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateAttendanceSchema < ActiveRecord::Migration
   def self.up
     create_table :events_users do |t|

db/migrate/004_create_states_and_countries.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateStatesAndCountries < ActiveRecord::Migration
   def self.up
     create_table :states do |t|

db/migrate/005_create_users.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table :users do |t|

db/migrate/006_rename_attendance_table.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class RenameAttendanceTable < ActiveRecord::Migration
   def self.up
     rename_table(:events_users, :commitments)

db/migrate/007_add_created_by_id_to_events.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AddCreatedByIdToEvents < ActiveRecord::Migration
   def self.up
     add_column :events, :created_by_id, :integer

db/migrate/008_add_deleted_to_events.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AddDeletedToEvents < ActiveRecord::Migration
   def self.up
     add_column :events, :deleted, :boolean

db/migrate/009_create_roles.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateRoles < ActiveRecord::Migration
   def self.up
     create_table :roles do |t|

db/migrate/010_add_show_contact_to_users.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AddShowContactToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :show_contact, :boolean, :default => true

db/migrate/011_add_description_to_events.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AddDescriptionToEvents < ActiveRecord::Migration
   def self.up
     add_column :events, :description, :text

db/migrate/012_add_feed_key_to_users.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class AddFeedKeyToUsers < ActiveRecord::Migration
   def self.up
     # This is a unique key for each user's RSS feeds

db/migrate/013_create_calendars.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 class CreateCalendars < ActiveRecord::Migration
   def self.up
     create_table :calendars do |t|