From 1ae027010d88f607690d7ab1e4a78e6615fee23e Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Tue, 26 Dec 2023 07:09:27 +0100 Subject: [PATCH 1/3] Test against Ruby 3.3 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8883abc..5995fbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '3.0', '3.1', '3.2' ] + ruby: [ '3.0', '3.1', '3.2', '3.3' ] rails: [ '6.1', '7.0', '7.1' ] name: SQLite / Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} @@ -58,7 +58,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '3.0', '3.1', '3.2' ] + ruby: [ '3.0', '3.1', '3.2', '3.3' ] rails: [ '6.1', '7.0', '7.1' ] name: MySQL / Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '3.0', '3.1', '3.2' ] + ruby: [ '3.0', '3.1', '3.2', '3.3' ] rails: [ '6.1', '7.0', '7.1' ] name: PostgreSQL / Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} From b737eed34965d6a4b183ac1a8a2675bdcb7b09d6 Mon Sep 17 00:00:00 2001 From: James Adam Date: Fri, 9 Feb 2024 10:45:31 +0000 Subject: [PATCH 2/3] Fix migration generator to support Rails 7.1 As in 50285aca0b6ed44be192c7c808fb05ce85236b33 we need to support the new location of `timestamped_migrations` --- .../unread/migration/migration_generator.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/generators/unread/migration/migration_generator.rb b/lib/generators/unread/migration/migration_generator.rb index e197c9b..3684340 100644 --- a/lib/generators/unread/migration/migration_generator.rb +++ b/lib/generators/unread/migration/migration_generator.rb @@ -13,11 +13,22 @@ def create_migration_file end def self.next_migration_number(dirname) - if ActiveRecord::Base.timestamped_migrations + if self.timestamped_migrations? Time.now.utc.strftime("%Y%m%d%H%M%S") else "%.3d" % (current_migration_number(dirname) + 1) end end + + def self.timestamped_migrations? + ( + ActiveRecord::Base.respond_to?(:timestamped_migrations) && + ActiveRecord::Base.timestamped_migrations + ) || + ( + ActiveRecord.respond_to?(:timestamped_migrations) && + ActiveRecord.timestamped_migrations + ) + end end end From 67eafa8e32e4fea68da0f0684792a19c033f3e32 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Fri, 9 Feb 2024 12:57:16 +0100 Subject: [PATCH 3/3] Bump 0.13.1 --- lib/unread/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unread/version.rb b/lib/unread/version.rb index a8141b8..8339375 100644 --- a/lib/unread/version.rb +++ b/lib/unread/version.rb @@ -1,3 +1,3 @@ module Unread - VERSION = '0.13.0' + VERSION = '0.13.1' end