Start Rails 3.2 upgrade

ayamomiji · Jan 20, 2012 · 03779e1 · 03779e1
1 parent ed9ab61
commit 03779e1
Show file tree

Hide file tree

Showing 35 changed files with 308 additions and 217 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,17 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '3.0.4'
+gem 'rails', '3.2.0.rc2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+end
+
 platforms :ruby do
   gem 'sqlite3-ruby', :require => 'sqlite3'
 end
@@ -25,14 +32,14 @@ end
 # gem 'ruby-debug'
 
 # Bundle the extra gems:
-gem 'RedCloth', '~> 4.2.7', :require => 'redcloth'
+gem 'RedCloth', '~> 4.2.9', :require => 'redcloth'
 gem 'ruby-openid', :require => 'openid'
 gem 'rack-openid', :require => 'rack/openid'
 gem 'aaronh-chronic', :require => 'chronic' # Fixes for 1.9.2
 gem 'coderay'
 gem 'lesstile'
 gem 'formtastic'
-gem 'will_paginate', '= 3.0.pre2'
+gem 'will_paginate', '~> 3.0.2'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,155 +1,205 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.8)
+    RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     aaronh-chronic (0.3.9)
-    abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.2.0)
-    activerecord-jdbcsqlite3-adapter (1.2.0)
-      activerecord-jdbc-adapter (~> 1.2.0)
+    actionmailer (3.2.0.rc2)
+      actionpack (= 3.2.0.rc2)
+      mail (~> 2.3.0)
+    actionpack (3.2.0.rc2)
+      activemodel (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.0.rc1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      builder (~> 3.0.0)
+    activerecord (3.2.0.rc2)
+      activemodel (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      arel (~> 3.0.0.rc1)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.1)
+      activerecord-jdbc-adapter (~> 1.2.1)
       jdbc-sqlite3 (~> 3.7.2)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activeresource (3.2.0.rc2)
+      activemodel (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+    activesupport (3.2.0.rc2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.0)
     bouncy-castle-java (1.5.0146.1)
-    builder (2.1.2)
-    coderay (0.9.7)
-    cucumber (0.10.0)
+    builder (3.0.0)
+    capybara (1.1.2)
+      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.3.0)
+      ffi (~> 1.0.6)
+    coderay (1.0.5)
+    coffee-rails (3.2.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0.beta)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (1.3.3)
-    formtastic (1.2.3)
-      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.7)
-      i18n (~> 0.4)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
-    gherkin (2.3.3-java)
-      json (~> 1.4.6)
-    i18n (0.5.0)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.7.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.2.1)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.3)
+      nokogiri (>= 1.5.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
+    factory_girl (2.4.2)
+      activesupport
+    ffi (1.0.11)
+    ffi (1.0.11-java)
+    formtastic (2.0.2)
+      rails (~> 3.0)
+    gherkin (2.7.3)
+      json (>= 1.4.6)
+    gherkin (2.7.3-java)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.0)
     jdbc-sqlite3 (3.7.2)
+    journey (1.0.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    jruby-rack (1.0.10)
-    json (1.4.6)
-    json (1.4.6-java)
+    jruby-rack (1.1.3)
+    json (1.6.5)
+    json (1.6.5-java)
     lesstile (1.0.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-openid (1.2.0)
+    polyglot (0.3.3)
+    rack (1.4.0)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.2.0.rc2)
+      actionmailer (= 3.2.0.rc2)
+      actionpack (= 3.2.0.rc2)
+      activerecord (= 3.2.0.rc2)
+      activeresource (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.2.0.rc2)
+    railties (3.2.0.rc2)
+      actionpack (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.5.0)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     ruby-openid (2.1.8)
-    sqlite3 (1.3.3)
+    rubyzip (0.9.5)
+    sass (3.1.12)
+    sass-rails (3.2.3)
+      railties (~> 3.2.0.beta)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.17.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    trinidad (1.2.3)
-      jruby-rack (>= 1.0.9)
+    trinidad (1.3.2)
+      jruby-rack (>= 1.1.1)
       trinidad_jars (>= 1.0.1)
-    trinidad_jars (1.0.1)
-    tzinfo (0.3.24)
+    trinidad_jars (1.0.2)
+    tzinfo (0.3.31)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.pre2)
+    will_paginate (3.0.2)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  RedCloth (~> 4.2.7)
+  RedCloth (~> 4.2.9)
   aaronh-chronic
   activerecord-jdbcsqlite3-adapter
   coderay
+  coffee-rails (~> 3.2.1)
   cucumber-rails
   factory_girl
   formtastic
   jruby-openssl
   lesstile
   nokogiri (~> 1.5.0)
   rack-openid
-  rails (= 3.0.4)
+  rails (= 3.2.0.rc2)
   rspec
   rspec-rails
   ruby-openid
+  sass-rails (~> 3.2.3)
   sqlite3-ruby
   trinidad
   webrat
-  will_paginate (= 3.0.pre2)
+  will_paginate (~> 3.0.2)
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 Enki::Application.load_tasks
diff --git a/app/helpers/url_helper.rb b/app/helpers/url_helper.rb
@@ -6,7 +6,7 @@ def post_path(post, options = {})
     path
   end
 
-  def post_comments_path(post)
+  def post_comments_path(post, comment)
     post_path(post) + "/comments"
   end
 

diff --git a/app/models/post.rb b/app/models/post.rb
@@ -89,8 +89,9 @@ def find_all_grouped_by_month
 
   def destroy_with_undo
     transaction do
+      undo = DeletePostUndo.create_undo(self)
       self.destroy
-      return DeletePostUndo.create_undo(self)
+      return undo
     end
   end