Merge pull request #21 from cookpad/upgrade-supported-versions

Support Ruby 3.4 and ActiveRecord 7.2

Author: akouryy

.github/workflows/test.yml

@@ -11,26 +11,27 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.7
-          - 3.0
           - 3.1
+          - 3.2
+          - 3.3
+          - 3.4
         env:
           - ARMG_TEST_MYSQL_PORT=10056 ARMG_TEST_MYSQL_ENGINE=MyISAM
           - ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=MyISAM
           - ARMG_TEST_MYSQL_PORT=10057 ARMG_TEST_MYSQL_ENGINE=InnoDB
           - ARMG_TEST_MYSQL_PORT=10080 ARMG_TEST_MYSQL_ENGINE=MyISAM
           - ARMG_TEST_MYSQL_PORT=10080 ARMG_TEST_MYSQL_ENGINE=InnoDB
         gemfile:
-          - gemfiles/ar60.gemfile
-          - gemfiles/ar61.gemfile
           - gemfiles/ar70.gemfile
+          - gemfiles/ar71.gemfile
+          - gemfiles/ar72.gemfile
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: gemfiles/vendor/bundle
           key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles('ridgepole.gemspec', '**/Gemfile', matrix.gemfile) }}
@@ -39,7 +40,7 @@ jobs:
 
       - name: Setup dependencies
         run: |
-          for i in {1..60}; do docker-compose up -d && break; sleep 1; done
+          for i in {1..60}; do docker compose up -d && break; sleep 1; done
 
           gem install bundler
           bundle config path vendor/bundle

CHANGELOG.md

@@ -8,12 +8,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+- Support ActiveRecord 7.1 and 7.2 [#21](https://github.com/cookpad/armg/pull/21)
+- Support Ruby 3.2, 3.3, and 3.4 [#21](https://github.com/cookpad/armg/pull/21)
+
 ### Changed
 
 ### Deprecated
 
 ### Removed
 
+- Drop support for ActiveRecord 6.0 and 6.1 [#21](https://github.com/cookpad/armg/pull/21)
+- Drop support for Ruby 2.7 and 3.0 [#21](https://github.com/cookpad/armg/pull/21)
+
 ### Fixed
 
 ### Security

README.md

@@ -155,7 +155,13 @@ Apply `Schemafile`
 No change
 ```
 
-## Limitation on MySQL 8.0
+## Supported versions
+
+- Ruby 3.1 to 3.4
+- ActiveRecord 7.0 to 7.2
+- MySQL 5.6 to 8.0
+
+### Limitation on MySQL 8.0
 
 At the moment, armg gem supports only SRIDs with long-lat axis order in MySQL 8.0.
 e.g. SRID=3857 (WGS 84 / Pseudo-Mercator -- Spherical Mercator, Google Maps, OpenStreetMap, Bing, ArcGIS, ESRI)

armg.gemspec

@@ -26,8 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 6', '< 8'
   spec.add_dependency 'rgeo'
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
+  spec.add_development_dependency 'base64'
+  spec.add_development_dependency 'bigdecimal'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'erbh', '>= 0.1.2'
+  spec.add_development_dependency 'mutex_m'
   spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'

gemfiles/ar70.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
+gem "concurrent-ruby", "1.3.4" # https://stackoverflow.com/questions/79360526
 
 gemspec path: "../"

gemfiles/ar60.gemfile renamed to gemfiles/ar71.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"

gemfiles/ar61.gemfile renamed to gemfiles/ar72.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.0"
+gem "activerecord", "~> 7.2.0"
 
 gemspec path: "../"

spec/mysql_helper.rb

@@ -21,7 +21,12 @@ def reset
 
   def dump
     buf = StringIO.new
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, buf)
+    if ActiveRecord.version >= Gem::Version.new('7.2')
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, buf)
+    else
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, buf)
+    end
+
     buf = buf.string.sub(/\A.*\bActiveRecord::Schema(?:\[[\d.]+\])?\.define\(version: \d+\) do/m, '').sub(/end\s*\z/, '')
     schema = buf.lines.map { |l| l.sub(/\A  /, '') }.join.strip