Upgrade to rails 4.0.0

1 files changed, 123 insertions, 132 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 7069c68..d085560 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,163 +1,157 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     ansi (1.4.3)
-    arel (3.0.2)
-    builder (3.0.0)
-    capistrano (2.9.0)
+    arel (4.0.0)
+    atomic (1.1.14)
+    builder (3.1.4)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    ci_reporter (1.6.5)
+    ci_reporter (1.9.0)
       builder (>= 2.1.2)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.3.3)
-    daemons (1.1.4)
-    diff-lcs (1.1.3)
+    daemons (1.1.9)
+    diff-lcs (1.2.4)
+    domain_name (0.5.13)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    eventmachine (0.12.10)
-    execjs (1.2.4)
-      multi_json (~> 1.0)
-    fastercsv (1.5.4)
-    hashie (1.2.0)
-    highline (1.6.2)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.4)
-    json (1.5.3)
-    kramdown (0.13.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (>= 1.16)
-      treetop (>= 1.4.8)
-    mechanize (2.0.1)
+    eventmachine (1.0.3)
+    fastercsv (1.5.5)
+    hashie (2.0.5)
+    highline (1.6.19)
+    hike (1.2.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.6.5)
+    json (1.8.0)
+    kramdown (1.2.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mechanize (2.7.2)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0.0)
+      mime-types (~> 1.17, >= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 1.8)
+      net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
-      webrobots (~> 0.0, >= 0.0.9)
-    mime-types (1.19)
-    minitest (3.3.0)
-    minitest-reporters (0.10.1)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    mime-types (1.25)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    minitest-reporters (0.14.23)
       ansi
       builder
-      minitest (>= 2.12, < 4.0)
+      minitest (>= 2.12, < 5.0)
       powerbar
-    multi_json (1.3.6)
-    mysql2 (0.3.11)
-    net-http-digest_auth (1.1.1)
-    net-http-persistent (1.9)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    nokogiri (1.5.0)
+    multi_json (1.8.0)
+    mysql2 (0.3.13)
+    net-http-digest_auth (1.4)
+    net-http-persistent (2.9)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    ntlm-http (0.1.1)
     polyglot (0.3.3)
-    powerbar (1.0.8)
+    powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
-    prototype-rails (3.1.0)
-      rails (~> 3.1)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    prototype-rails (3.2.0)
+      railties (>= 3.2.0.beta, < 5.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.12)
-      json (~> 1.4)
-    riddle (1.4.0)
-    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)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    riddle (1.5.8)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     runspell (0.0.1)
-    sass (3.2.1)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sprockets (2.1.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.10.0)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     text-format (1.0.0)
-    thin (1.2.11)
+    thin (1.6.0)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.5.0)
     thinking-sphinx (2.0.7)
       activerecord (>= 3.0.3)
       riddle (>= 1.3.3)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uglifier (1.0.1)
-      execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    webrobots (0.0.12)
-      nokogiri (>= 1.4.4)
+    tzinfo (0.3.37)
+    unf (0.1.2)
+      unf_ext
+    unf_ext (0.0.6)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby
@@ -165,7 +159,6 @@ PLATFORMS
 DEPENDENCIES
   capistrano
   ci_reporter
-  coffee-rails (~> 3.2.0)
   diff-lcs
   fastercsv
   json
@@ -175,12 +168,10 @@ DEPENDENCIES
   mysql2 (> 0.3.10)
   nokogiri
   prototype-rails
-  rails (= 3.2.8)
-  rcov
+  rails (= 4.0.0)
   rspec
   runspell
-  sass-rails (~> 3.2.0)
+  simplecov
   text-format
   thin
   thinking-sphinx (= 2.0.7)
-  uglifier