rack-graphql 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dadb267c8ff9335ea2509782e862a43a4baf20e30fd8b98c0106ac69864a21f
-  data.tar.gz: 0735c228c451e039c3464278f509c792dd28275e165b82ea70d262bd5f3b38f6
+  metadata.gz: c5d4ffebb36635210874227b52711af8973b7d882843b19ea29be127bde361e7
+  data.tar.gz: ebe79a3fc4bed9259a8d22f915701d9424376866abc082b8c7567afdb1754999
 SHA512:
-  metadata.gz: 0040707da5153a109f9d8b5247251a55750006aa92445d2710251015e1420024ac1cbc5fbc6698e87fc2d96f06209737738106b5fb93d2147d9b5c4796ac5911
-  data.tar.gz: 750abe3e69e19a5e7e6dae568b7dcdddda0d6e85b913308327d03cd7f4cc9e85b7919a5f9193a7fd1a891715c5f27ed2662266aa2c3fb032104aefd5218bda5a
+  metadata.gz: ec6cb68ea5a1f5184428a1edee0b9c7349f8cafa14dde3f64ae627d5880506272982b945d77c8c0772ff9a5539dd70689a77aebed80a62825ce4f2dc41fa4fb3
+  data.tar.gz: 16e0f39e00e0c1e956c61b4dc353a96f706d264b9d48ba4d297c51732e0fa2b2d28260b0ec4a8b162537fd709203b951c9249fef49432050093d1f58cb16e112

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 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.2.0)
+    rack-graphql (3.3.0)
       graphql (~> 2.0)
       oj
       rack (>= 2.2.6)
@@ -11,10 +11,10 @@ GEM
   specs:
     ast (2.4.2)
     awesome_print (1.9.2)
-    base64 (0.1.1)
     coderay (1.1.3)
     diff-lcs (1.5.0)
-    graphql (2.1.1)
+    graphql (2.1.6)
+      racc (~> 1.4)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
@@ -26,13 +26,13 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (3.0.8)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
+    rake (13.1.0)
+    regexp_parser (2.8.2)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -47,19 +47,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       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)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
@@ -67,8 +66,8 @@ GEM
       rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)

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
@@ -74,12 +76,15 @@ module RackGraphql
         { 'Content-Type' => 'application/json', STATUS_CODE_HEADER_NAME => status_code },
         [Oj.dump('errors' => [exception_hash(e)])]
       ]
+    ensure
+      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'
@@ -116,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)
@@ -134,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.2.0'.freeze
+  VERSION = '3.3.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 = '>= 3.1'
 
   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.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-23 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.