From a4045a1f9bc454e618a7c55960942eb030f02fdd Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Tue, 21 Oct 2014 22:35:12 -0600
Subject: [PATCH] Remove Rails 3.x, Ruby 1.9.2, Ruby 1.9.3

Ruby 1.9.3 will be end-of-lifed on February 23, 2015. We might as well
remove support for it now.
---
 .travis.yml                                   |  53 +----
 Appraisals                                    | 129 +++---------
 gemfiles/3.0.gemfile                          |  26 ---
 gemfiles/3.0.gemfile.lock                     | 153 --------------
 gemfiles/3.1.gemfile                          |  32 ---
 gemfiles/3.1.gemfile.lock                     | 193 ------------------
 gemfiles/3.1_1.9.2.gemfile                    |  32 ---
 gemfiles/3.1_1.9.2.gemfile.lock               | 193 ------------------
 gemfiles/3.2.gemfile                          |  33 ---
 gemfiles/3.2.gemfile.lock                     | 193 ------------------
 gemfiles/3.2_1.9.2.gemfile                    |  31 ---
 gemfiles/3.2_1.9.2.gemfile.lock               | 188 -----------------
 gemfiles/4.0.0.gemfile.lock                   |  52 ++---
 gemfiles/4.0.1.gemfile.lock                   |  61 +++---
 gemfiles/4.1.gemfile.lock                     |  62 +++---
 gemfiles/4.2.gemfile.lock                     |  26 +--
 .../render_with_layout_matcher.rb             |   2 +-
 .../action_controller/set_flash_matcher.rb    |   5 +-
 .../allow_mass_assignment_of_matcher.rb       |  13 +-
 .../validate_confirmation_of_matcher.rb       |   6 +-
 .../active_model/validation_message_finder.rb |  65 ++++++
 .../association_matchers/model_reflection.rb  |  45 +---
 lib/shoulda/matchers/rails_shim.rb            |  40 ----
 script/SUPPORTED_VERSIONS                     |   2 +-
 script/update_gems_in_all_appraisals          |  14 ++
 shoulda-matchers.gemspec                      |   4 +-
 .../record_validating_confirmation_builder.rb |   3 +-
 .../render_with_layout_matcher_spec.rb        |   6 +-
 spec/unit_spec_helper.rb                      |  15 --
 29 files changed, 239 insertions(+), 1438 deletions(-)
 delete mode 100644 gemfiles/3.0.gemfile
 delete mode 100644 gemfiles/3.0.gemfile.lock
 delete mode 100644 gemfiles/3.1.gemfile
 delete mode 100644 gemfiles/3.1.gemfile.lock
 delete mode 100644 gemfiles/3.1_1.9.2.gemfile
 delete mode 100644 gemfiles/3.1_1.9.2.gemfile.lock
 delete mode 100644 gemfiles/3.2.gemfile
 delete mode 100644 gemfiles/3.2.gemfile.lock
 delete mode 100644 gemfiles/3.2_1.9.2.gemfile
 delete mode 100644 gemfiles/3.2_1.9.2.gemfile.lock
 create mode 100644 lib/shoulda/matchers/active_model/validation_message_finder.rb
 create mode 100755 script/update_gems_in_all_appraisals

diff --git a/.travis.yml b/.travis.yml
index a0447c5a..0780ba0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,55 +8,18 @@ branches:
     - gh-pages
 
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 2.0.0
+  - 2.1.4
+  - rbx-19mode
+  - jruby-19mode
 
 gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
-  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.0.gemfile
+  - gemfiles/4.0.1.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
 
 matrix:
   allow_failures:
     - rvm: rbx-19mode
     - rvm: jruby-19mode
-  include:
-    - rvm: 1.9.2
-      gemfile: gemfiles/3.1_1.9.2.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/3.2_1.9.2.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/4.0.0.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/4.0.1.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/4.1.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/3.2.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/4.0.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/4.0.1.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/4.1.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/4.2.gemfile
-    - rvm: 2.1.4
-      gemfile: gemfiles/3.2.gemfile
-    - rvm: 2.1.4
-      gemfile: gemfiles/4.0.0.gemfile
-    - rvm: 2.1.4
-      gemfile: gemfiles/4.0.1.gemfile
-    - rvm: 2.1.4
-      gemfile: gemfiles/4.1.gemfile
-    - rvm: 2.1.4
-      gemfile: gemfiles/4.2.gemfile
-    - rvm: rbx-19mode
-      gemfile: gemfiles/3.2.gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/3.2.gemfile
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/3.1.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/3.2.gemfile
diff --git a/Appraisals b/Appraisals
index 20d3a5d9..75b02e3f 100644
--- a/Appraisals
+++ b/Appraisals
@@ -16,37 +16,6 @@ spring = proc do
   gem 'spring-commands-rspec'
 end
 
