Merge branch 'master' into gmac/v3_complexity_update

Author: rmosolgo

Diff for: .github/workflows/ci.yaml

@@ -9,26 +9,29 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.4
         bundler-cache: true
     - run: bundle exec rake rubocop
   system_tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
+    - uses: shogo82148/actions-setup-redis@v1
       with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle exec rake compile
+        redis-version: "7.x"
+    - run: redis-cli ping
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.4
         bundler-cache: true
       env:
-        BUNDLE_GEMFILE: ./spec/dummy/Gemfile
-    - run: bundle exec rails test:system
+        BUNDLE_GEMS__GRAPHQL__PRO: ${{ secrets.BUNDLE_GEMS__GRAPHQL__PRO }}
+        BUNDLE_GEMFILE: gemfiles/rails_master.gemfile
+    - run: bin/rails test:all
       working-directory: ./spec/dummy
+      env:
+        BUNDLE_GEMS__GRAPHQL__PRO: ${{ secrets.BUNDLE_GEMS__GRAPHQL__PRO }}
+        BUNDLE_GEMFILE: ../../gemfiles/rails_master.gemfile
   # Some coverage goals of these tests:
   # - Test once without Rails at all
   # - Test postgres, to make sure that the ActiveRecord
@@ -43,40 +46,65 @@ jobs:
       matrix:
         include:
           - gemfile: Gemfile
-            ruby: 3.2
-          # Rails 6.1 is tested with Postgresql below
+            ruby: 3.4
+          - gemfile: Gemfile
+            ruby: 2.7 # lowest supported version
           - gemfile: gemfiles/rails_7.0.gemfile
             ruby: 3.1
-          - gemfile: gemfiles/rails_master.gemfile
-            ruby: 3.1
           - gemfile: gemfiles/rails_7.0.gemfile
             ruby: 3.2
           - gemfile: gemfiles/rails_7.1.gemfile
             ruby: 3.3
           - gemfile: gemfiles/rails_master.gemfile
             ruby: 3.3
+            graphql_reject_numbers_followed_by_names: 1
+            redis: 1
+          - gemfile: gemfiles/rails_master.gemfile
+            ruby: 3.4
+            graphql_reject_numbers_followed_by_names: 1
+            isolation_level_fiber: 1
+            redis: 1
     runs-on: ubuntu-latest
     steps:
     - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV
+    - run: echo GRAPHQL_REJECT_NUMBERS_FOLLOWED_BY_NAMES=1 > $GITHUB_ENV
+      if: ${{ !!matrix.graphql_reject_numbers_followed_by_names }}
+    - run: echo ISOLATION_LEVEL_FIBER=1 > $GITHUB_ENV
+      if: ${{ !!matrix.isolation_level_fiber }}
+    - uses: shogo82148/actions-setup-redis@v1
+      with:
+        redis-version: "7.x"
+      if: ${{ !!matrix.redis }}
+    - run: redis-cli ping
+      if: ${{ !!matrix.redis }}
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-        bundler: ${{ matrix.bundler || 'default' }}
     - run: bundle exec rake compile
     - run: bundle exec rake test
   javascript_test:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/setup-node@v4
       with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle exec rake js:all
+        node-version: '21'
+    - run: npm ci
+      working-directory: ./javascript_client
+    - run: npm test
+      working-directory: ./javascript_client
   postgres_test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+        - gemfile: gemfiles/rails_master.gemfile
+          ruby: 3.3
+          isolation_level_fiber: 1
+        - gemfile: gemfiles/rails_7.1_postgresql.gemfile
+          ruby: 3.3
     services:
       postgres:
         image: postgres:latest
@@ -93,23 +121,25 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - run: echo BUNDLE_GEMFILE='gemfiles/rails_6.1_postgresql.gemfile' > $GITHUB_ENV
+    - run: echo BUNDLE_GEMFILE='' > $GITHUB_ENV
     - run: echo DATABASE='POSTGRESQL' > $GITHUB_ENV
     - run: echo PGPASSWORD='postgres' > $GITHUB_ENV
     - run: echo GRAPHQL_CPARSER=1 > $GITHUB_ENV
+    - run: echo ISOLATION_LEVEL_FIBER=1 > $GITHUB_ENV
+      if: ${{ !!matrix.isolation_level_fiber }}
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: "3.3"
         bundler-cache: true
     - run: bundle exec rake compile test
   mongodb_test:
     strategy:
       fail-fast: false
       matrix:
         gemfile:
-          - gemfiles/mongoid_6.gemfile
-          - gemfiles/mongoid_7.gemfile
+          - gemfiles/mongoid_9.gemfile
+          - gemfiles/mongoid_8.gemfile
     runs-on: ubuntu-latest
     services:
       mongodb:
@@ -121,6 +151,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.4
         bundler-cache: true
     - run: bundle exec rake compile test

Diff for: .github/workflows/pronto.yaml

