Drop outdated Rubies and Rails, add Rails 7.1

Author: ledermann

.github/workflows/main.yml

@@ -12,36 +12,21 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.5'
-          - '2.6'
-          - '2.7'
           - '3.0'
+          - '3.1'
+          - '3.2'
         gemfile:
-          - gemfiles/rails_5_0.gemfile
-          - gemfiles/rails_5_1.gemfile
-          - gemfiles/rails_5_2.gemfile
-          - gemfiles/rails_6_0.gemfile
           - gemfiles/rails_6_1.gemfile
           - gemfiles/rails_7_0.gemfile
-        exclude:
-          - ruby_version: '2.5'
-            gemfile: gemfiles/rails_7_0.gemfile
-          - ruby_version: '2.6'
-            gemfile: gemfiles/rails_7_0.gemfile
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_5_0.gemfile
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_5_1.gemfile
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_5_2.gemfile
+          - gemfiles/rails_7_1.gemfile
 
     name: Ruby ${{ matrix.ruby_version }} / Gemfile ${{ matrix.gemfile }}
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -50,4 +35,6 @@ jobs:
           bundler-cache: true
 
       - name: RSpec
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: bundle exec rake

Appraisals

@@ -1,29 +1,14 @@
-appraise "rails-7-0" do
-  gem "activerecord", "~> 7.0.0"
-  gem "sqlite3", "~> 1.4"
+appraise 'rails-7-1' do
+  gem 'activerecord', '~> 7.1.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
-appraise "rails-6-1" do
-  gem "activerecord", "~> 6.1.2"
-  gem "sqlite3", "~> 1.4"
+appraise 'rails-7-0' do
+  gem 'activerecord', '~> 7.0.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
-appraise "rails-6-0" do
-  gem "activerecord", "~> 6.0.3.5"
-  gem "sqlite3", "~> 1.4"
-end
-
-appraise "rails-5-2" do
-  gem "activerecord", "~> 5.2.4.2"
-  gem "sqlite3", "~> 1.3", ">= 1.3.6"
-end
-
-appraise "rails-5-1" do
-  gem "activerecord", "~> 5.1.7"
-  gem "sqlite3", "~> 1.3", ">= 1.3.6"
-end
-
-appraise "rails-5-0" do
-  gem "activerecord", "~> 5.0.7.2"
-  gem 'sqlite3', '~> 1.3.6'
+appraise 'rails-6-1' do
+  gem 'activerecord', '~> 6.1.2'
+  gem 'sqlite3', '~> 1.4'
 end

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Georg Ledermann
+Copyright (c) 2016-2023 Georg Ledermann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -18,9 +18,8 @@ This Ruby gem enhances `ActiveRecord::Base` to save a draft version of the curre
 
 ## Requirements
 
-* Ruby 2.5 or newer
-* ActiveRecord 5.0 or newer (including 7.0)
-
+- Ruby 3.0 or newer
+- ActiveRecord 6.1 or newer (including 7.1)
 
 ## Installation
 

drafting.gemspec

@@ -6,27 +6,27 @@ Gem::Specification.new do |spec|
   spec.name          = "drafting"
   spec.version       = Drafting::VERSION
   spec.authors       = ["Georg Ledermann"]
-  spec.email         = ["mail@georg-ledermann.de"]
+  spec.email         = ["georg@ledermann.dev"]
 
   spec.summary       = %q{Save draft version of any ActiveRecord object}
   spec.description   = %q{}
   spec.homepage      = "https://github.com/ledermann/drafting"
   spec.license       = "MIT"
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0"
+  spec.add_dependency "activerecord", ">= 6.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "factory_bot"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls_reborn"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "generator_spec"

gemfiles/rails_7_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

lib/drafting.rb

@@ -8,8 +8,4 @@
 
 ActiveRecord::Base.extend Drafting::BaseClassMethods
 
-Drafting::MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
-  ActiveRecord::Migration[5.0]
-else
-  ActiveRecord::Migration
-end
+Drafting::MIGRATION_BASE_CLASS = ActiveRecord::Migration[6.1]

lib/generators/drafting/migration/migration_generator.rb