-rails_3 = proc do
-  instance_eval(&shared_dependencies)
-  gem 'strong_parameters'
-  gem 'minitest', '~> 4.0'
-  gem 'minitest-reporters'
-end
-
-rails_3_1 = proc do
-  instance_eval(&rails_3)
-  gem 'rails', '~> 3.1.8'
-  gem 'bcrypt-ruby', '~> 3.0.0'
-  gem 'jquery-rails'
-  gem 'sass-rails', '~> 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
-  gem 'uglifier', '>= 1.0.3'
-  gem 'minitest', '~> 4.0'
-  gem 'minitest-reporters'
-end
-
-rails_3_2 = proc do
-  instance_eval(&rails_3)
-  gem 'rails', '~> 3.2.13'
-  gem 'bcrypt-ruby', '~> 3.0.0'
-  gem 'jquery-rails'
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
-  gem 'minitest', '~> 4.0'
-  gem 'minitest-reporters'
-end
-
 rails_4 = proc do
   instance_eval(&shared_dependencies)
   instance_eval(&spring)
@@ -63,73 +32,41 @@ end
 
 #---
 
-if Gem::Requirement.new('< 2').satisfied_by?(ruby_version)
-  appraise '3.0' do
-    instance_eval(&rails_3)
-    gem 'rails', '~> 3.0.17'
-  end
-
-  if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
-    appraise '3.1-1.9.2' do
-      instance_eval(&rails_3_1)
-      gem 'turn', '0.8.2'
-    end
-  else
-    appraise '3.1' do
-      instance_eval(&rails_3_1)
-      gem 'turn', '~> 0.8.3'
-    end
-  end
+appraise '4.0.0' do
+  instance_eval(&rails_4)
+  gem 'rails', '4.0.0'
+  gem 'jbuilder', '~> 1.2'
+  gem 'sass-rails', '~> 4.0.0'
+  gem 'bcrypt-ruby', '~> 3.0.0'
 end
 
-if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
-  appraise '3.2-1.9.2' do
-    instance_eval(&rails_3_2)
-  end
-else
-  appraise '3.2' do
-    instance_eval(&rails_3_2)
-    instance_eval(&spring)
-  end
+appraise '4.0.1' do
+  instance_eval(&rails_4)
+  gem 'rails', '4.0.1'
+  gem 'jbuilder', '~> 1.2'
+  gem 'sass-rails', '~> 4.0.0'
+  gem 'bcrypt-ruby', '~> 3.1.2'
 end
 
