Merge pull request #106 from maschwenk/master

Support Rails 5.1

Author: rafaelfranca

.travis.yml

@@ -13,6 +13,7 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_edge.gemfile
 matrix:
   fast_finish: true
@@ -23,6 +24,12 @@ matrix:
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.1.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.0.0

Appraisals

@@ -1,8 +1,10 @@
-[ '4.0', '4.1', '4.2' , '5.0' ].each do |ver|
+[ '4.0', '4.1', '4.2' , '5.0', '5.1' ].each do |ver|
+  nokogiri_ver = ver.to_i < 5 ? '1.6' : '1.7'
   appraise "rails-#{ver}" do
     gem 'actionpack',   "~> #{ver}.0"
     gem 'activerecord', "~> #{ver}.0"
     gem 'railties',     "~> #{ver}.0"
+    gem 'nokogiri',     "~> #{nokogiri_ver}.0"
   end
 end
 

activerecord-session_store.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options.concat ['--main',  'README.md']
 
-  s.add_dependency('activerecord', '>= 4.0', '< 5.1')
-  s.add_dependency('actionpack', '>= 4.0', '< 5.1')
-  s.add_dependency('railties', '>= 4.0', '< 5.1')
+  s.add_dependency('activerecord', '>= 4.0', '< 5.2')
+  s.add_dependency('actionpack', '>= 4.0', '< 5.2')
+  s.add_dependency('railties', '>= 4.0', '< 5.2')
   s.add_dependency('rack', '>= 1.5.2', '< 3')
   s.add_dependency('multi_json', '~> 1.11', '>= 1.11.2')
 

gemfiles/rails_4.0.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 4.0.0"
 gem "activerecord", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
+gem "nokogiri", "~> 1.6.0"
 
 gemspec :path => "../"

gemfiles/rails_4.1.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 4.1.0"
 gem "activerecord", "~> 4.1.0"
 gem "railties", "~> 4.1.0"
+gem "nokogiri", "~> 1.6.0"
 
 gemspec :path => "../"

gemfiles/rails_4.2.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 4.2.0"
 gem "activerecord", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
+gem "nokogiri", "~> 1.6.0"
 
 gemspec :path => "../"

gemfiles/rails_5.0.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 5.0.0"
 gem "activerecord", "~> 5.0.0"
 gem "railties", "~> 5.0.0"
+gem "nokogiri", "~> 1.7.0"
 
 gemspec :path => "../"

gemfiles/rails_5.1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 5.1.0"
+gem "activerecord", "~> 5.1.0"
+gem "railties", "~> 5.1.0"
+gem "nokogiri", "~> 1.7.0"
+
+gemspec :path => "../"

test/tasks/database_rake_test.rb

@@ -4,7 +4,8 @@
 module ActiveRecord
   module SessionStore
     class DatabaseRakeTest < ActiveSupport::TestCase
-      class AddTimestampsToSession < ActiveRecord::Migration
+      migration_class = ActiveRecord::VERSION::MAJOR < 5 ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+      class AddTimestampsToSession < migration_class
         self.verbose = false
 
         def change