Merge branch 'rails:main' into main

Author: thiagopradi

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/ruby/.devcontainer/base.Dockerfile
 
-# [Choice] Ruby version: 3, 3.0, 2, 2.7, 2.6
-ARG VARIANT="3"
+# [Choice] Ruby version: 3, 3.3, 3.2, 3.1, 3.0, 2, 2.7, 2.6
+ARG VARIANT="3.3"
 FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

.devcontainer/docker-compose.yml renamed to .devcontainer/compose.yaml

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
 	"name": "Rails project development",
-	"dockerComposeFile": "docker-compose.yml",
+	"dockerComposeFile": "compose.yaml",
 	"service": "rails",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 

.devcontainer/devcontainer.json

@@ -9,32 +9,23 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     env:
-      BUNDLE_WITHOUT: db:job:cable:storage:ujs
+      BUNDLE_WITHOUT: db:job:cable:storage
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Ruby 3.2
+    - name: Remove Gemfile.lock
+      run: rm -f Gemfile.lock
+
+    - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
         bundler-cache: true
 
     - name: mdl
       run: bundle exec rake -f guides/Rakefile guides:lint
 
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install codespell==2.1.0
-    - name: Check spelling with codespell
-      run: codespell --ignore-words=codespell.txt --skip="./vendor/bundle,./actionview/test/ujs/public/vendor/qunit.js,./actiontext/app/assets/javascripts/trix.js,./yarn.lock" || exit 1
-
     - run: tools/railspect changelogs .
     - run: tools/railspect configuration .
 

.github/workflows/lint.yml

@@ -17,8 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - name: Remove Gemfile.lock
+        run: rm -f Gemfile.lock
+      - name: Set up Ruby 3.3
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
           bundler-cache: true
       - run: cd tools/rail_inspector && bundle exec rake

.github/workflows/rail_inspector.yml

@@ -2,19 +2,25 @@ name: rails-new-docker
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 env:
   APP_NAME: devrails
   APP_PATH: dev/devrails
-  BUNDLE_WITHOUT: db:job:cable:storage:ujs
+  BUNDLE_WITHOUT: db:job:cable:storage
 
 jobs:
   rails-new-docker:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
+    - name: Remove Gemfile.lock
+      run: rm -f Gemfile.lock
+    - name: Set up Ruby 3.3
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.2'
+        ruby-version: 3.3
         bundler-cache: true
     - name: Generate --dev app
       run: |
@@ -30,6 +36,7 @@ jobs:
         podman run --name $APP_NAME \
         -v $(pwd):$(pwd) \
         -e SECRET_KEY_BASE_DUMMY=1 \
+        -e DATABASE_URL=sqlite3:storage/production.sqlite3 \
         -p 3000:3000 $APP_NAME &
     - name: Test container
       run: ruby -r ./.github/workflows/scripts/test-container.rb

.github/workflows/rails-new-docker.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Ruby 3.2
+    - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
         bundler-cache: true
 
     - name: Run RuboCop

.github/workflows/rubocop.yml

@@ -9,6 +9,7 @@
 /dist/
 /doc/
 /guides/output/
+/preview/
 Brewfile.lock.json
 debug.log*
 node_modules/

.gitignore

@@ -6,7 +6,7 @@ require:
   - rubocop-md
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -69,6 +69,9 @@ Layout/ClosingParenthesisIndentation:
 Layout/CommentIndentation:
   Enabled: true
 
+Layout/DefEndAlignment:
+  Enabled: true
+
 Layout/ElseAlignment:
   Enabled: true
 
@@ -107,6 +110,7 @@ Layout/EmptyLinesAroundModuleBody:
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
   Enabled: true
+  EnforcedShorthandSyntax: either
 
 # Method definitions after `private` or `protected` isolated calls need one
 # extra level of indentation.
@@ -238,10 +242,19 @@ Lint/ErbNewArguments:
 Lint/EnsureReturn:
   Enabled: true
 
+Lint/MissingCopEnableDirective:
+  Enabled: true
+
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
 
+Lint/RedundantCopDisableDirective:
+  Enabled: true
+
+Lint/RedundantCopEnableDirective:
+  Enabled: true
+
 Lint/RedundantStringCoercion:
   Enabled: true
 
@@ -262,6 +275,9 @@ Lint/InterpolationCheck:
   Exclude:
     - '**/test/**/*'
 
+Lint/SafeNavigationChain:
+  Enabled: true
+
 Style/EvalWithLocation:
   Enabled: true
   Exclude:
@@ -304,6 +320,9 @@ Style/RedundantCondition:
 Style/RedundantDoubleSplatHashBraces:
   Enabled: true
 
+Style/ArrayIntersect:
+  Enabled: true
+
 Performance/BindCall:
   Enabled: true
 
@@ -367,6 +386,9 @@ Minitest/AssertWithExpectedArgument:
 Minitest/LiteralAsActualArgument:
   Enabled: true
 
+Minitest/NonExecutableTestMethod:
+  Enabled: true
+
 Minitest/SkipEnsure:
   Enabled: true
 

.rubocop.yml

@@ -15,9 +15,9 @@
 * If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/rails/rails/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
 * If possible, use the relevant bug report templates to create the issue. Simply copy the content of the appropriate template into a .rb file, make the necessary changes to demonstrate the issue, and **paste the content into the issue description**:
-  * [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/active_record_main.rb)
-  * [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/action_controller_main.rb)
-  * [**Generic template** for other issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/generic_main.rb)
+  * [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/active_record.rb)
+  * [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/action_controller.rb)
+  * [**Generic template** for other issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/generic.rb)
 
 * For more detailed information on submitting a bug report and creating an issue, visit our [reporting guidelines](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#reporting-an-issue).