@@ -0,0 +1,22 @@
+name: Pronto
+on:
+  - pull_request_target
+
+jobs:
+  pronto:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo BUNDLE_GEMFILE=gemfiles/pronto.gemfile > $GITHUB_ENV
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.4
+          bundler-cache: true
+      - name: Run Pronto
+        run: bundle exec pronto run -f github_pr -c origin/${{ github.base_ref }}
+        env:
+          PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
+          PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"

Diff for: .gitignore

@@ -7,20 +7,25 @@ Gemfile.lock
 gemfiles/*.lock
 # Test database
 *.db
+*.db-shm
+*.db-wal
+*.sqlite3
+.byebug_history
 .bundle/
 vendor/
 .idea/
+coverage/
 
 _site
 .sass-cache
 .jekyll-metadata
 .jekyll-cache
 gh-pages/
 tmp/*
-__*.db
 node_modules/
 yarn.lock
 OperationStoreClient.js
+DumpPayloadExample.json
 spec/integration/tmp
 .vscode/
 *.swp

Diff for: .rubocop.yml

@@ -1,14 +1,16 @@
 require:
   - ./cop/development/none_without_block_cop
+  - ./cop/development/no_eval_cop
   - ./cop/development/no_focus_cop
   - ./lib/graphql/rubocop/graphql/default_null_true
   - ./lib/graphql/rubocop/graphql/default_required_true
   - ./cop/development/context_is_passed_cop
+  - ./cop/development/trace_methods_cop.rb
 
 AllCops:
   DisabledByDefault: true
   SuggestExtensions: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   Exclude:
     - 'lib/graphql/language/lexer.rb'
     - 'lib/graphql/language/parser.rb'
@@ -22,20 +24,9 @@ Development/ContextIsPassedCop:
   Exclude:
     - 'spec/**/*'
     - 'cop/**/*'
-    # Legacy-related:
-    - 'lib/graphql/*_type.rb'
-    - 'lib/graphql/define/**/*.rb'
-    - 'lib/graphql/relay/**/*'
-    - 'lib/graphql/function.rb'
-    - 'lib/graphql/directive.rb'
-    - 'lib/graphql/field.rb'
-    - 'lib/graphql/schema/traversal.rb'
-    - 'lib/graphql/schema/possible_types.rb'
     - 'lib/graphql/schema/validation.rb'
-    - 'lib/graphql/compatibility/**/*'
     - 'lib/graphql/static_validation/literal_validator.rb'
     - 'lib/graphql/static_validation/rules/**/*.rb'
-    - 'lib/graphql/internal_representation/**/*.rb'
     # AST-related:
     - 'lib/graphql/schema/build_from_definition.rb'
     - 'lib/graphql/language/printer.rb'
@@ -51,10 +42,19 @@ Development/NoneWithoutBlockCop:
     - "lib/**/*"
     - "spec/**/*"
 
+Development/NoEvalCop:
+  Include:
+    - "lib/**/*"
+
 Development/NoFocusCop:
   Include:
     - "spec/**/*"
 
+Development/TraceMethodsCop:
+  Include:
+    - "lib/graphql/tracing/perfetto_trace.rb"
+    - "lib/graphql/tracing/notifications_trace.rb"
+
 # def ...
 # end
 Layout/DefEndAlignment:

Diff for: CHANGELOG-enterprise.md

@@ -8,7 +8,51 @@
 
 ### Bug Fix
 
-# 1.3.3 (30 Jan 2024
+# 1.5.6 (13 Dec 2024)
+
+- ObjectCache: Add `CacheableRelation` helper for top-level ActiveRecord relations
+
+# 1.5.5 (10 Dec 2024)
+
+- Changesets: Add missing `ensure_loaded` call for class-based changesets
+
+# 1.5.4 (31 Oct 2024)
+
+- ObjectCache: Add `reauthorize_cached_objects: false`
+
+# 1.5.3 (1 Oct 2024)
+
+- Limiters: Add expiration to rate limit data (to reduce Redis footprint)
+
+# 1.5.2 (6 Sept 2024)
+
+- Limiters: Add `connection_pool:` support
+
+# 1.5.1 (30 Aug 2024)
+
+- ObjectCache: Add `connection_pool:` support
+
+# 1.5.0 (26 Jul 2024)
+
+- ObjectCache: Add Dalli backend for Memcached
+
+# 1.4.2 (11 Jun 2024)
+
+- ObjectCache: Add `Schema.fingerprint` hook and `context[:refresh_object_cache]`
+
+# 1.4.1 (30 May 2024)
+
+- ObjectCache: properly handle when object fingerprints are evicted but the cached result wasn't
+
+# 1.4.0 (11 Apr 2024)
+
+- ObjectCache: add support for `redis_cluster: ...` backend
+
+# 1.3.4 (18 Mar 2024)
+
+- ObjectCache: use new `trace_with` API for instrumentation
+
+# 1.3.3 (30 Jan 2024)
 
 - ObjectCache: fix compatibility with `run_graphql_field` test helper #4816