Merge branch 'master' into deploy

.autotest

@@ -1,5 +1,9 @@
+require 'autotest/bundler'
+
 Autotest.add_hook :initialize do |at|
   at.add_exception '.git'
   at.add_exception 'spec-results/index.html'
   at.add_exception 'features_report.html'
+  at.add_exception /capybara-\d+\.html$/
+  at.add_exception /rerun\.txt$/
 end

.gitignore

@@ -1,11 +1,12 @@
 coverage
-.bundle/*
-log/*
-tmp/*
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
 doc
 spec-results
 features_report.html
 config/config.yml
 config/deploy.rb
 config/database.yml
-*~
+*~

.rspec

@@ -0,0 +1,6 @@
+--colour
+--format
+progress
+--format
+html --out spec-results/index.html
+--debugger

.rvmrc

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

CHANGELOG.md

@@ -0,0 +1,13 @@
+# Quorum changelog
+
+This is a log of changes in [Quorum](http://quorum2.sourceforge.net) since version 0.3.0, released on 9 September 2011.
+
+Unless otherwise indicated, all changes are by [Marnen Laibow-Koser](http://www.marnen.org). Other contributors to this document should try to maintain the existing format and identify their changes. Numbers in [square brackets] refer to issues in the [tracker](http://marnen.lighthouseapp.com/projects/20949-quorum).
+
+Quorum is distributed under the [BSD 3-Clause License](http://www.opensource.org/licenses/BSD-3-Clause). Share and enjoy!
+
+## v0.3.0, 9 September 2011
+
+* First release under the new numbering format: v0.3.0 (new) = beta3.0.0 (old)
+* Upgrade to Rails 3.0
+* DO NOT USE! Although tests are passing, the application has serious cosmetic bugs involving Rails 3's autoescaping of HTML. I'll fix these bugs and release a new version.

Gemfile

@@ -1,30 +1,59 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 2.3.5'
+gem 'rails', '3.0.10'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
+# gem 'ruby-debug'
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
 gem 'haml'
 gem 'sass'
-gem 'postgres'
-gem 'fast_gettext'
+gem 'pg'
+gem 'gettext_i18n_rails'
 gem 'prawn'
 gem 'GeoRuby'
-gem 'rdiscount', '>= 1.2.11'
-gem 'authlogic', '>= 2.1.2'
+gem 'rdiscount'
+gem 'authlogic', '~> 3.0.3'
+gem 'dynamic_form'
+gem 'exception_notification'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+# group :development, :test do
+#   gem 'webrat'
+# end
 
 group :development do
+  gem 'capistrano'
   gem 'gettext', '>= 1.9.3', :require => false
-  gem 'capistrano', :require => false
 end
 
 group :test, :development do
-  gem 'ruby-debug'
-end
-
-group :test do
-  gem 'autotest', :require => false
+  gem 'ruby-debug19'
   gem 'autotest-rails', :require => false
-  gem 'rspec-rails', :require => false
-  gem "cucumber", "~> 0.3.101", :require => false
-  gem 'webrat', '>= 0.4.3', :require => false
-  gem 'machinist', '>= 1.0.3'
+  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 'launchy'
+  gem 'pickle'
+  gem 'database_cleaner'
+  gem 'factory_girl_rails'
   gem 'ffaker'
 end
+

Gemfile.lock

@@ -3,45 +3,105 @@ GEM
   specs:
     GeoRuby (1.3.3)
     ZenTest (4.6.2)
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
-      rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    authlogic (2.1.2)
-      activesupport
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
+    abstract (1.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    addressable (2.2.6)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.10)
+    authlogic (3.0.3)
+      activerecord (>= 3.0.7)
+      activerecord (>= 3.0.7)
     autotest-rails (4.1.0)
       ZenTest
-    builder (3.0.0)
+    builder (2.1.2)
     capistrano (2.8.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
+    capybara (1.0.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
     columnize (0.3.4)
-    cucumber (0.3.104)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      polyglot (>= 0.2.9)
-      term-ansicolor (>= 1.0.3)
-      treetop (>= 1.4.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (1.0.2)
+      capybara (>= 1.0.0)
+      cucumber (~> 1.0.0)
+      nokogiri (>= 1.4.6)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.3)
-    fast_gettext (0.4.17)
+    dynamic_form (1.1.4)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    exception_notification (2.5.2)
+      actionmailer (>= 3.0.4)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
+      railties (>= 3.0.0)
+    fast_gettext (0.5.13)
     ffaker (1.8.1)
+    ffi (1.0.9)
     gettext (2.0.0)
+    gettext_i18n_rails (0.2.20)
+      fast_gettext
+    gherkin (2.4.16)
+      json (>= 1.4.6)
     haml (3.0.25)
     highline (1.6.2)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    machinist (1.0.6)
+    hoe (2.12.3)
+      rake (~> 0.8)
+    i18n (0.5.0)
+    json (1.5.4)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -50,63 +110,102 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.0)
+    pg (0.11.0)
+    pickle (0.4.8)
+      cucumber (>= 0.8)
+      rake
     polyglot (0.3.2)
-    postgres (0.7.9.2008.01.28)
     prawn (0.4.0)
       prawn-layout
     prawn-layout (0.1.0)
-    rack (1.1.0)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rbx-require-relative (0.0.5)
-    rdiscount (1.3.1)
-    rspec (1.3.2)
-    rspec-rails (1.3.4)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-      rspec (~> 1.3.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    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)
+      childprocess (>= 0.2.1)
+      ffi (>= 1.0.7)
+      json_pure
+      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
       polyglot (>= 0.3.1)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   GeoRuby
-  authlogic (>= 2.1.2)
-  autotest
+  authlogic (~> 3.0.3)
   autotest-rails
   capistrano
-  cucumber (~> 0.3.101)
-  fast_gettext
+  cucumber-rails
+  database_cleaner
+  dynamic_form
+  exception_notification
+  factory_girl_rails
   ffaker
   gettext (>= 1.9.3)
+  gettext_i18n_rails
   haml
-  machinist (>= 1.0.3)
-  postgres
+  launchy
+  pg
+  pickle
   prawn
-  rails (~> 2.3.5)
-  rdiscount (>= 1.2.11)
-  rspec-rails
-  ruby-debug
+  rails (= 3.0.10)
+  rdiscount
+  rspec-rails (~> 2.6.1)
+  ruby-debug19
   sass
-  webrat (>= 0.4.3)
+  test-unit (= 1.2.3)