rack-graphql 3.3.0.beta → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532f0f16301ca51cb072332f905ab255514d771fbf45e78b4841843acd4dc11e
-  data.tar.gz: 595f33e14ca13493367d7c6bd956fff2f43f1202ab698e1f7641220e46cf8cc0
+  metadata.gz: 499d61ebe65ca554ac40efcfb74dffe22850ab8456e339444f65a171f95b9809
+  data.tar.gz: 2107b50e6fbaecde8ee25440686a9ac0121fa4625ef9aaeddc3c347144520b73
 SHA512:
-  metadata.gz: 7a59eacd519ad77e4848090c18bd823889ed7d7e1edb51004739b83caadf9ea4d91bdd9f4d275c639b3165564160130e1762ab32820de67e0abc7ef3ce57cea7
-  data.tar.gz: 27624f4f2e3b79f71520ee41bb9455493a4d64b01cfabd402a9db9141a6551fbf7a76613a0bfccf81698080f82d30fa473997304e62c726c7274b51d6fddd47e
+  metadata.gz: ea8390fe89e7a32d17c017f63a4ba08971dc652dc1aef67f0895494e8c72c26802fc3da15ed7ce5c279585875b6151de4241f4b56091c2c7e2d2cfbf9f620e8b
+  data.tar.gz: 4ab5cb0f925617682347476cb7b26f840ed8bb594aa7800718f664fccb711555335cf1b7c3f7216849cdd2158493aafff3f39c9903a0b54e442a83b1eb24a68e

data/.bundler-version

@@ -1 +1 @@
-2.4.21
+2.5.6

data/.dependabot/config.yml

@@ -1,19 +1,15 @@
-version: 1
+version: 2
 
-update_configs:
-  - package_manager: "ruby:bundler"
+updates:
+  - package-ecosystem: "bundler"
     directory: "/"
-    update_schedule: "daily"
-    commit_message:
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "UTC"
+    commit-message:
       prefix: "[dependabot]"
-    allowed_updates:
-      - match:
-          dependency_type: "all"
-          update_type: "security"
-    automerged_updates:
-      - match:
-          dependency_type: "all"
-          update_type: "security:patch"
     labels:
       - "automerge"
       - "dependencies"

data/.github/workflows/auto-approve.yml

@@ -8,6 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'dependencies')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge-dependencies.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.15.6
+        uses: pascalgn/automerge-action@v0.16.2
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash
           MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: dependencies
+          MERGE_LABELS: "dependencies,!automerge blocked"
           MERGE_REMOVE_LABELS: ""

data/.github/workflows/auto-merge.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.15.6
+        uses: pascalgn/automerge-action@v0.16.2
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -7,11 +7,11 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  ci_tests_ruby:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.1, 3.2]
+        ruby-version: [3.1, 3.2, 3.3]
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.3.1 - 2024-02-29
+- make ruby 3.1 a minimum version
+
+## 3.3.0 - 2023-11-23
+
+- add `request_epilogue` so actions like `ActiveRecord::Base.connection_handler.clear_active_connections!` can be passed manually
+- ruby 3.1 is the minimal ruby version
+
 ## 3.1.3 - 2023-10-10
 
 - use `ActiveRecord::Base.connection_handler.clear_active_connections!` instead of ActiveRecord::Base.clear_active_connections!`, which is deprecated

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-graphql (3.3.0.beta)
+    rack-graphql (3.5.0)
       graphql (~> 2.0)
       oj
       rack (>= 2.2.6)
@@ -11,62 +11,67 @@ GEM
   specs:
     ast (2.4.2)
     awesome_print (1.9.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     coderay (1.1.3)
-    diff-lcs (1.5.0)
-    graphql (2.1.6)
-      racc (~> 1.4)
-    json (2.6.3)
+    diff-lcs (1.5.1)
+    graphql (2.2.11)
+      base64
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    oj (3.16.1)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    prism (0.24.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.7.3)
-    rack (3.0.8)
+    rack (3.0.9.1)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-ast (1.31.0)
+      parser (>= 3.3.0.4)
+      prism (>= 0.24.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -95,4 +100,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.4.20
+   2.5.6

data/README.md

@@ -34,6 +34,7 @@ run RackGraphql::Application.call(
   logger: A9n.logger,                               # optional, not set by default
   error_status_code_map: { IamTeapotError => 418 }, # optional
   re_raise_exceptions: true,                        # optional, false by default
+  request_epilogue: -> { ActiveRecord::Base.connection_handler.clear_active_connections! }
 )
 ```
 

data/lib/rack_graphql/application.rb

@@ -11,29 +11,31 @@ module RackGraphql
       health_response_builder: RackGraphql::HealthResponseBuilder,
       health_on_root_path: health_route,
       root_path_app: nil,