-if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
-  appraise '4.0.0' do
-    instance_eval(&rails_4)
-    gem 'rails', '4.0.0'
-    gem 'jbuilder', '~> 1.2'
-    gem 'sass-rails', '~> 4.0.0'
-    gem 'bcrypt-ruby', '~> 3.0.0'
-  end
-
-  appraise '4.0.1' do
-    instance_eval(&rails_4)
-    gem 'rails', '4.0.1'
-    gem 'jbuilder', '~> 1.2'
-    gem 'sass-rails', '~> 4.0.0'
-    gem 'bcrypt-ruby', '~> 3.1.2'
-  end
-
-  appraise '4.1' do
-    instance_eval(&rails_4)
-    gem 'rails', '~> 4.1.0'
-    gem 'jbuilder', '~> 2.0'
-    gem 'sass-rails', '~> 4.0.3'
-    gem 'sdoc', '~> 0.4.0'
-    gem 'bcrypt', '~> 3.1.7'
-    gem 'protected_attributes', "~> 1.0.6"
-    gem 'spring'
-  end
-
-  appraise '4.2' do
-    instance_eval(&rails_4)
-    gem 'rails', '~> 4.2.0'
-    gem 'sass-rails', '~> 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-    gem 'jbuilder', '~> 2.0'
-    gem 'sdoc', '~> 0.4.0'
-    gem 'bcrypt', '~> 3.1.7'
-    gem 'spring'
-    gem 'protected_attributes', "~> 1.0.6"
-  end
+appraise '4.1' do
+  instance_eval(&rails_4)
+  gem 'rails', '~> 4.1.0'
+  gem 'jbuilder', '~> 2.0'
+  gem 'sass-rails', '~> 4.0.3'
+  gem 'sdoc', '~> 0.4.0'
+  gem 'bcrypt', '~> 3.1.7'
+  gem 'protected_attributes', "~> 1.0.6"
+  gem 'spring'
+end
+
+appraise '4.2' do
+  instance_eval(&rails_4)
+  gem 'rails', '~> 4.2.0'
+  gem 'sass-rails', '~> 5.0'
+  gem 'coffee-rails', '~> 4.1.0'
+  gem 'jbuilder', '~> 2.0'
+  gem 'sdoc', '~> 0.4.0'
+  gem 'bcrypt', '~> 3.1.7'
+  gem 'spring'
+  gem 'protected_attributes', "~> 1.0.6"
 end
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
deleted file mode 100644
index eb3a1674..00000000
--- a/gemfiles/3.0.gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 1.0"
-gem "bundler", "~> 1.1"
-gem "pry-nav"
-gem "rake", "~> 10.0"
-gem "rspec-core", "~> 3.0"
-gem "rspec-expectations", "~> 3.0"
-gem "yard"
-gem "redcarpet"
-gem "pygments.rb"
-gem "watchr"
-gem "rspec-rails", "~> 3.0"
-gem "shoulda-context", "~> 1.2.0"
-gem "sqlite3", :platform => :ruby
-gem "activerecord-jdbc-adapter", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "jdbc-sqlite3", :platform => :jruby
-gem "jruby-openssl", :platform => :jruby
-gem "therubyrhino", :platform => :jruby
-gem "strong_parameters"
-gem "minitest", "~> 4.0"
-gem "minitest-reporters"
-gem "rails", "~> 3.0.17"
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
deleted file mode 100644
index ca0c6a4a..00000000
--- a/gemfiles/3.0.gemfile.lock
+++ /dev/null
@@ -1,153 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    ansi (1.4.3)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.0.10)
-    builder (2.1.2)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    hashie (3.3.1)
-    i18n (0.5.4)
-    json (1.8.2)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.21)
-    minitest (4.7.5)
-    minitest-reporters (0.14.24)
-      ansi
-      builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    polyglot (0.3.3)
-    posix-spawn (0.3.8)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
-      bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    shoulda-context (1.2.0)
-    slop (3.6.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.14.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.43)
-    watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0)
-  bundler (~> 1.1)
-  jdbc-sqlite3
-  jruby-openssl
-  minitest (~> 4.0)
-  minitest-reporters
-  pry-nav
-  pygments.rb
-  rails (~> 3.0.17)
-  rake (~> 10.0)
-  redcarpet
-  rspec-core (~> 3.0)
-  rspec-expectations (~> 3.0)
-  rspec-rails (~> 3.0)
-  shoulda-context (~> 1.2.0)
-  sqlite3
-  strong_parameters
-  therubyrhino
-  watchr
-  yard
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
deleted file mode 100644
index f196d74d..00000000
--- a/gemfiles/3.1.gemfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 1.0"
-gem "bundler", "~> 1.1"
-gem "pry-nav"
-gem "rake", "~> 10.0"
-gem "rspec-core", "~> 3.0"
-gem "rspec-expectations", "~> 3.0"
-gem "yard"
-gem "redcarpet"
-gem "pygments.rb"
-gem "watchr"
-gem "rspec-rails", "~> 3.0"
-gem "shoulda-context", "~> 1.2.0"
-gem "sqlite3", :platform => :ruby
-gem "activerecord-jdbc-adapter", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "jdbc-sqlite3", :platform => :jruby
-gem "jruby-openssl", :platform => :jruby
-gem "therubyrhino", :platform => :jruby
-gem "strong_parameters"
-gem "minitest", "~> 4.0"
-gem "minitest-reporters"
-gem "rails", "~> 3.1.8"
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
-gem "sass-rails", "~> 3.1.5"
-gem "coffee-rails", "~> 3.1.1"
-gem "uglifier", ">= 1.0.3"
-gem "turn", "~> 0.8.3"
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
deleted file mode 100644
index b1a49b1c..00000000
--- a/gemfiles/3.1.gemfile.lock
+++ /dev/null
@@ -1,193 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.1.11)
-      actionpack (= 3.1.11)
-      mail (~> 2.3.3)
-    actionpack (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-    activesupport (3.1.11)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    coderay (1.1.0)
-    coffee-rails (3.1.1)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.7.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    hashie (3.3.1)
-    hike (1.2.3)
-    i18n (0.7.0)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.21)
-    minitest (4.7.5)
-    minitest-reporters (0.14.24)
-      ansi
-      builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    multi_json (1.10.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.8)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.1.11)
-      actionmailer (= 3.1.11)
-      actionpack (= 3.1.11)
-      activerecord (= 3.1.11)
-      activeresource (= 3.1.11)
-      activesupport (= 3.1.11)
-      bundler (~> 1.0)
-      railties (= 3.1.11)
-    railties (3.1.11)
-      actionpack (= 3.1.11)
-      activesupport (= 3.1.11)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    sass (3.2.7)
-    sass-rails (3.1.6)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3.2)
-    shoulda-context (1.2.0)
-    slop (3.6.0)
-    sprockets (2.0.5)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.14.6)
-    tilt (1.3.7)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.8.3)
-      ansi
-    tzinfo (0.3.37)
-    uglifier (2.2.1)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0)
-  bcrypt-ruby (~> 3.0.0)
-  bundler (~> 1.1)
-  coffee-rails (~> 3.1.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  minitest (~> 4.0)
-  minitest-reporters
-  pry-nav
-  pygments.rb
-  rails (~> 3.1.8)
-  rake (~> 10.0)
-  redcarpet
-  rspec-core (~> 3.0)
-  rspec-expectations (~> 3.0)
-  rspec-rails (~> 3.0)
-  sass-rails (~> 3.1.5)
-  shoulda-context (~> 1.2.0)
-  sqlite3
-  strong_parameters
-  therubyrhino
-  turn (~> 0.8.3)
-  uglifier (>= 1.0.3)
-  watchr
-  yard
diff --git a/gemfiles/3.1_1.9.2.gemfile b/gemfiles/3.1_1.9.2.gemfile
deleted file mode 100644
index c19f5220..00000000
--- a/gemfiles/3.1_1.9.2.gemfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 1.0"
-gem "bundler", "~> 1.1"
-gem "pry-nav"
-gem "rake", "~> 10.0"
-gem "rspec-core", "~> 3.0"
-gem "rspec-expectations", "~> 3.0"
-gem "yard"
-gem "redcarpet"
-gem "pygments.rb"
-gem "watchr"
-gem "rspec-rails", "~> 3.0"
-gem "shoulda-context", "~> 1.2.0"
-gem "sqlite3", :platform => :ruby
-gem "activerecord-jdbc-adapter", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "jdbc-sqlite3", :platform => :jruby
-gem "jruby-openssl", :platform => :jruby
-gem "therubyrhino", :platform => :jruby
-gem "strong_parameters"
-gem "minitest", "~> 4.0"
-gem "minitest-reporters"
-gem "rails", "~> 3.1.8"
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
-gem "sass-rails", "~> 3.1.5"
-gem "coffee-rails", "~> 3.1.1"
-gem "uglifier", ">= 1.0.3"
-gem "turn", "0.8.2"
diff --git a/gemfiles/3.1_1.9.2.gemfile.lock b/gemfiles/3.1_1.9.2.gemfile.lock
deleted file mode 100644
index 73a6bb2c..00000000
--- a/gemfiles/3.1_1.9.2.gemfile.lock
+++ /dev/null
@@ -1,193 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.1.11)
-      actionpack (= 3.1.11)
-      mail (~> 2.3.3)
-    actionpack (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-    activesupport (3.1.11)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    coderay (1.1.0)
-    coffee-rails (3.1.1)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.7.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    hashie (3.3.1)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    minitest-reporters (0.14.24)
-      ansi
-      builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    multi_json (1.10.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.8)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.1.11)
-      actionmailer (= 3.1.11)
-      actionpack (= 3.1.11)
-      activerecord (= 3.1.11)
-      activeresource (= 3.1.11)
-      activesupport (= 3.1.11)
-      bundler (~> 1.0)
-      railties (= 3.1.11)
-    railties (3.1.11)
-      actionpack (= 3.1.11)
-      activesupport (= 3.1.11)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    sass (3.2.12)
-    sass-rails (3.1.6)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3.2)
-    shoulda-context (1.2.0)
-    slop (3.6.0)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.14.6)
-    tilt (1.3.7)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
-    tzinfo (0.3.38)
-    uglifier (2.5.0)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0)
-  bcrypt-ruby (~> 3.0.0)
-  bundler (~> 1.1)
-  coffee-rails (~> 3.1.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  minitest (~> 4.0)
-  minitest-reporters
-  pry-nav
-  pygments.rb
-  rails (~> 3.1.8)
-  rake (~> 10.0)
-  redcarpet
-  rspec-core (~> 3.0)
-  rspec-expectations (~> 3.0)
-  rspec-rails (~> 3.0)
-  sass-rails (~> 3.1.5)
-  shoulda-context (~> 1.2.0)
-  sqlite3
-  strong_parameters
-  therubyrhino
-  turn (= 0.8.2)
-  uglifier (>= 1.0.3)
-  watchr
-  yard
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
deleted file mode 100644
index 0de437f9..00000000
--- a/gemfiles/3.2.gemfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 1.0"
-gem "bundler", "~> 1.1"
-gem "pry-nav"
-gem "rake", "~> 10.0"
-gem "rspec-core", "~> 3.0"
-gem "rspec-expectations", "~> 3.0"
-gem "yard"
-gem "redcarpet"
-gem "pygments.rb"
-gem "watchr"
-gem "rspec-rails", "~> 3.0"
-gem "shoulda-context", "~> 1.2.0"
-gem "sqlite3", :platform => :ruby
-gem "activerecord-jdbc-adapter", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "jdbc-sqlite3", :platform => :jruby
-gem "jruby-openssl", :platform => :jruby
-gem "therubyrhino", :platform => :jruby
-gem "strong_parameters"
-gem "minitest", "~> 4.0"
-gem "minitest-reporters"
-gem "rails", "~> 3.2.13"
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
-gem "sass-rails", "~> 3.2.3"
-gem "coffee-rails", "~> 3.2.1"
-gem "uglifier", ">= 1.0.3"
-gem "spring"
-gem "spring-commands-rspec"
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
deleted file mode 100644
index fab437ff..00000000
--- a/gemfiles/3.2.gemfile.lock
+++ /dev/null
@@ -1,193 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.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)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    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.7.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    hashie (3.3.1)
-    hike (1.2.3)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.21)
-    minitest (4.7.5)
-    minitest-reporters (0.14.24)
-      ansi
-      builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    multi_json (1.10.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.8)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      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)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    sass (3.2.7)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    shoulda-context (1.2.0)
-    slop (3.6.0)
-    spring (1.1.3)
-    spring-commands-rspec (1.0.2)
-      spring (>= 0.9.1)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.2.1)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0)
-  bcrypt-ruby (~> 3.0.0)
-  bundler (~> 1.1)
-  coffee-rails (~> 3.2.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  minitest (~> 4.0)
-  minitest-reporters
-  pry-nav
-  pygments.rb
-  rails (~> 3.2.13)
-  rake (~> 10.0)
-  redcarpet
-  rspec-core (~> 3.0)
-  rspec-expectations (~> 3.0)
-  rspec-rails (~> 3.0)
-  sass-rails (~> 3.2.3)
-  shoulda-context (~> 1.2.0)
-  spring
-  spring-commands-rspec
-  sqlite3
-  strong_parameters
-  therubyrhino
-  uglifier (>= 1.0.3)
-  watchr
-  yard
diff --git a/gemfiles/3.2_1.9.2.gemfile b/gemfiles/3.2_1.9.2.gemfile
deleted file mode 100644
index 95c71087..00000000
--- a/gemfiles/3.2_1.9.2.gemfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 1.0"
-gem "bundler", "~> 1.1"
-gem "pry-nav"
-gem "rake", "~> 10.0"
-gem "rspec-core", "~> 3.0"
-gem "rspec-expectations", "~> 3.0"
-gem "yard"
-gem "redcarpet"
-gem "pygments.rb"
-gem "watchr"
-gem "rspec-rails", "~> 3.0"
-gem "shoulda-context", "~> 1.2.0"
-gem "sqlite3", :platform => :ruby
-gem "activerecord-jdbc-adapter", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-gem "jdbc-sqlite3", :platform => :jruby
-gem "jruby-openssl", :platform => :jruby
-gem "therubyrhino", :platform => :jruby
-gem "strong_parameters"
-gem "minitest", "~> 4.0"
-gem "minitest-reporters"
-gem "rails", "~> 3.2.13"
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
-gem "sass-rails", "~> 3.2.3"
-gem "coffee-rails", "~> 3.2.1"
-gem "uglifier", ">= 1.0.3"
diff --git a/gemfiles/3.2_1.9.2.gemfile.lock b/gemfiles/3.2_1.9.2.gemfile.lock
deleted file mode 100644
index e1a91dbf..00000000
--- a/gemfiles/3.2_1.9.2.gemfile.lock
+++ /dev/null
@@ -1,188 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
-      mail (~> 2.5.4)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-      builder (~> 3.0.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.18)
-      activesupport (= 3.2.18)
-      builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.3)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    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.7.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.2.0)
-    hashie (3.3.1)
-    hike (1.2.3)
-    i18n (0.6.11)
-    journey (1.0.4)
-    jquery-rails (3.1.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    minitest-reporters (0.14.24)
-      ansi
-      builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    multi_json (1.10.1)
-    polyglot (0.3.5)
-    posix-spawn (0.3.8)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
-      bundler (~> 1.0)
-      railties (= 3.2.18)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    sass (3.3.8)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    shoulda-context (1.2.1)
-    slop (3.6.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    strong_parameters (0.2.3)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    uglifier (2.5.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 1.0)
-  bcrypt-ruby (~> 3.0.0)
-  bundler (~> 1.1)
-  coffee-rails (~> 3.2.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  minitest (~> 4.0)
-  minitest-reporters
-  pry-nav
-  pygments.rb
-  rails (~> 3.2.13)
-  rake (~> 10.0)
-  redcarpet
-  rspec-core (~> 3.0)
-  rspec-expectations (~> 3.0)
-  rspec-rails (~> 3.0)
-  sass-rails (~> 3.2.3)
-  shoulda-context (~> 1.2.0)
-  sqlite3
-  strong_parameters
-  therubyrhino
-  uglifier (>= 1.0.3)
-  watchr
-  yard
diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock
index 8ca9de1f..cdc5fd69 100644
--- a/gemfiles/4.0.0.gemfile.lock
+++ b/gemfiles/4.0.0.gemfile.lock
@@ -41,23 +41,23 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.9.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.0.2)
-    hashie (3.3.1)
+    execjs (2.3.0)
+    hashie (3.3.2)
     hike (1.2.3)
     i18n (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -71,7 +71,7 @@ GEM
       powerbar
     multi_json (1.10.1)
     polyglot (0.3.5)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.9)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
@@ -83,9 +83,9 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
+    pygments.rb (0.6.2)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rack (1.5.2)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -105,9 +105,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (4.1.1)
+    rdoc (4.2.0)
       json (~> 1.4)
-    redcarpet (3.1.2)
+    redcarpet (3.2.2)
     rspec-core (3.2.0)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
@@ -126,20 +126,20 @@ GEM
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
-    shoulda-context (1.2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    shoulda-context (1.2.1)
     slop (3.6.0)
-    spring (1.1.3)
-    spring-commands-rspec (1.0.2)
+    spring (1.2.0)
+    spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.11.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -148,22 +148,22 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.5.3)
       coffee-rails
     tzinfo (0.3.43)
-    uglifier (2.5.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
+    yajl-ruby (1.2.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock
index 34a8ab4b..367c5e58 100644
--- a/gemfiles/4.0.1.gemfile.lock
+++ b/gemfiles/4.0.1.gemfile.lock
@@ -34,30 +34,30 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    arel (4.0.1)
+    arel (4.0.2)
     bcrypt-ruby (3.1.2)
     builder (3.1.4)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.9.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.0.2)
-    hashie (3.3.1)
+    execjs (2.3.0)
+    hashie (3.3.2)
     hike (1.2.3)
     i18n (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -70,12 +70,12 @@ GEM
       minitest (>= 2.12, < 5.0)
       powerbar
     multi_json (1.10.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.8)
+    polyglot (0.3.5)
+    posix-spawn (0.3.9)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
-    protected_attributes (1.0.5)
+    protected_attributes (1.0.8)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -83,9 +83,9 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
+    pygments.rb (0.6.2)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rack (1.5.2)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -105,9 +105,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (4.1.1)
+    rdoc (4.2.0)
       json (~> 1.4)
-    redcarpet (3.1.2)
+    redcarpet (3.2.2)
     rspec-core (3.2.0)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
@@ -125,20 +125,21 @@ GEM
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
-    sass (3.2.12)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
-    shoulda-context (1.2.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    shoulda-context (1.2.1)
     slop (3.6.0)
-    spring (1.1.3)
-    spring-commands-rspec (1.0.2)
+    spring (1.2.0)
+    spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.10.1)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -147,22 +148,22 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.5.3)
       coffee-rails
     tzinfo (0.3.43)
-    uglifier (2.5.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
+    yajl-ruby (1.2.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock
index edaeed42..25368242 100644
--- a/gemfiles/4.1.gemfile.lock
+++ b/gemfiles/4.1.gemfile.lock
@@ -31,31 +31,31 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    ansi (1.4.3)
+    ansi (1.5.0)
     appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    bcrypt (3.1.7)
+    bcrypt (3.1.10)
     builder (3.2.2)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.9.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.3.0)
     hike (1.2.3)
     i18n (0.7.0)
-    jbuilder (2.0.6)
+    jbuilder (2.2.6)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
@@ -64,14 +64,14 @@ GEM
     method_source (0.8.2)
     mime-types (2.4.3)
     minitest (5.5.1)
-    minitest-reporters (1.0.5)
+    minitest-reporters (1.0.10)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.10.1)
-    posix-spawn (0.3.8)
-    protected_attributes (1.0.7)
+    posix-spawn (0.3.9)
+    protected_attributes (1.0.8)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -79,9 +79,9 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
+    pygments.rb (0.6.2)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rack (1.5.2)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -103,9 +103,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (4.1.1)
+    rdoc (4.2.0)
       json (~> 1.4)
-    redcarpet (3.1.2)
+    redcarpet (3.2.2)
     rspec-core (3.2.0)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
@@ -123,44 +123,44 @@ GEM
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.7.1)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
-    shoulda-context (1.2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    shoulda-context (1.2.1)
     slop (3.6.0)
-    spring (1.1.2)
-    spring-commands-rspec (1.0.2)
+    spring (1.2.0)
+    spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.11.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    turbolinks (2.2.2)
+    turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     watchr (0.7)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
+    yajl-ruby (1.2.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock
index 685da299..ee1b1d55 100644
--- a/gemfiles/4.2.gemfile.lock
+++ b/gemfiles/4.2.gemfile.lock
@@ -40,13 +40,13 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.4.3)
+    ansi (1.5.0)
     appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.0)
-    bcrypt (3.1.9)
+    bcrypt (3.1.10)
     builder (3.2.2)
     coderay (1.1.0)
     coffee-rails (4.1.0)
@@ -55,10 +55,10 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.3.0)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
     hike (1.2.3)
@@ -66,7 +66,7 @@ GEM
     jbuilder (2.2.6)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.2)
