- Add ruby 4.0 in GH action

ericproulx · ericproulx · commit 115dd4a39bbb · 2025-12-27T13:01:45.000+01:00
- Fix gemfile versioning for rails
- Update Dockerfile to use slim
- Update specs
- Remove rack_3 integration tests
diff --git a/.github/workflows/edge.yml b/.github/workflows/edge.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4', ruby-head, truffleruby-head, jruby-head]
+        ruby: ['3.1', '3.2', '3.3', '3.4', '4.0', ruby-head, truffleruby-head, jruby-head]
         gemfile: [rails_edge, rack_edge]
         exclude:
           - ruby: '3.1'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,28 +23,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4']
-        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rack_3_2.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile, gemfiles/rails_8_1.gemfile]
-        specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
+        ruby: ['3.1', '3.2', '3.3', '3.4', '4.0']
+        gemfile:
+          - Gemfile
+          - gemfiles/rack_2_2.gemfile
+          - gemfiles/rack_3_0.gemfile
+          - gemfiles/rack_3_1.gemfile
+          - gemfiles/rack_3_2.gemfile
+          - gemfiles/rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
+          - gemfiles/rails_8_0.gemfile
+          - gemfiles/rails_8_1.gemfile
+        specs: ['spec --exclude-pattern=spec/integration/{grape_entity,hashie,dry_validation,multi_*}/*_spec.rb']
         include:
-          - ruby: '3.3'
+          - ruby: '4.0'
             gemfile: gemfiles/grape_entity.gemfile
             specs: 'spec/integration/grape_entity'
-          - ruby: '3.3'
+          - ruby: '4.0'
             gemfile: gemfiles/hashie.gemfile
             specs: 'spec/integration/hashie'
-          - ruby: '3.3'
+          - ruby: '4.0'
             gemfile: gemfiles/dry_validation.gemfile
             specs: 'spec/integration/dry_validation'
-          - ruby: '3.3'
-            gemfile: gemfiles/rails_7_1.gemfile
-            specs: 'spec/integration/rails'
-          - ruby: '3.3'
-            gemfile: gemfiles/rails_7_2.gemfile
-            specs: 'spec/integration/rails'
-          - ruby: '3.3'
-            gemfile: gemfiles/rails_8_0.gemfile
-            specs: 'spec/integration/rails'
+          - ruby: '4.0'
+            gemfile: gemfiles/multi_json.gemfile
+            specs: 'spec/integration/multi_json'
+          - ruby: '4.0'
+            gemfile: gemfiles/multi_xml.gemfile
+            specs: 'spec/integration/multi_xml'
         exclude:
           - ruby: '3.1'
             gemfile: gemfiles/rails_8_0.gemfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: docker/Dockerfile
       args:
-        - RUBY_VERSION=${RUBY_VERSION:-3}
+        - RUBY_VERSION=${RUBY_VERSION:-4.0}
     stdin_open: true
     tty: true
     volumes:
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,15 +1,17 @@
-ARG RUBY_VERSION=3
-FROM ruby:${RUBY_VERSION}-alpine
+ARG RUBY_VERSION=4
+FROM ruby:${RUBY_VERSION}-slim
 
 ENV BUNDLE_PATH /usr/local/bundle/gems
 ENV LIB_PATH /var/grape
-ENV RUBYOPT --enable-frozen-string-literal --yjit
-ENV LD_PRELOAD libjemalloc.so.2
-ENV MALLOC_CONF dirty_decay_ms:1000,narenas:2,background_thread:true
 
-RUN apk add --update --no-cache make gcc git libc-dev yaml-dev gcompat jemalloc && \
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential curl git pkg-config libyaml-dev libjemalloc2 && \
     gem update --system && gem install bundler
 
+ENV LD_PRELOAD libjemalloc.so.2
+ENV MALLOC_CONF dirty_decay_ms:1000,narenas:2,background_thread:true
+ENV RUBYOPT --enable-frozen-string-literal --yjit
+
 WORKDIR $LIB_PATH
 
 COPY /docker/entrypoint.sh /usr/local/bin/docker-entrypoint.sh
diff --git a/gemfiles/rack_2_2.gemfile b/gemfiles/rack_2_2.gemfile
@@ -2,4 +2,4 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rack', '~> 2.0'
+gem 'rack', '~> 2.2.0'
diff --git a/gemfiles/rack_3_1.gemfile b/gemfiles/rack_3_1.gemfile
@@ -2,4 +2,4 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rack', '~> 3.1'
+gem 'rack', '~> 3.1.0'
diff --git a/gemfiles/rack_3_2.gemfile b/gemfiles/rack_3_2.gemfile
@@ -2,4 +2,4 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rack', '~> 3.2'
+gem 'rack', '~> 3.2.0'
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
@@ -2,5 +2,5 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rails', '~> 8.0'
+gem 'rails', '~> 8.0.0'
 gem 'tzinfo-data', require: false
