Bump to Rails 4.

[Closes #83]
xaviershay · Jul 22, 2013 · c235118 · c235118
1 parent dba484d
commit c235118
Show file tree

Hide file tree

Showing 53 changed files with 377 additions and 413 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,22 +1,21 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.13'
+gem 'rails', '~> 4.0.0'
 
 # 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.6'
-end
+gem 'sass-rails'
 
 platforms :ruby do
   gem 'sqlite3'
 end
 
 platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
+  # The stable version has not yet supported Rails 4
+  gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.beta2'
   gem 'trinidad'
   gem 'jruby-openssl'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,198 +2,160 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
     aaronh-chronic (0.3.9)
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      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.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.2)
-    bouncy-castle-java (1.5.0146.1)
-    builder (3.0.4)
-    capybara (1.1.2)
+      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)
+    addressable (2.3.5)
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    capybara (2.1.0)
       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)
-    cucumber (1.1.4)
+      xpath (~> 2.0)
+    coderay (1.0.9)
+    cucumber (1.3.5)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.3)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    cucumber-websteps (0.9.0)
-      capybara
-      cucumber
+    cucumber-websteps (0.10.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.1)
       launchy
-    database_cleaner (0.7.0)
-    diff-lcs (1.1.3)
+    database_cleaner (1.0.1)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
     exception_notification (2.5.2)
       actionmailer (>= 3.0.4)
-    factory_girl (2.4.2)
-      activesupport
-    ffi (1.0.11)
-    ffi (1.0.11-java)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    gherkin (2.7.3)
-      json (>= 1.4.6)
-    gherkin (2.7.3-java)
-      json (>= 1.4.6)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.1)
-    jdbc-sqlite3 (3.7.2)
-    journey (1.0.4)
-    jquery-rails (2.1.1)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.1.3)
-    json (1.8.0)
-    json (1.8.0-java)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    launchy (2.0.5-java)
-      addressable (~> 2.2.6)
-      ffi (~> 1.0.9)
-      spoon (~> 0.0.1)
+    i18n (0.6.4)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    launchy (2.3.0)
+      addressable (~> 2.3)
     lesstile (1.1.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    multi_test (0.0.2)
+    nokogiri (1.5.10)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    rack (1.5.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      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)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    rdoc (3.12.2)
-      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.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.3)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    ruby-openid (2.1.8)
-    rubyzip (0.9.5)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    ruby-openid (2.2.3)
     sass (3.2.9)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
       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
-    spoon (0.0.1)
-    sprockets (2.2.2)
+      sprockets-rails (~> 2.0.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
     thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
     tilt (1.4.1)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    trinidad (1.3.2)
-      jruby-rack (>= 1.1.1)
-      trinidad_jars (>= 1.0.1)
-    trinidad_jars (1.0.2)
     tzinfo (0.3.37)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.2)
-    xpath (0.1.4)
+    will_paginate (3.0.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   aaronh-chronic
-  activerecord-jdbcsqlite3-adapter
+  activerecord-jdbcsqlite3-adapter (= 1.3.0.beta2)
   coderay (~> 1.0.5)
   cucumber-rails
   cucumber-websteps
@@ -207,11 +169,11 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   open_id_authentication
   rack-openid
-  rails (~> 3.2.13)
+  rails (~> 4.0.0)
   rspec
   rspec-rails
   ruby-openid
-  sass-rails (~> 3.2.6)
+  sass-rails
   sqlite3
   trinidad
   webrat

diff --git a/README.textile b/README.textile
@@ -56,7 +56,7 @@ Enki embodies much of the philosophy of SimpleLog, but does so in a style that i
 
 h2. Compatibility
 
-Uses Ruby 1.9.3 or newer and Rails 3. Runs on MySQL or Postgres. Works on heroku.
+Uses Ruby 1.9.3 or newer and Rails 4. Runs on MySQL or Postgres. Works on heroku.
 
 h2. Contributors, these guys rock
 

diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
@@ -44,6 +44,12 @@ def destroy
     end
   end
 
+  private
+
+  def comment_params
+    params.require(:comment).permit(:author, :author_url, :author_email, :body)
+  end
+
   protected
 
   def find_comment