+    jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -79,7 +79,7 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    minitest-reporters (1.0.8)
+    minitest-reporters (1.0.10)
       ansi
       builder
       minitest (>= 5.0)
@@ -96,9 +96,9 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.0)
+    pygments.rb (0.6.2)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -150,8 +150,8 @@ GEM
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
     ruby-progressbar (1.7.1)
-    sass (3.4.9)
-    sass-rails (5.0.0)
+    sass (3.4.11)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -170,7 +170,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -182,11 +182,11 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.6.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     watchr (0.7)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.1)
     yard (0.8.7.6)
 
 PLATFORMS
diff --git a/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb b/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb
index e3fb8efd..4c3e122f 100644
--- a/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb
+++ b/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb
@@ -125,7 +125,7 @@ module Shoulda
 
         def recorded_layouts
           if @context
-            @context.instance_variable_get(Shoulda::Matchers::RailsShim.layouts_ivar)
+            @context.instance_variable_get('@_layouts')
           else
             {}
           end
diff --git a/lib/shoulda/matchers/action_controller/set_flash_matcher.rb b/lib/shoulda/matchers/action_controller/set_flash_matcher.rb
index 1914433d..54b21655 100644
--- a/lib/shoulda/matchers/action_controller/set_flash_matcher.rb
+++ b/lib/shoulda/matchers/action_controller/set_flash_matcher.rb
@@ -249,9 +249,8 @@ module Shoulda
         end
 
         def copy_flashes(original_flash, new_flash)
