Rails 4.0 Upgrade

.ruby-version

@@ -1 +1 @@
-2.1.4
+2.2.0

.travis.yml

@@ -8,7 +8,6 @@ rvm:
   - 2.0
   - rbx-19mode
   - 1.9.3
-  - 1.9.2
 
 env:
   - DB=sqlite
@@ -23,13 +22,17 @@ before_script:
   - bundle exec rake db:migrate
   - bundle exec rake db:seed
 
-script: "bundle exec rake spec"
+script: "bundle exec rake ci"
 
 matrix:
   allow_failures:
-    - rvm: 2.2
     - rvm: jruby-19mode
     - rvm: rbx-19mode
     - env: DB=sqlite
 
 sudo: false
+
+notifications:
+  webhooks:
+    urls:
+      -  https://webhooks.gitter.im/e/fd712cc811935fc71415

Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.21'
 
@@ -9,16 +9,18 @@ group :assets do
 end
 
 platforms :ruby do
-  gem 'mysql2', '~> 0.3.11'
-  gem 'pg', '>= 0.9.0'
-  gem 'sqlite3'
+  gem 'mysql2', '~> 0.3.17'
+  gem 'pg', '~> 0.18.1'
+  gem 'sqlite3', '~> 1.3.10'
   gem 'therubyracer'
 end
 
+gem 'strong_parameters'
+
 gem 'haml-rails'
 gem 'jquery-rails'
 gem 'will_paginate', '~> 3.0.4'
-gem "audited-activerecord", "~> 3.0.0.rc2"
+gem "audited-activerecord", "~> 3.0.0"
 gem 'inherited_resources'
 gem 'devise', '~> 2.2.8'
 gem "devise-encryptable"
@@ -29,12 +31,13 @@ gem 'acts_as_list'
 gem 'dynamic_form'
 
 group :development do
-  gem 'debugger', :platform => :mri_19
-  #gem 'RedCloth', '>= 4.1.1'
+  gem 'guard-rspec', :require => false
+  gem 'guard-cucumber', :require => false
 end
 
 group :development, :test do
-  gem "rspec-rails"
+  gem "test-unit"
+  gem "rspec-rails", "~> 3.1.0"
   gem 'RedCloth', '>= 4.1.1'
 end
 

Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
     actionmailer (3.2.21)
@@ -39,96 +39,130 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.0.4)
-    capybara (2.0.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+      xpath (~> 2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
     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.4.0)
-    columnize (0.3.6)
-    cucumber (1.2.1)
+    cucumber (1.3.18)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    cucumber-rails (1.3.0)
-      capybara (>= 1.1.2)
-      cucumber (>= 1.1.8)
-      nokogiri (>= 1.5.0)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    cucumber-rails (1.4.2)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 2)
+      mime-types (>= 1.16, < 3)
+      nokogiri (~> 1.5)
+      rails (>= 3, < 5)
     database_cleaner (0.9.1)
-    debugger (1.4.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     devise-encryptable (0.1.1)
       devise (>= 2.1.0.rc)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    ffi (1.9.6)
+    formatador (0.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    guard (2.11.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.0)
+    guard-cucumber (1.5.3)
+      cucumber (>= 1.3.0)
+      guard (>= 2.0.0)
+      guard-compat (~> 1.0)
+      nenv (~> 0.1)
+    guard-rspec (4.5.0)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     haml (4.0.0)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    has_scope (0.5.1)
+    has_scope (0.6.0.rc)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
     hike (1.2.3)
-    i18n (0.6.11)
-    inherited_resources (1.3.1)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    inherited_resources (1.5.1)
+      actionpack (>= 3.2, < 4.2)
+      has_scope (~> 0.6.0.rc)
+      railties (>= 3.2, < 4.2)
+      responders (~> 1.0)
     journey (1.0.4)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.8.1)
+    json (1.8.2)
     libv8 (3.16.14.7)
-    libwebsocket (0.1.6.1)
-      websocket
+    listen (2.8.5)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
+    method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.2)
     mocha (0.13.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    mysql2 (0.3.11)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    multi_test (0.1.1)
+    mysql2 (0.3.17)
+    nenv (0.1.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    notiffany (0.0.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     orm_adapter (0.5.0)
-    pg (0.15.0)
+    pg (0.18.1)
     polyglot (0.3.5)
+    power_assert (0.2.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rabl (0.7.6)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
@@ -137,7 +171,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.21)
       actionmailer (= 3.2.21)
@@ -155,45 +189,62 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.4.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    responders (0.9.3)
-      railties (~> 3.1)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rubyzip (0.9.9)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.26.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
+    shellany (0.0.1)
+    slop (3.6.0)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.10)
     state_machine (1.1.2)
+    strong_parameters (0.2.3)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+    test-unit (3.0.9)
+      power_assert
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -207,9 +258,8 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    websocket (1.0.4)
     will_paginate (3.0.7)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -218,27 +268,30 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (>= 4.1.1)
   acts_as_list
-  audited-activerecord (~> 3.0.0.rc2)
+  audited-activerecord (~> 3.0.0)
   coffee-rails
   cucumber-rails
   database_cleaner
-  debugger
   devise (~> 2.2.8)
   devise-encryptable
   dynamic_form
   factory_girl_rails (~> 4.0)
+  guard-cucumber
+  guard-rspec
   haml-rails
   inherited_resources
   jquery-rails
   mocha
-  mysql2 (~> 0.3.11)
-  pg (>= 0.9.0)
+  mysql2 (~> 0.3.17)
+  pg (~> 0.18.1)
   rabl
   rails (~> 3.2.21)
-  rspec-rails
+  rspec-rails (~> 3.1.0)
   sass-rails
-  sqlite3
+  sqlite3 (~> 1.3.10)
   state_machine
+  strong_parameters
+  test-unit
   therubyracer
   uglifier
   webrat