Merge pull request #30 from alpaca-tc/support-rails-8

Remove eol rails 6.1 & add rails 8.0

.github/workflows/ci.yml

@@ -30,8 +30,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: ['6.1_stable', '7.0_stable', '7.1_stable', '7.2_stable']
+        gemfile: ['7.0_stable', '7.1_stable', '7.2_stable', '8.0_stable']
         ruby-version: ['3.1', '3.2', '3.3']
+        exclude:
+          - ruby-version: '3.1'
+            gemfile: '8.0_stable'
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

Appraisals

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-appraise '6.1-stable' do
-  gem 'activerecord', '~> 6.1.0'
-  gem 'sqlite3', '~> 1.7.0'
-end
-
 appraise '7.0-stable' do
   gem 'activerecord', '~> 7.0.0'
   gem 'sqlite3', '~> 1.7.0'
@@ -18,3 +13,7 @@ end
 appraise '7.2-stable' do
   gem 'activerecord', '~> 7.2.0'
 end
+
+appraise '8.0-stable' do
+  gem 'activerecord', '~> 8.0.0'
+end

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.0
+
+* **Breaking Changes** Rails 6.1 is no longer supported. #30
+* Support Rails 8.0.0 #30
+
 ## 2.0.0
 
 * **Breaking Changes** Rails 6.0 is no longer supported. #28

active_record_bitmask.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 6.1'
+  spec.add_dependency 'activerecord', '>= 7.0'
 end

gemfiles/6.1_stable.gemfile → gemfiles/8.0_stable.gemfile

@@ -7,7 +7,7 @@ gem "rubocop", "1.28.2"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "sqlite3", "~> 1.7.0"
-gem "activerecord", "~> 6.1.0"
+gem "sqlite3"
+gem "activerecord", "~> 8.0.0"
 
 gemspec path: "../"

lib/active_record_bitmask/model.rb

@@ -52,20 +52,15 @@ def bitmask_for(attribute)
 
       def define_bitmask_attribute(attribute, map)
         if ActiveRecord.gem_version >= Gem::Version.new('7.2.0')
-          # Greater than or equal to 7.0.0
+          # Greater than or equal to 7.2.0
           decorate_attributes([attribute]) do |name, subtype|
             ActiveRecordBitmask::BitmaskType.new(name, map, subtype)
           end
-        elsif ActiveRecord.gem_version >= Gem::Version.new('7.0.0')
+        else
           # Greater than or equal to 7.0.0
           attribute(attribute) do |subtype|
             ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
           end
-        else
-          # Equal to 6.1.0
-          decorate_attribute_type(attribute) do |subtype|
-            ActiveRecordBitmask::BitmaskType.new(attribute, map, subtype)
-          end
         end
       end