-          flashes_ivar = Shoulda::Matchers::RailsShim.flashes_ivar
-          flashes = original_flash.instance_variable_get(flashes_ivar).dup
-          new_flash.instance_variable_set(flashes_ivar, flashes)
+          flashes = original_flash.instance_variable_get('@flashes').dup
+          new_flash.instance_variable_set('@flashes', flashes)
         end
 
         def copy_discard_if_necessary(original_flash, new_flash)
diff --git a/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb b/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
index 24441fc7..186261ce 100644
--- a/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
+++ b/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
@@ -84,9 +84,6 @@ module Shoulda
         end
 
         def as(role)
-          if active_model_less_than_3_1?
-            raise 'You can specify role only in Rails 3.1 or greater'
-          end
           @options[:role] = role
           self
         end
@@ -153,20 +150,12 @@ module Shoulda
         end
 
         def authorizer
-          if active_model_less_than_3_1?
-            @subject.class.active_authorizer
-          else
-            @subject.class.active_authorizer[role]
-          end
+          @subject.class.active_authorizer[role]
         end
 
         def class_name
           @subject.class.name
         end
-
-        def active_model_less_than_3_1?
-          ::ActiveModel::VERSION::STRING.to_f < 3.1
-        end
       end
     end
   end
diff --git a/lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb b/lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
index ff2a1881..c6ed2eea 100644
--- a/lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
+++ b/lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
@@ -109,7 +109,7 @@ module Shoulda
 
         def qualify_matcher(matcher)
           matcher.with_message(@message,
-            against: error_attribute,
+            against: confirmation_attribute,
             values: { attribute: attribute }
           )
         end
