Merge pull request #78 from gocardless/rails-7

Add support for Rails 7, drop support for Rails < 6
gocardless · Dec 16, 2021 · 9fddab6 · 9fddab6
2 parents ae77194 + 18cc7fd
commit 9fddab6
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
         type: string
 
     docker:
-      - image: ruby:<<parameters.ruby-version>>
+      - image: cimg/ruby:<<parameters.ruby-version>>
         environment:
           - RAILS_VERSION=<<parameters.rails-version>>
     steps:
@@ -18,7 +18,7 @@ jobs:
       - restore_cache:
           key: anony-bundler-{{ checksum "anony.gemspec" }}
 
-      - run: gem install bundler -v 2.2.0
+      - run: gem install bundler -v 2.2.33
       - run: bundle config set path 'vendor/bundle'
       - run: bundle install
 
@@ -47,10 +47,8 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby-version: ["2.4", "2.5", "2.6", "2.7"]
-              rails-version: ["5.2", "6.0", "6.1"]
+              ruby-version: ["2.6", "2.7", "3.0"]
+              rails-version: ["6.0", "6.1", "7.0"]
             exclude:
-              - ruby-version: "2.4"
-                rails-version: "6.0"
-              - ruby-version: "2.4"
-                rails-version: "6.1"
+              - ruby-version: "2.6"
+                rails-version: "7.0"
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,7 +3,10 @@ inherit_gem:
   gc_ruboconfig: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
 
 Layout/LineLength:
   Max: 100
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.5
+3.0.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.1.0
+
+- Drop ruby 2.4 and 2.5 support
+- Unpin ActiveSupport for Rails 7
+
 # v1.0.2
 
 - Unpin ActiveSupport for Rails 6

diff --git a/anony.gemspec b/anony.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.add_development_dependency "bundler", "~> 2.2.0"
   spec.add_development_dependency "gc_ruboconfig", "~> 2.24.0"
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   # For integration testing
   spec.add_development_dependency "sqlite3", "~> 1.4.1"
 
-  spec.add_dependency "activerecord", ">= 5.2", "< 7"
-  spec.add_dependency "activesupport", ">= 5.2", "< 7"
+  spec.add_dependency "activerecord", ">= 5.2", "< 8"
+  spec.add_dependency "activesupport", ">= 5.2", "< 8"
 end
diff --git a/lib/anony/cops/define_deletion_strategy.rb b/lib/anony/cops/define_deletion_strategy.rb
@@ -24,7 +24,7 @@ module Lint
       #   class MyNewThing < ApplicationRecord; end
       class DefineDeletionStrategy < Cop
         MSG = "Define .anonymise for %<model>s, see https://github.com/gocardless/" \
-              "anony/blob/#{Anony::VERSION}/README.md for details"
+              "anony/blob/#{Anony::VERSION}/README.md for details".freeze
 
         def_node_search :uses_anonymise?, "(send nil? :anonymise)"
 

diff --git a/lib/anony/version.rb b/lib/anony/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anony
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end
diff --git a/spec/anony/anonymisable_spec.rb b/spec/anony/anonymisable_spec.rb
@@ -297,12 +297,10 @@ def some_instance_method?
 
   context "with ignored fields in Anony::Config" do
     around do |example|
-      begin
-        original_ignores = Anony::Config.ignores
-        example.call
-      ensure
-        Anony::Config.ignores = original_ignores
-      end
+      original_ignores = Anony::Config.ignores
+      example.call
+    ensure
+      Anony::Config.ignores = original_ignores
     end
 
     before { Anony::Config.ignore_fields(:id) }

diff --git a/spec/anony/config_spec.rb b/spec/anony/config_spec.rb
@@ -4,12 +4,10 @@
 
 RSpec.describe Anony::Config do
   around do |example|
-    begin
-      original_ignores = described_class.ignores
-      example.call
-    ensure
-      described_class.ignores = original_ignores
-    end
+    original_ignores = described_class.ignores
+    example.call
+  ensure
+    described_class.ignores = original_ignores
   end
 
   describe ".ignore?" do

diff --git a/spec/anony/field_level_strategies_spec.rb b/spec/anony/field_level_strategies_spec.rb
@@ -7,11 +7,9 @@
     let(:name) { :reverse }
 
     after do
-      begin
-        described_class.undef_method(name)
-      rescue StandardError
-        nil
-      end
+      described_class.undef_method(name)
+    rescue StandardError
+      nil
     end
 
     context "with a block" do