Support testing on Rails 6.1 and 7.0

We don't have CI working on this repo (See #87), but I manually ran tests in Rails 5.2, 6.0. 6.1, and 7.0 -- it passed on all of them with no changes

BUT there was a deprecation notice in 7. I went ahead and fixed the deprecation notice (also confirming by manually running tests that still passed on all those versions).

This will at least allow manual testing on more recent Rails versions, as well as set the path for testing on recent Rails when we restore CI.

Author: jrochkind

Appraisals

@@ -7,3 +7,11 @@ end
 appraise "rails-60" do
   gem 'activerecord', '~> 6.0.0'
 end
+
+appraise "rails-61" do
+  gem 'activerecord', '~> 6.1.0'
+end
+
+appraise "rails-70" do
+  gem 'activerecord', '~> 7.0.0'
+end

README.md

@@ -97,7 +97,7 @@ 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
+    $ bundle exec appraisal rails-70 rake test
 
 If you run into trouble with appraisal's gemfiles getting out of date and bundler complaining,
 try:

gemfiles/rails_61.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", platform: :jruby
+gem "activerecord", "~> 6.1.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_70.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", platform: :jruby
+gem "activerecord", "~> 7.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/model/activerecord_wrapper.rb

@@ -192,7 +192,12 @@ def parse_to_local(time)
       time_obj = Time.parse(time.to_s)
       time_obj = yield(time_obj) if block_given?
       # Convert to same as DB - :local => :getlocal, :utc => :getutc
-      tzconv = "get#{model.default_timezone.to_s}".to_sym
+
+      if ActiveRecord::VERSION::MAJOR >= 7
+        tzconv = "get#{ActiveRecord.default_timezone.to_s}".to_sym
+      else
+        tzconv = "get#{model.default_timezone.to_s}".to_sym
+      end
       time_obj.send(tzconv).strftime("%Y-%m-%d %H:%M:%S")
     end
 

ruby-oai.gemspec

@@ -15,7 +15,7 @@ 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 "activerecord", ">= 5.2.0", "< 7.1"
     s.add_development_dependency "appraisal"
 
 

test/activerecord_provider/tc_ar_provider.rb

@@ -149,18 +149,4 @@ def setup
 
 end
 
-class ActiveRecordProviderTimezoneTest < ActiveRecordProviderTest
 
-  def setup
-    require 'active_record'
-    ActiveRecord::Base.default_timezone = :utc
-    super
-  end
-
-  def teardown
-    require 'active_record'
-    ActiveRecord::Base.default_timezone = :local
-    super
-  end
-
-end