@@ -14,16 +14,12 @@ def create_migration_file
     end
 
     def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        # ensure timestamp of the multiple migration files generated
-        # will be different
-        timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        timestamp += 1 if current_migration_number(dirname) == timestamp
+      # ensure timestamp of the multiple migration files generated
+      # will be different
+      timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      timestamp += 1 if current_migration_number(dirname) == timestamp
 
-        timestamp
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
+      timestamp
     end
   end
 end

lib/generators/drafting/migration/templates/non_user_migration.rb

@@ -1,6 +1,7 @@
 class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS
   def self.up
-    add_column :drafts, :user_type, :string, index: true
+    add_column :drafts, :user_type, :string
+    add_index :drafts, :user_type
 
     # add in user_type for existing drafts table
     # for migration from old version

spec/lib/generators/drafting/migration/migration_generator_spec.rb

@@ -4,78 +4,65 @@
 
 module Drafting
   describe MigrationGenerator, type: :generator do
-    root_dir = File.expand_path("../../../../../../tmp", __FILE__)
+    root_dir = File.expand_path('../../../../../../tmp', __FILE__)
     destination root_dir
 
-    [
-      {
-        configuration: 'timestamped migrations',
-        timestamped_migrations: true
-      },
-      {
-        configuration: 'numeric prefix migrations',
-        timestamped_migrations: false
-      }
-    ].each do |test_suite|
-      describe test_suite[:configuration] do
+    describe 'timestamped migrations' do
+      describe 'new app' do
         before :each do
-          ActiveRecord::Base.timestamped_migrations = test_suite[:timestamped_migrations]
+          prepare_destination
+          run_generator
         end
 
-        describe 'new app' do
-          before :each do
-            prepare_destination
-            run_generator
-          end
+        it 'creates two installation db migration' do
+          migration_files =
+            Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
 
-          it "creates two installation db migration" do
-            migration_files =
-              Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
+          assert_equal migration_files.count, 2
 
-            assert_equal migration_files.count, 2
-
-            assert_file migration_files[0],
-              /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
-            assert_file migration_files[1],
-              /class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS/
-          end
+          assert_file migration_files[0],
+                      /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
+          assert_file migration_files[1],
+                      /class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS/
+        end
 
-          it "creates migration files of different timestamp" do
-            migration_files =
-              Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
+        it 'creates migration files of different timestamp' do
+          migration_files =
+            Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
 
-              migration_no1 = File.basename(migration_files[0]).split("_").first
-              migration_no2 = File.basename(migration_files[1]).split("_").first
+          migration_no1 = File.basename(migration_files[0]).split('_').first
+          migration_no2 = File.basename(migration_files[1]).split('_').first
 
-              assert_not_equal migration_no1, migration_no2
-          end
+          assert_not_equal migration_no1, migration_no2
         end
+      end
 
-        describe 'existing app' do
-          before :each do
-            prepare_destination
-            run_generator
-            FileUtils.rm Dir.glob("#{root_dir}/db/migrate/*non_user_drafting_migration.rb")
+      describe 'existing app' do
+        before :each do
+          prepare_destination
+          run_generator
+          FileUtils.rm Dir.glob(
+                         "#{root_dir}/db/migrate/*non_user_drafting_migration.rb",
+                       )
 
-            migration_files =
-              Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
-            expect(migration_files.count).to eq 1
-            assert_file migration_files[0],
-              /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
+          migration_files =
+            Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
+          expect(migration_files.count).to eq 1
+          assert_file migration_files[0],
+                      /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
 
-            run_generator
-          end
+          run_generator
+        end
 
-          it "creates only one more db migration" do
-            migration_files =
-              Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
-            expect(migration_files.count).to eq 2
+        it 'creates only one more db migration' do
+          migration_files =
+            Dir.glob("#{root_dir}/db/migrate/*drafting*.rb").sort
+          expect(migration_files.count).to eq 2
 
-            assert_file migration_files[0],
-              /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
-            assert_file migration_files[1],
-              /class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS/
-          end
+          assert_file migration_files[0],
+                      /class DraftingMigration < Drafting::MIGRATION_BASE_CLASS/
+          assert_file migration_files[1],
+                      /class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS/
         end
       end
     end