From 8ab34354d238572fe524fc19b3b2681671a2c2eb Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 22 May 2011 03:42:21 -0700
Subject: [PATCH] Update rails dependency to 3.1.0.rc1

---
 .gitignore                             |  2 +-
 Gemfile                                |  2 +-
 Gemfile.lock                           | 60 +++++++++++++-------------
 config/initializers/wrap_parameters.rb |  2 +-
 test/performance/browsing_test.rb      |  5 ++-
 test/unit/.gitkeep                     |  0
 6 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 test/unit/.gitkeep

diff --git a/.gitignore b/.gitignore
index 0c194ae..e3f7259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 ._*
 .bundle
 .config
-.rvmrc
+.sass-cache/
 .yardoc
 Icon?
 InstalledFiles
diff --git a/Gemfile b/Gemfile
index e9132d1..5318022 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0.beta1'
+gem 'rails', '3.1.0.rc1'
 gem 'devise'
 gem 'geokit'
 gem 'haml'
diff --git a/Gemfile.lock b/Gemfile.lock
index a4d29f8..cd748a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,35 +2,35 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    actionmailer (3.1.0.beta1)
-      actionpack (= 3.1.0.beta1)
+    actionmailer (3.1.0.rc1)
+      actionpack (= 3.1.0.rc1)
       mail (~> 2.3.0)
-    actionpack (3.1.0.beta1)
-      activemodel (= 3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
+    actionpack (3.1.0.rc1)
+      activemodel (= 3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0beta1)
-      rack (~> 1.3.0.beta)
+      rack (~> 1.3.0.beta2)
       rack-cache (~> 1.0.1)
-      rack-mount (~> 0.7.2)
+      rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.2)
+      sprockets (~> 2.0.0.beta.5)
       tzinfo (~> 0.3.27)
-    activemodel (3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
+    activemodel (3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6.0beta1)
-    activerecord (3.1.0.beta1)
-      activemodel (= 3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
-      arel (~> 2.1.0)
+    activerecord (3.1.0.rc1)
+      activemodel (= 3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
+      arel (~> 2.1.1)
       tzinfo (~> 0.3.27)
-    activeresource (3.1.0.beta1)
-      activemodel (= 3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
-    activesupport (3.1.0.beta1)
+    activeresource (3.1.0.rc1)
+      activemodel (= 3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
+    activesupport (3.1.0.rc1)
       multi_json (~> 1.0)
     addressable (2.2.6)
     ansi (1.2.5)
@@ -63,23 +63,23 @@ GEM
     rack (1.3.0.beta2)
     rack-cache (1.0.2)
       rack (>= 0.4)
-    rack-mount (0.7.4)
+    rack-mount (0.8.1)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.1.0.beta1)
-      actionmailer (= 3.1.0.beta1)
-      actionpack (= 3.1.0.beta1)
-      activerecord (= 3.1.0.beta1)
-      activeresource (= 3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
+    rails (3.1.0.rc1)
+      actionmailer (= 3.1.0.rc1)
+      actionpack (= 3.1.0.rc1)
+      activerecord (= 3.1.0.rc1)
+      activeresource (= 3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
       bundler (~> 1.0)
-      railties (= 3.1.0.beta1)
-    railties (3.1.0.beta1)
-      actionpack (= 3.1.0.beta1)
-      activesupport (= 3.1.0.beta1)
+      railties (= 3.1.0.rc1)
+    railties (3.1.0.rc1)
+      actionpack (= 3.1.0.rc1)
+      activesupport (= 3.1.0.rc1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       thor (~> 0.14.6)
@@ -119,7 +119,7 @@ DEPENDENCIES
   haml
   jruby-openssl (~> 0.7)
   pg
-  rails (= 3.1.0.beta1)
+  rails (= 3.1.0.rc1)
   sass
   simplecov
   sqlite3
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 60137ed..1658ef7 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -3,7 +3,7 @@
 # This file contains the settings for ActionController::ParametersWrapper
 # which will be enabled by default in the upcoming version of Ruby on Rails.
 
-# Enable parameter wrapping for JSON. You can disable this by set :format to empty array.
+# Enable parameter wrapping for JSON. You can disable this by setting :format to empty array.
 ActionController::Base.wrap_parameters :format => [:json]
 
 # Disable root element in JSON by default.
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 867fc8c..5d1be04 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -1,8 +1,11 @@
 require 'test_helper'
 require 'rails/performance_test_help'
 
-# Profiling results for each test method are written to tmp/performance.
 class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+  
   def test_homepage
     get '/'
   end
diff --git a/test/unit/.gitkeep b/test/unit/.gitkeep
new file mode 100644
index 0000000..e69de29