rack-graphql 3.3.0.beta → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532f0f16301ca51cb072332f905ab255514d771fbf45e78b4841843acd4dc11e
-  data.tar.gz: 595f33e14ca13493367d7c6bd956fff2f43f1202ab698e1f7641220e46cf8cc0
+  metadata.gz: c5d4ffebb36635210874227b52711af8973b7d882843b19ea29be127bde361e7
+  data.tar.gz: ebe79a3fc4bed9259a8d22f915701d9424376866abc082b8c7567afdb1754999
 SHA512:
-  metadata.gz: 7a59eacd519ad77e4848090c18bd823889ed7d7e1edb51004739b83caadf9ea4d91bdd9f4d275c639b3165564160130e1762ab32820de67e0abc7ef3ce57cea7
-  data.tar.gz: 27624f4f2e3b79f71520ee41bb9455493a4d64b01cfabd402a9db9141a6551fbf7a76613a0bfccf81698080f82d30fa473997304e62c726c7274b51d6fddd47e
+  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.3.0.beta)
+    rack-graphql (3.3.0)
       graphql (~> 2.0)
       oj
       rack (>= 2.2.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.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.3.0.beta
+  version: 3.3.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-11 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: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.