Rails 7 support (#91)

Author: marcqualie

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   bundle:
     docker:
-      - image: circleci/ruby:2.7.1
+      - image: circleci/ruby:2.7.5
     working_directory: /mnt/ramdisk
     steps:
       - checkout
@@ -13,7 +13,7 @@ jobs:
       - run:
           name: bundle install
           command: |
-            gem install bundler -v '2.1.4'
+            gem install bundler -v '2.3.4'
             bundle install --path=vendor/bundle --jobs=4 --retry=3
       - save_cache:
           key: bundler-{{ checksum "diffcrypt.gemspec" }}-{{ .Environment.CACHE_VERSION }}
@@ -22,7 +22,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/ruby:2.7.1
+      - image: circleci/ruby:2.7.5
     working_directory: /mnt/ramdisk
     steps:
       - checkout
@@ -32,7 +32,7 @@ jobs:
       - run:
           name: bundle install
           command: |
-            gem install bundler -v '2.1.4'
+            gem install bundler -v '2.3.4'
             bundle install --path=vendor/bundle --jobs=4 --retry=3
       - run:
           name: Setup Code Climate test-reporter
@@ -48,7 +48,7 @@ jobs:
             ./cc-test-reporter after-build --coverage-input-type lcov --exit-code $?
   rubocop:
     docker:
-      - image: circleci/ruby:2.7.1
+      - image: circleci/ruby:2.7.5
     working_directory: /mnt/ramdisk
     steps:
       - checkout
@@ -58,7 +58,7 @@ jobs:
       - run:
           name: bundle install
           command: |
-            gem install bundler -v '2.1.4'
+            gem install bundler -v '2.3.4'
             bundle install --path=vendor/bundle --jobs=4 --retry=3
       - run:
           name: rubocop

.rubocop.yml

@@ -9,6 +9,11 @@ Style/Documentation:
   Enabled: false
 Metrics/MethodLength:
   Exclude:
+    - test/*_test.rb
+    - test/**/*_test.rb
+Naming/VariableNumber:
+  Exclude:
+    - test/*_test.rb
     - test/**/*_test.rb
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma
@@ -21,4 +26,5 @@ Style/AccessorGrouping:
 
 Layout/LineLength:
   Exclude:
+    - test/*_test.rb
     - test/**/*_test.rb

Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.4.3'
 gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.17.0'
 gem 'simplecov', '~> 0.21.2', require: false # CodeClimate not compatible with 0.18+ yet - https://github.com/codeclimate/test-reporter/issues/413

diffcrypt.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.executables = %w[diffcrypt]
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 6.2'
+  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.1'
   spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
 end

lib/diffcrypt/rails/encrypted_configuration.rb

@@ -4,6 +4,8 @@
 require 'pathname'
 require 'tmpdir'
 
+require 'active_support/isolated_execution_state' if Gem.loaded_specs['activesupport'].version.to_s.index('7.')&.zero?
+
 require 'active_support/ordered_options'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/module/delegation'

test/rails_test.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'bundler'
+
+require 'open3'
+
+RAILS_VERSIONS = %w[
+  6.0.4.4
+  6.1.4.4
+  7.0.0
+].freeze
+
+RAILS_FLAGS = %w[
+  --api
+  --skip-action-cable
+  --skip-active-storage
+  --skip-bundle
+  --skip-git
+  --skip-javascript
+  --skip-keeps
+  --skip-system-test
+  --skip-test
+].freeze
+
+TMP_RAILS_ROOT = File.join(__dir__, '../tmp/test')
+
+# Helper to ensure we raise if command is not successful
+def run_command(*command)
+  stdout, stderr, status = Open3.capture3(*command)
+  if status.success? == false
+    errors = [
+      "  Command Failed: #{command.join(' ')}",
+      stdout.split("\n").map { |line| "    #{line}" }.join("\n"),
+      stderr.split("\n").map { |line| "    #{line}" }.join("\n"),
+    ]
+    raise errors.join("\n")
+  end
+
+  [stdout, stderr, status]
+end
+
+class RailsTest < Minitest::Test
+  def setup
+    FileUtils.mkdir_p(TMP_RAILS_ROOT) unless Dir.exist?(TMP_RAILS_ROOT)
+  end
+
+  RAILS_VERSIONS.each do |rails_version|
+    define_method "test_that_rails_#{rails_version.gsub('.', '_')}_works" do
+      Bundler.with_unbundled_env do
+        Dir.chdir(TMP_RAILS_ROOT) do
+          tmp_version_root = "rails_#{rails_version.gsub('.', '_')}"
+          FileUtils.remove_dir(tmp_version_root) if Dir.exist?(tmp_version_root)
+          run_command('gem', 'install', 'rails', '--version', rails_version)
+          run_command('rails', "_#{rails_version}_", 'new', *RAILS_FLAGS, tmp_version_root)
+          Dir.chdir(tmp_version_root) do
+            File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a')
+            run_command('bundle', 'install')
+            stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version')
+            assert_equal rails_version, stdout.strip
+          end
+        end
+      end
+    end
+  end
+end

test/test_helper.rb

@@ -24,4 +24,8 @@
 TEST_KEY_128 = ::File.read("#{__dir__}/fixtures/aes-128-gcm.key").strip
 TEST_KEY_256 = ::File.read("#{__dir__}/fixtures/aes-256-gcm.key").strip
 
+# Custom test output
+require 'minitest/reporters'
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
 require 'minitest/autorun'