Merge pull request #21 from blocknotes/ruby-3.0-support

Ruby 3.0 support

Author: Mattia Roccoberton

.github/workflows/specs_mysql.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0']
         gemfile: ['rails_6_1_mysql', 'rails_6_0_mysql']
 
     env:

.github/workflows/specs_mysql_rails7.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['2.7', '3.0']
         gemfile: ['rails_7_0_mysql']
 
     env:

.github/workflows/specs_postgres.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0']
         gemfile: ['rails_6_1_postgres', 'rails_6_0_postgres']
 
     env:

.github/workflows/specs_postgres_rails7.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['2.7', '3.0']
         gemfile: ['rails_7_0_postgres']
 
     env:

extra/Dockerfile_26

@@ -8,7 +8,6 @@ RUN gem install bundler
 # App setup
 WORKDIR /usr/src/app
 COPY .. .
-RUN bundle install
 
 # Setup the entrypoint script
 COPY extra/entrypoint.sh /usr/bin/

extra/Dockerfile_27

@@ -7,7 +7,6 @@ RUN apk add --no-cache --update build-base dpkg gcompat mysql-dev postgresql-dev
 # App setup
 WORKDIR /usr/src/app
 COPY .. .
-RUN bundle install
 
 # Setup the entrypoint script
 COPY extra/entrypoint.sh /usr/bin/

extra/Dockerfile_30

@@ -0,0 +1,15 @@
+FROM ruby:3.0-alpine
+
+ARG DB_TEST
+
+RUN apk add --no-cache --update build-base dpkg gcompat mysql-dev postgresql-dev tzdata
+
+# App setup
+WORKDIR /usr/src/app
+COPY .. .
+
+# Setup the entrypoint script
+COPY extra/entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+
+ENTRYPOINT ["entrypoint.sh"]

extra/docker-compose.yml

@@ -2,9 +2,15 @@
 version: "3.3"
 
 x-defaults:
-  tests: &base_tests
-    environment: &base_enviroment
+  tests_mysql: &tests_mysql
+    environment:
       CI: 1
+      DB_TEST: mysql
+      DB_PORT: 3306
+      MYSQL_DB_HOST: mysql
+      MYSQL_DB_NAME: test_db
+      MYSQL_DB_USERNAME: root
+      MYSQL_DB_PASSWORD: password
       RAILS_ENV: test
     command:
       - sh
@@ -17,6 +23,36 @@ x-defaults:
         bin/setup
         cd ../..
         bin/rspec
+    volumes:
+      - ..:/usr/src/app:delegated
+    depends_on:
+      - mysql
+
+  tests_postgres: &tests_postgres
+    environment:
+      CI: 1
+      DB_TEST: postgres
+      DB_PORT: 5432
+      PG_DB_HOST: postgres
+      PG_DB_NAME: test_db
+      PG_DB_USERNAME: postgres
+      PG_DB_PASSWORD: password
+      RAILS_ENV: test
+    command:
+      - sh
+      - -c
+      - |
+        while ! nc -z $${DB_TEST} $${DB_PORT} </dev/null
+        do echo "Waiting for DB ($${DB_TEST})..." && sleep 5; done
+        echo "DB is now available!"
+        cd spec/dummy
+        bin/setup
+        cd ../..
+        bin/rspec
+    volumes:
+      - ..:/usr/src/app:delegated
+    depends_on:
+      - postgres
 
 services:
   postgres:
@@ -30,74 +66,50 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: password
 
-  tests_26_pg:
-    <<: *base_tests
+  tests_26_mysql:
+    <<: *tests_mysql
     build:
       context: ..
-      dockerfile: extra/Dockerfile_27
+      dockerfile: extra/Dockerfile_26
       args:
-        DB_TEST: postgres
-    environment:
-      <<: *base_enviroment
-      DB_TEST: postgres
-      DB_PORT: 5432
-      PG_DB_HOST: postgres
-      PG_DB_NAME: postgres_26
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: password
-    depends_on:
-      - postgres
+        DB_TEST: mysql
 
-  tests_26_mysql:
-    <<: *base_tests
+  tests_26_postgres:
+    <<: *tests_postgres
     build:
       context: ..
       dockerfile: extra/Dockerfile_26
+      args:
+        DB_TEST: postgres
+
+  tests_27_mysql:
+    <<: *tests_mysql
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile_27
       args:
         DB_TEST: mysql
-    environment:
-      <<: *base_enviroment
-      DB_TEST: mysql
-      DB_PORT: 3306
-      MYSQL_DB_HOST: mysql
-      MYSQL_DB_NAME: mysql_26
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: password
-    depends_on:
-      - mysql
 
-  tests_27_pg:
-    <<: *base_tests
+  tests_27_postgres:
+    <<: *tests_postgres
     build:
       context: ..
       dockerfile: extra/Dockerfile_27
       args:
         DB_TEST: postgres
-    environment:
-      <<: *base_enviroment
-      DB_TEST: postgres
-      DB_PORT: 5432
-      PG_DB_HOST: postgres
-      PG_DB_NAME: postgres_27
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: password
-    depends_on:
-      - postgres
 
-  tests_27_mysql:
-    <<: *base_tests
+  tests_30_mysql:
+    <<: *tests_mysql
     build:
       context: ..
-      dockerfile: extra/Dockerfile_27
+      dockerfile: extra/Dockerfile_30
       args:
         DB_TEST: mysql
-    environment:
-      <<: *base_enviroment
-      DB_TEST: mysql
-      DB_PORT: 3306
-      MYSQL_DB_HOST: mysql
-      MYSQL_DB_NAME: mysql_27
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: password
-    depends_on:
-      - mysql
+
+  tests_30_postgres:
+    <<: *tests_postgres
+    build:
+      context: ..
+      dockerfile: extra/Dockerfile_30
+      args:
+        DB_TEST: postgres

lib/active_storage/service/db_service.rb

@@ -2,7 +2,7 @@
 
 module ActiveStorage
   class Service::DBService < Service
-    def initialize(**_options)
+    def initialize(**)
       @chunk_size = ENV.fetch('ASDB_CHUNK_SIZE') { 1.megabytes }
     end
 

spec/rails_helper.rb

@@ -37,6 +37,7 @@
   config.before(:suite) do
     intro = ('-' * 80)
     intro << "\n"
+    intro << "- Ruby:          #{RUBY_VERSION}\n"
     intro << "- Rails:         #{Rails.version}\n"
     intro << "- ActiveStorage: #{ActiveStorage.version}\n"
     intro << "- DB_TEST:       #{ENV['DB_TEST']}\n"