From 3e8b948f3c67adae2b1b09b5c3c4f2a6fb0b9dc6 Mon Sep 17 00:00:00 2001
From: Richard Huang <flyerhzm@gmail.com>
Date: Sat, 24 Mar 2012 22:44:44 +0800
Subject: [PATCH] update rails to 3.2.2

---
 Gemfile      |   2 +-
 Gemfile.lock | 124 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/Gemfile b/Gemfile
index ff5ed2d9..419ffd6d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rails'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 88952b7e..819494c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,78 +7,83 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.11)
-      actionpack (= 3.0.11)
-      mail (~> 2.2.19)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      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.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-import (0.2.5)
-      activerecord (~> 3.0.0)
-    activeresource (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-    activesupport (3.0.11)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-import (0.2.9)
+      activerecord (~> 3.0)
+      activerecord (~> 3.0)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     ffi (1.0.11)
     guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.6.0)
       guard (>= 0.10.0)
-    i18n (0.5.0)
-    json (1.6.3)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.6.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
+    multi_json (1.1.0)
     mysql (2.8.1)
     perftools.rb (2.0.0)
     polyglot (0.3.3)
-    rack (1.2.4)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.11)
-      actionmailer (= 3.0.11)
-      actionpack (= 3.0.11)
-      activerecord (= 3.0.11)
-      activeresource (= 3.0.11)
-      activesupport (= 3.0.11)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.0.11)
-    railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -88,12 +93,17 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    sqlite3-ruby (1.3.2)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     uniform_notifier (1.0.1)
 
 PLATFORMS
@@ -108,4 +118,4 @@ DEPENDENCIES
   perftools.rb
   rails
   rspec
-  sqlite3-ruby
+  sqlite3