@@ -120,10 +120,6 @@ module Shoulda
             @subject.__send__(setter, val)
           end
         end
-
-        def error_attribute
-          RailsShim.validates_confirmation_of_error_attribute(self)
-        end
       end
     end
   end
diff --git a/lib/shoulda/matchers/active_model/validation_message_finder.rb b/lib/shoulda/matchers/active_model/validation_message_finder.rb
new file mode 100644
index 00000000..33d1305e
--- /dev/null
+++ b/lib/shoulda/matchers/active_model/validation_message_finder.rb
@@ -0,0 +1,65 @@
+module Shoulda
+  module Matchers
+    module ActiveModel
+      # @private
+      class ValidationMessageFinder
+        include Helpers
+
+        def initialize(instance, attribute, context=nil)
+          @instance = instance
+          @attribute = attribute
+          @context = context
+        end
+
+        def allow_description(allowed_values)
+          "allow #{@attribute} to be set to #{allowed_values}"
+        end
+
+        def expected_message_from(attribute_message)
+          attribute_message
+        end
+
+        def has_messages?
+          errors.present?
+        end
+
+        def source_description
+          'errors'
+        end
+
+        def messages_description
+          if errors.empty?
+            ' no errors'
+          else
+            " errors:\n#{pretty_error_messages(validated_instance)}"
+          end
+        end
+
+        def messages
+          Array(messages_for_attribute)
+        end
+
+        private
+
+        def messages_for_attribute
+          errors[@attribute]
+        end
+
+        def errors
+          validated_instance.errors
+        end
+
+        def validated_instance
+          @validated_instance ||= validate_instance
+        end
+
+        def validate_instance
+          @instance.valid?(*@context)
+          @instance
+        end
+      end
+
+    end
+  end
+end
+
diff --git a/lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb b/lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
index 0302d389..a9314612 100644
--- a/lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
+++ b/lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
@@ -28,20 +28,21 @@ module Shoulda
             join_table =
               if has_and_belongs_to_many_name_table_name
                 has_and_belongs_to_many_name_table_name