-      error_status_code_map: {}
+      error_status_code_map: {},
+      request_epilogue: -> {}
     )
 
       ::Rack::Builder.new do
         map '/graphql' do
           run RackGraphql::Middleware.new(
-            app_name: app_name,
-            schema: schema,
-            context_handler: context_handler,
-            re_raise_exceptions: re_raise_exceptions,
-            logger: logger,
-            log_exception_backtrace: log_exception_backtrace,
-            error_status_code_map: error_status_code_map,
+            app_name:,
+            schema:,
+            context_handler:,
+            re_raise_exceptions:,
+            logger:,
+            log_exception_backtrace:,
+            error_status_code_map:,
+            request_epilogue:,
           )
         end
 
         if health_route
           map '/health' do
-            run ->(env) { health_response_builder.new(app_name: app_name, env: env).build }
+            run ->(env) { health_response_builder.new(app_name:, env:).build }
           end
 
           map '/healthz' do
-            run ->(env) { health_response_builder.new(app_name: app_name, env: env).build }
+            run ->(env) { health_response_builder.new(app_name:, env:).build }
           end
         end
 
@@ -43,7 +45,7 @@ module RackGraphql
           end
         elsif health_on_root_path
           map '/' do
-            run ->(env) { health_response_builder.new(app_name: app_name, env: env).build }
+            run ->(env) { health_response_builder.new(app_name:, env:).build }
           end
         end
       end

data/lib/rack_graphql/middleware.rb

@@ -13,7 +13,8 @@ module RackGraphql
       logger: nil,
       log_exception_backtrace: RackGraphql.log_exception_backtrace,
       re_raise_exceptions: false,
-      error_status_code_map: {}
+      error_status_code_map: {},
+      request_epilogue: -> {}
     )
 
       @schema = schema
@@ -23,6 +24,7 @@ module RackGraphql
       @log_exception_backtrace = log_exception_backtrace
       @re_raise_exceptions = re_raise_exceptions
       @error_status_code_map = error_status_code_map
+      @request_epilogue = request_epilogue || -> {}
     end
 
     def call(env)
@@ -37,12 +39,12 @@ module RackGraphql
       context = context_handler.call(env)
 
       log("Executing with params: #{params.inspect}, operationName: #{operation_name}, variables: #{variables.inspect}")
-      result = execute(params: params, operation_name: operation_name, variables: variables, context: context)
+      result = execute(params:, operation_name:, variables:, context:)
       status_code = response_status(result)
 
       [
         status_code,
-        response_headers(result, status_code: status_code),
+        response_headers(result, status_code:),
         [response_body(result)]
       ]
     rescue AmbiguousParamError => e
@@ -75,14 +77,14 @@ module RackGraphql
         [Oj.dump('errors' => [exception_hash(e)])]
       ]
     ensure
-      ActiveRecord::Base.connection_handler.flush_idle_connections!(:all) if defined?(ActiveRecord::Base)
-      ActiveRecord::Base.connection_handler.clear_active_connections!(:all) if defined?(ActiveRecord::Base)
+      request_epilogue.call
     end
 
     private
 
     attr_reader :schema, :app_name, :logger, :context_handler,
-      :log_exception_backtrace, :error_status_code_map, :re_raise_exceptions
+      :log_exception_backtrace, :error_status_code_map,
+      :re_raise_exceptions, :request_epilogue
 
     def post_request?(env)
       env['REQUEST_METHOD'] == 'POST'
@@ -119,14 +121,14 @@ module RackGraphql
 
     def execute(params:, operation_name:, variables:, context:)
       if valid_multiplex?(params)
-        execute_multi(params['_json'], operation_name: operation_name, variables: variables, context: context)
+        execute_multi(params['_json'], operation_name:, variables:, context:)
       else
-        execute_single(params['query'], operation_name: operation_name, variables: variables, context: context)
+        execute_single(params['query'], operation_name:, variables:, context:)
       end
     end
 
     def execute_single(query, operation_name:, variables:, context:)
-      schema.execute(query, operation_name: operation_name, variables: variables, context: context)
+      schema.execute(query, operation_name:, variables:, context:)
     end
 
     def valid_multiplex?(params)
@@ -137,9 +139,9 @@ module RackGraphql
       queries = queries_params.map do |param|
         {
           query: param['query'],
-          operation_name: operation_name,
-          variables: variables,
-          context: context
+          operation_name:,
+          variables:,
+          context:
         }
       end
 

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '3.3.0.beta'.freeze
+  VERSION = '3.5.0'.freeze
 end

data/rack-graphql.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
 
   spec.add_dependency 'graphql', '~> 2.0'
   spec.add_dependency 'oj'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 3.3.0.beta
+  version: 3.5.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -101,14 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.