Merge pull request #69 from code4lib/rails_6_too

Test under both ActiveRecord 5.2 and 6.0

Author: jrochkind

.gitignore

@@ -5,3 +5,6 @@
 
 # Exclude Gemfile.lock (best practice for gems)
 Gemfile.lock
+
+# Exclude appraisal .locks. per appraisal readme advice
+/gemfiles/*.lock

.travis.yml

@@ -1,9 +1,18 @@
 language: ruby
-rvm:
-  - 2.2.10
-  - 2.5.5
-  - 2.6.3
 matrix:
   allow_failures:
     - rvm: jruby-9.2.8.0
+      gemfile: gemfiles/rails_60.gemfile
+  include:
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.5.5
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.5.5
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: 2.6.3
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: jruby-9.2.8.0
+      gemfile: gemfiles/rails_60.gemfile
+
 script: bundle exec rake test

Appraisals

@@ -0,0 +1,9 @@
+# https://github.com/thoughtbot/appraisal
+
+appraise "rails-52" do
+  gem 'activerecord', '~> 5.2.0'
+end
+
+appraise "rails-60" do
+  gem 'activerecord', '~> 6.0.0'
+end

Gemfile

@@ -5,7 +5,6 @@ gemspec
 gem 'jruby-openssl', :platform => :jruby
 
 group :test do
-  gem 'activerecord', '~> 5.2.0'
   gem 'activerecord-jdbcsqlite3-adapter', :platform => [:jruby]
   gem 'libxml-ruby', :platform => [:ruby, :mswin]
   gem 'rake'

README.md

@@ -94,6 +94,19 @@ Tests are with Test::Unit, in a somewhat archaic/legacy style. Test setup especi
 
 There are also convenience tasks to run subsets of tests.
 
+We use [appraisal](https://github.com/thoughtbot/appraisal) to test ActiveRecord-related functionality under multiple versions of ActiveRecord. While the above commands will test with latest ActiveRecord (allowed in our .gemspec development dependency), you can test under a particular version defined in the [Appraisals](./Appraisals) file like so:
+
+    $ bundle exec appraisal rails-52 rake test
+    $ bundle exec appraisal rails-60 rake test
+
+If you run into trouble with appraisal's gemfiles getting out of date and bundler complaining,
+try:
+
+   $ bundle exec appraisal clean
+   $ appraisal generate
+
+That may make changes to appraisal gemfiles that you should commit to repo.
+
 License
 -------
 

gemfiles/rails_52.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", platform: :jruby
+gem "activerecord", "~> 5.2.0"
+
+group :test do
+  gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
+  gem "libxml-ruby", platform: [:ruby, :mswin]
+  gem "rake"
+  gem "yard"
+  gem "redcarpet", platform: :ruby
+  gem "kramdown", platform: :jruby
+  gem "test-unit"
+  gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin]
+end
+
+gemspec path: "../"

gemfiles/rails_60.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", platform: :jruby
+gem "activerecord", "~> 6.0.0"
+
+group :test do
+  gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby]
+  gem "libxml-ruby", platform: [:ruby, :mswin]
+  gem "rake"
+  gem "yard"
+  gem "redcarpet", platform: :ruby
+  gem "kramdown", platform: :jruby
+  gem "test-unit"
+  gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin]
+end
+
+gemspec path: "../"

lib/oai/provider.rb

@@ -137,6 +137,10 @@
 # It takes one required paramater, the class name of the AR class to wrap,
 # and optional hash of options.
 #
+# As of `oai` gem 1.0.0, Rails 5.2.x and Rails 6.0.x are supported.
+# Please check the .travis.yml file at root of repo to see what versions of ruby/rails
+# are being tested, in case this is out of date.
+#
 # Valid options include:
 #
 # * `timestamp_field` - Specifies the model field to use as the update

ruby-oai.gemspec

@@ -15,6 +15,10 @@ Gem::Specification.new do |s|
     s.add_dependency('faraday')
     s.add_dependency('faraday_middleware')
 
+    s.add_development_dependency "activerecord", ">= 5.2.0", "< 6.1"
+    s.add_development_dependency "appraisal"
+
+
     s.files = %w(README.md Rakefile) +
       Dir.glob("{bin,test,lib}/**/*") +
       Dir.glob("examples/**/*.rb")

test/activerecord_provider/config/connection.rb

@@ -13,6 +13,14 @@
 ActiveRecord::Base.establish_connection :adapter => "sqlite3",
                                         :database => ":memory:"
 
-ActiveRecord::MigrationContext.new(File.join(File.dirname(__FILE__), '..', 'database')).migrate
-
+if ActiveRecord.version < Gem::Version.new("6.0.0")
+  ActiveRecord::MigrationContext.new(
+    File.join(File.dirname(__FILE__), '..', 'database')
+  ).migrate
+else
+  ActiveRecord::MigrationContext.new(
+    File.join(File.dirname(__FILE__), '..', 'database'),
+    ActiveRecord::Base.connection.schema_migration
+  ).migrate
+end