Drop Ruby 3.0 and Rails 6.1

.github/workflows/ruby.yml

@@ -32,12 +32,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.1', '3.2', '3.3']
         test: ['minitest', 'rspec']
         gemfile:
-          - Gemfile.rails61
           - Gemfile.rails70
           - Gemfile.rails71
+          - Gemfile.rails80
           - Gemfile.railsmaster
           - Gemfile.mongo_mapper
         db:
@@ -47,11 +47,9 @@ jobs:
         exclude:
           - gemfile: Gemfile.mongo_mapper
             db: postgresql
-          - ruby-version: '3.0'
-            gemfile: Gemfile.mongo_mapper
           - ruby-version: '3.1'
             gemfile: Gemfile.mongo_mapper
-          - ruby-version: '3.0'
+          - ruby-version: '3.1'
             gemfile: Gemfile.railsmaster
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"

CHANGELOG.md

@@ -1,3 +1,11 @@
+## master
+
+### bug fix
+
+### enchancements
+
+* Support only Ruby 3.1+ and Rails 7.0+. (by [@nashby](https://github.com/nashby))
+
 ## 2.8.1 (March 25, 2024)
 
 ### bug fix

Gemfile.rails80

@@ -0,0 +1,8 @@
+eval_gemfile('Gemfile.global')
+
+gem 'minitest', '~> 5.8'
+gem 'rails',    github: 'rails/rails', branch: '8-0-stable', require: false
+
+gem 'mongoid',  github: 'mongodb/mongoid'
+
+gem 'sqlite3', platforms: [:ruby, :mswin, :mingw]

README.md

@@ -46,8 +46,8 @@ Or install it yourself as:
 
 ## Supported Versions
 
-- Ruby 3.0+
-- Rails 6.1+
+- Ruby 3.1+
+- Rails 7.0+
 
 ## Usage
 

lib/enumerize/activerecord.rb

@@ -31,10 +31,6 @@ def enumerize(name, options={})
               attribute(name) do |subtype|
                 Type.new(enumerized_attributes[name], subtype)
               end
-            elsif ::ActiveRecord.version >= ::Gem::Version.new("6.1.0.alpha")
-              decorate_attribute_type(name.to_s) do |subtype|
-                Type.new(enumerized_attributes[name], subtype)
-              end
             else
               decorate_attribute_type(name, :enumerize) do |subtype|
                 Type.new(enumerized_attributes[name], subtype)

test/activerecord_test.rb

@@ -731,29 +731,27 @@ class AdminUser < User
     expect(admin.account_type).must_equal 'pro'
   end
 
-  if Rails::VERSION::MAJOR >= 6
-    it 'supports AR#insert_all' do
-      User.delete_all
+  it 'supports AR#insert_all' do
+    User.delete_all
 
-      User.insert_all([{ sex: :male }])
-      User.insert_all([{ status: :active }])
-      User.insert_all([{ interests: [:music, :sports] }])
+    User.insert_all([{ sex: :male }])
+    User.insert_all([{ status: :active }])
+    User.insert_all([{ interests: [:music, :sports] }])
 
-      expect(User.exists?(sex: :male)).must_equal true
-      expect(User.exists?(status: :active)).must_equal true
-      expect(User.exists?(interests: [:music, :sports])).must_equal true
-    end
+    expect(User.exists?(sex: :male)).must_equal true
+    expect(User.exists?(status: :active)).must_equal true
+    expect(User.exists?(interests: [:music, :sports])).must_equal true
+  end
 
-    it 'supports AR#upsert_all' do
-      User.delete_all
+  it 'supports AR#upsert_all' do
+    User.delete_all
 
-      User.upsert_all([{ sex: :male }])
-      User.upsert_all([{ status: :active }])
-      User.upsert_all([{ interests: [:music, :sports] }])
+    User.upsert_all([{ sex: :male }])
+    User.upsert_all([{ status: :active }])
+    User.upsert_all([{ interests: [:music, :sports] }])
 
-      expect(User.exists?(sex: :male)).must_equal true
-      expect(User.exists?(status: :active)).must_equal true
-      expect(User.exists?(interests: [:music, :sports])).must_equal true
-    end
+    expect(User.exists?(sex: :male)).must_equal true
+    expect(User.exists?(status: :active)).must_equal true
+    expect(User.exists?(interests: [:music, :sports])).must_equal true
   end
 end