diff --git a/gemfiles/rails_8_1.gemfile b/gemfiles/rails_8_1.gemfile
@@ -2,5 +2,5 @@
 
 eval_gemfile '../Gemfile'
 
-gem 'rails', '~> 8.1'
+gem 'rails', '~> 8.1.0'
 gem 'tzinfo-data', require: false
diff --git a/lib/grape.rb b/lib/grape.rb
@@ -71,5 +71,5 @@ def self.deprecator
 
 # https://api.rubyonrails.org/classes/ActiveSupport/Deprecation.html
 # adding Grape.deprecator to Rails App if any
-require 'grape/railtie' if defined?(Rails::Railtie) && ActiveSupport.gem_version >= Gem::Version.new('7.1')
+require 'grape/railtie' if defined?(Rails::Railtie)
 loader.eager_load
diff --git a/lib/grape/dsl/declared.rb b/lib/grape/dsl/declared.rb
@@ -105,7 +105,7 @@ def handle_passed_param(params_nested_path, has_passed_children: false, &_block)
           {}
         elsif type == 'Array' || (type&.start_with?('[') && !type.include?(','))
           []
-        elsif type == 'Set' || type&.start_with?('#<Set')
+        elsif type == 'Set' || type&.start_with?('#<Set', 'Set')
           Set.new
         else
           yield
diff --git a/spec/grape/endpoint/declared_spec.rb b/spec/grape/endpoint/declared_spec.rb
@@ -196,12 +196,13 @@
       it 'sets objects with type=Set to be a set' do
         get '/declared?first=present'
         expect(last_response).to be_successful
+        json_empty_set = JSON.parse(Set.new.to_json)
 
         body = JSON.parse(last_response.body)
-        expect(['#<Set: {}>', []]).to include(body['empty_set'])
-        expect(['#<Set: {}>', []]).to include(body['empty_typed_set'])
-        expect(['#<Set: {}>', []]).to include(body['nested']['empty_set'])
-        expect(['#<Set: {}>', []]).to include(body['nested']['empty_typed_set'])
+        expect(body['empty_set']).to eq(json_empty_set)
+        expect(body['empty_typed_set']).to eq(json_empty_set)
+        expect(body['nested']['empty_set']).to eq(json_empty_set)
+        expect(body['nested']['empty_typed_set']).to eq(json_empty_set)
       end
 
       it 'sets objects with type=Array to be an array' do
diff --git a/spec/grape/validations/validators/coerce_validator_spec.rb b/spec/grape/validations/validators/coerce_validator_spec.rb
@@ -1119,7 +1119,8 @@ def self.parse(_val)
 
           get '/', d: %w[1 two]
           expect(last_response).to be_successful
-          expect(last_response.body).to eq('#<Set: {1, "two"}>')
+          json_set = JSON.parse(Set.new([1, 'two']).to_json)
+          expect(last_response.body).to eq(json_set)
         end
       end
 
diff --git a/spec/integration/hashie/hashie_spec.rb b/spec/integration/hashie/hashie_spec.rb
@@ -240,7 +240,8 @@
 
           get '/', d: %w[1 two]
           expect(last_response).to be_successful
-          expect(last_response.body).to eq('#<Set: {1, "two"}>')
+          json_set = JSON.parse([1, 'two'].to_set.to_json)
+          expect(last_response.body).to eq(json_set)
         end
       end
     end
diff --git a/spec/integration/rack_3_0/headers_spec.rb b/spec/integration/rack_3_0/headers_spec.rb
diff --git a/spec/integration/rack_3_0/version_spec.rb b/spec/integration/rack_3_0/version_spec.rb
diff --git a/spec/integration/rails/railtie_spec.rb b/spec/integration/rails/railtie_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(Rails) && ActiveSupport.gem_version >= Gem::Version.new('7.1')
+if defined?(Rails)
   describe Grape::Railtie do
     describe '.railtie' do
       subject { test_app.deprecators[:grape] }

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`eval_gemfile '../Gemfile'`
`4`	`4`
`5`		`-gem 'rack', '~> 2.0'`
	`5`	`+gem 'rack', '~> 2.2.0'`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`eval_gemfile '../Gemfile'`
`4`	`4`
`5`		`-gem 'rack', '~> 3.1'`
	`5`	`+gem 'rack', '~> 3.1.0'`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`eval_gemfile '../Gemfile'`
`4`	`4`
`5`		`-gem 'rack', '~> 3.2'`
	`5`	`+gem 'rack', '~> 3.2.0'`