-              elsif reflection.respond_to?(:join_table)
-                reflection.join_table
               else
-                reflection.options[:join_table]
+                reflection.join_table
               end
 
             join_table.to_s
           end
 
           def association_relation
-            if reflection.respond_to?(:scope)
-              convert_scope_to_relation(reflection.scope)
+            relation = associated_class.all
+
+            if reflection.scope
+              # Source: AR::Associations::AssociationScope#eval_scope
+              relation.instance_exec(subject, &reflection.scope)
             else
-              convert_options_to_relation(reflection.options)
+              relation
             end
           end
 
@@ -68,37 +69,7 @@ module Shoulda
 
           attr_reader :reflection, :subject
 
-          def convert_scope_to_relation(scope)
-            relation = associated_class.all
-
-            if scope
-              # Source: AR::Associations::AssociationScope#eval_scope
-              relation.instance_exec(subject, &scope)
-            else
-              relation
-            end
-          end
-
-          def convert_options_to_relation(options)
-            relation = associated_class.scoped
-            relation = extend_relation_with(relation, :where, options[:conditions])
-            relation = extend_relation_with(relation, :includes, options[:include])
-            relation = extend_relation_with(relation, :order, options[:order])
-            relation = extend_relation_with(relation, :group, options[:group])
-            relation = extend_relation_with(relation, :having, options[:having])
-            relation = extend_relation_with(relation, :limit, options[:limit])
-            relation = extend_relation_with(relation, :offset, options[:offset])
-            relation = extend_relation_with(relation, :select, options[:select])
-            relation
-          end
-
-          def extend_relation_with(relation, method_name, value)
-            if value
-              relation.__send__(method_name, value)
-            else
-              relation
-            end
-          end
+          private
 
           def has_and_belongs_to_many_name
             reflection.options[:through]
