diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index a437088..af5236c 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: ruby-version: [ '2.7', '3.0', '3.1'] - rails: ['5_0', '5_1', '5_2', '6_0', '6_1', '7_0'] + rails: ['5_0', '5_1', '5_2', '6_0', '6_1', '7_0', '7_1'] exclude: # exclude unsupported ruby versions: https://github.com/rails/rails/issues/40938 - ruby-version: '3.0' diff --git a/Appraisals b/Appraisals index aff8851..1fbe806 100644 --- a/Appraisals +++ b/Appraisals @@ -40,3 +40,9 @@ appraise "activerecord_7_0" do gem "activesupport", "~> 7.0.0" gem "pg", "~> 1.1" end + +appraise "activerecord_7_1" do + gem "activerecord", "~> 7.1.0" + gem "activesupport", "~> 7.1.0" + gem "pg", "~> 1.1" +end diff --git a/crypt_keeper.gemspec b/crypt_keeper.gemspec index c742ebd..447825c 100644 --- a/crypt_keeper.gemspec +++ b/crypt_keeper.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |gem| gem.post_install_message = "WARNING: CryptKeeper 2.0 contains breaking changes and may require you to reencrypt your data! Please view the README at https://github.com/jmazzi/crypt_keeper for more information." - gem.add_runtime_dependency 'activerecord', '>= 4.2', '~> 7.0.0' - gem.add_runtime_dependency 'activesupport', '>= 4.2', '~> 7.0.0' + gem.add_runtime_dependency 'activerecord', '>= 4.2', '< 7.2.0' + gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 7.2.0' gem.add_development_dependency 'rspec', '~> 3.5.0' gem.add_development_dependency 'guard', '~> 2.6.1' diff --git a/gemfiles/activerecord_7_1.gemfile b/gemfiles/activerecord_7_1.gemfile new file mode 100644 index 0000000..663bb1e --- /dev/null +++ b/gemfiles/activerecord_7_1.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord", "~> 7.1.0" +gem "activesupport", "~> 7.1.0" +gem "pg", "~> 1.1" + +gemspec :path => "../" diff --git a/lib/crypt_keeper/model.rb b/lib/crypt_keeper/model.rb index 7a18ed1..6b3ec33 100644 --- a/lib/crypt_keeper/model.rb +++ b/lib/crypt_keeper/model.rb @@ -69,7 +69,7 @@ def crypt_keeper(*args) end crypt_keeper_fields.each do |field| - serialize field, encryptor + serialize field, coder: encryptor end end