diff --git a/lib/shoulda/matchers/rails_shim.rb b/lib/shoulda/matchers/rails_shim.rb
index 1ef422ba..7eb10b68 100644
--- a/lib/shoulda/matchers/rails_shim.rb
+++ b/lib/shoulda/matchers/rails_shim.rb
@@ -2,38 +2,6 @@ module Shoulda
   module Matchers
     # @private
     class RailsShim
-      def self.layouts_ivar
-        if action_pack_major_version >= 4
-          '@_layouts'
-        else
-          '@layouts'
-        end
-      end
-
-      def self.flashes_ivar
-        if action_pack_major_version >= 4
-          :@flashes
-        else
-          :@used
-        end
-      end
-
-      def self.clean_scope(klass)
-        if active_record_major_version == 4
-          klass.all
-        else
-          klass.scoped
-        end
-      end
-
-      def self.validates_confirmation_of_error_attribute(matcher)
-        if active_model_major_version == 4
-          matcher.confirmation_attribute
-        else
-          matcher.attribute
-        end
-      end
-
       def self.verb_for_update
         if action_pack_gte_4_1?
           :patch
@@ -91,14 +59,6 @@ module Shoulda
         ::ActiveRecord::VERSION::MAJOR
       end
 
-      def self.active_model_major_version
-        ::ActiveModel::VERSION::MAJOR
-      end
-
-      def self.action_pack_major_version
-        ::ActionPack::VERSION::MAJOR
-      end
-
       def self.action_pack_gte_4_1?
         Gem::Requirement.new('>= 4.1').satisfied_by?(action_pack_version)
       end
diff --git a/script/SUPPORTED_VERSIONS b/script/SUPPORTED_VERSIONS
index 88d03c30..bbe91881 100644
--- a/script/SUPPORTED_VERSIONS
+++ b/script/SUPPORTED_VERSIONS
@@ -1 +1 @@
-1.9.2 1.9.3 2.0.0 2.1.5
+2.0.0 2.1.5
diff --git a/script/update_gems_in_all_appraisals b/script/update_gems_in_all_appraisals
new file mode 100755
index 00000000..3a1da56b
--- /dev/null
+++ b/script/update_gems_in_all_appraisals
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+
+update-gems-for-version() {
+  local version="$1"
+  (export RBENV_VERSION=$version; bundle update "${@:2}" && bundle exec appraisal update "${@:2}")
+}
+
+for version in $SUPPORTED_VERSIONS; do
+  echo
+  echo "*** Updating gems for $version ***"
+  update-gems-for-version "$version" "$@"
+done
diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec
index b1b46484..07bb5345 100644
--- a/shoulda-matchers.gemspec
+++ b/shoulda-matchers.gemspec
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 1.9.2'
-  s.add_dependency('activesupport', '>= 3.0.0')
+  s.required_ruby_version = '>= 1.9.3'
+  s.add_dependency('activesupport', '>= 4.0.0')
 end
diff --git a/spec/support/unit/record_validating_confirmation_builder.rb b/spec/support/unit/record_validating_confirmation_builder.rb
index b1b9de78..40d23bc4 100644
--- a/spec/support/unit/record_validating_confirmation_builder.rb
+++ b/spec/support/unit/record_validating_confirmation_builder.rb
@@ -34,8 +34,7 @@ module UnitTests
     end
 
     def attribute_that_receives_error
-      Shoulda::Matchers::RailsShim.
-        validates_confirmation_of_error_attribute(self)
+      confirmation_attribute
     end
 
     protected
diff --git a/spec/unit/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb b/spec/unit/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb
index 2bf4a4b1..571d633e 100644
--- a/spec/unit/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb
+++ b/spec/unit/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb
@@ -52,11 +52,7 @@ describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher, type: :co
     def set_layout_in_context(context, layout)
       layouts = Hash.new(0)
       layouts[layout] = 1
-      context.instance_variable_set(layouts_ivar, layouts)
-    end
-
-    def layouts_ivar
-      Shoulda::Matchers::RailsShim.layouts_ivar
+      context.instance_variable_set('@_layouts', layouts)
     end
 
     def controller_without_layout
diff --git a/spec/unit_spec_helper.rb b/spec/unit_spec_helper.rb
index fd000746..1b1c3ec2 100644
--- a/spec/unit_spec_helper.rb
+++ b/spec/unit_spec_helper.rb
@@ -6,25 +6,10 @@ Tests::CurrentBundle.instance.assert_appraisal!
 
 require File.expand_path('../support/unit/rails_application', __FILE__)
 
-def monkey_patch_minitest_to_do_nothing
-  # Rails 3.1's test_help file requires Turn, which loads Minitest in autorun
-  # mode. This means that Minitest tests will run after these RSpec tests are
-  # finished running. This will break on CI since we pass --color to the `rspec`
-  # command.
-
-  if defined?(MiniTest)
-    MiniTest::Unit.class_eval do
-      def run(*); end
-    end
-  end
-end
-
 $test_app = UnitTests::RailsApplication.new
 $test_app.create
 $test_app.load
 
-monkey_patch_minitest_to_do_nothing
-
 ENV['BUNDLE_GEMFILE'] ||= app.gemfile_path
 ENV['RAILS_ENV'] = 'test'