rack-graphql 2.6.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 845b505da7e26dbe5a9e5065514f0420de0c0394f09692afb6d49a134a35dcc2
-  data.tar.gz: 570b9ce45188d4371f18dd371468f77341535e54f574e06cc184e4e2aaf97adc
+  metadata.gz: ad85b5153fed695fa5a81a301fe3333490bdb8ab4064ea5068d51d1915007267
+  data.tar.gz: c8b8ba9d4e0e23d3c629bf7d6414e6c7208750b75ae9ac2056f669f46afacfdd
 SHA512:
-  metadata.gz: cbc0bbdad9edd52702b4bf7ad70dc46cf592a39e5a47fdb4031f87d1fcb29ca846555a8e05fa0e9620eb198f30212a17169444c6fe53be0a7083941bb8563a83
-  data.tar.gz: 11e95a8121612f0cd206cea8ac3109e02c5cc30a24524b1032b9d378926e0314a8c474b49e6c494a26d489e14f1e444b240c1f61ee330d5784d1d7c29639846e
+  metadata.gz: 6facfa29cc5605ec94a876b1c2085a1c9c701e851e38d1d4a99fcf7e621814471763e82b1793d4670c7c4d7b05e2559b8a846a211054a6323804111f7b63dd24
+  data.tar.gz: 3e4a84e3752823947acf281d02544bdff29878e580f3441f7f391e65f578bdc92cc2b146535301163fdb2862f5b6a1cb169258041e3ad189c261adfa4b22d141

data/.bundler-version

@@ -0,0 +1 @@
+2.3.5

data/.dependabot/config.yml

@@ -3,9 +3,14 @@ version: 1
 update_configs:
   - package_manager: "ruby:bundler"
     directory: "/"
-    update_schedule: "monthly"
+    update_schedule: "daily"
     commit_message:
       prefix: "[dependabot]"
     allowed_updates:
       - match:
-          update_type: "all"
+          dependency_type: "all"
+          update_type: "security"
+    automerged_updates:
+      - match:
+          dependency_type: "all"
+          update_type: "security:patch"

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,6 @@
-## Description
+## Description, motivation and context
 <!--- Describe your changes in detail -->
-
-## Related issue(s)
-<!--- GH issue number -->
-
-## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-
-## Screenshots (if appropriate):
-<!--- Please add any screenshots of the feature. -->
-
-## Related PRs
-<!--- Please add links to any related PRs (backend, component packages, etc). -->
+## Related issue(s) or PR(s)
+<!--- GH issue number -->

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

@@ -10,7 +10,7 @@ jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2.0.0
+    - uses: hmarr/auto-approve-action@v2
       if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake ci

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.7.0 - 2021-03-24
+
+- Add ability to skip setting up health endpoint on root path with `health_on_root_path` option.
+
+## 2.6.1 - 2021-01-14
+
+- Fix uninitialized `Timeout` error. The issue was fixed in https://github.com/rmosolgo/graphql-ruby/commit/56abba472dbb48a1f8445d41f928bea72b5148e9, but new version has not yet been relased.
+
 ## 2.6.0 - 2021-01-14
 
 - Add ability to re-raise exception (`re_raise_exceptions` option)

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    rack-graphql (2.6.0)
-      graphql (~> 1.11)
+    rack-graphql (2.7.2)
+      graphql (~> 1.12)
       oj
       rack (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    awesome_print (1.8.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
     coderay (1.1.3)
-    diff-lcs (1.4.4)
-    graphql (1.11.6)
+    diff-lcs (1.5.0)
+    graphql (1.13.4)
     method_source (1.0.0)
-    oj (3.11.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    oj (3.13.11)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -38,31 +38,34 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (1.8.0)
+    rspec-support (3.10.3)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.1.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
+  aarch64-linux-musl
+  x86_64-darwin-18
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -78,4 +81,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.2.4
+   2.3.5

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rack-graphql.svg)](https://rubygems.org/gems/rack-graphql)
-[![Build Status](https://travis-ci.org/RenoFi/rack-graphql.svg?branch=master)](https://travis-ci.org/RenoFi/rack-graphql)
+[![Build Status](https://github.com/RenoFi/rack-graphql/actions/workflows/ci.yml/badge.svg)](https://github.com/RenoFi/rack-graphql/actions/workflows/ci.yml?query=branch%3Amain)
 
 # rack-graphql
 
@@ -29,6 +29,7 @@ run RackGraphql::Application.call(
   log_exception_backtrace: !A9n.env.production?,    # optional, `false` default
   # `true` when `RACK_GRAPHQL_LOG_EXCEPTION_BACKTRACE` env var is set to `'1'` or `'true'`
   health_route: true,                               # optional, true by default
+  health_on_root_path: health_route,                # optional, health_route value by default (mind map '/' is covering '/any/path-123') 
   logger: A9n.logger,                               # optional, not set by default
   error_status_code_map: { IamTeapotError => 418 }, # optional
   re_raise_exceptions: true,                        # optional, false by default
@@ -87,32 +88,31 @@ RackGraphql.log_exception_backtrace = false
 To respect the graphql spec, all errors need to be returned as json and `rack-graphql` catches all exceptions and does NOT re-raise them. You can change this behavior via `re_raise_exceptions` argument.
 Because of this, using error tracking middleware (`use Sentry::Rack::CaptureExceptions`, `use Raven::Rack`) does not take any effect for graphql requests.
 
-To use Sentry or other reporting tool for graphql queries, you can use `GraphQL::Schema` middleware:
+To use Sentry or other reporting tool for graphql queries, you should handle it on graphql schema level:
 
 ```ruby
-class GraphqlErrorTrackerMiddleware
-  def self.call(parent_type, parent_object, field_definition, field_args, query_context)
-    yield
-  rescue StandardError => e
+class MySchema < GraphQL::Schema
+  rescue_from StandardError do |e, obj, args, ctx, field|
     extra = {
-      parent_type: parent_type.inspect,
-      parent_object: parent_object.inspect,
-      field_definition: field_definition.to_s,
-      field_args: field_args&.to_h,
-      query_context: query_context&.to_h
+      args: args,
+      field: field.inspect,
+      context: ctx
     }
     Sentry.capture_exception(e, extra: extra)
+    # re-raise to be handled by rack middleware
     raise
+    # or return execution error
+    ::GraphQL::ExecutionError.new(
+      exception.class.to_s,
+      options: { "http_status" => 500 },
+      extensions: {
+        "code" => exception.class.to_s,
+        "http_status" => 500,
+        "details" => exception.inspect
+      }
+    )
   end
 end
-
-# MySchema.middleware GraphqlErrorTrackerMiddleware
-# or
-# GraphQL::Schema.middleware GraphqlErrorTrackerMiddleware
-# or
-# class MySchema < GraphQL::Schema
-#   middleware GraphqlErrorTrackerMiddleware
-# end
 ```
 
 ## Contributing

data/Rakefile

@@ -5,4 +5,5 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
+task ci: %i[spec rubocop]
 task default: %i[spec rubocop:auto_correct]

data/lib/rack_graphql/application.rb

@@ -9,6 +9,7 @@ module RackGraphql
       log_exception_backtrace: RackGraphql.log_exception_backtrace,
       health_route: true,
       health_response_builder: RackGraphql::HealthResponseBuilder,
+      health_on_root_path: health_route,
       error_status_code_map: {}
     )
 
@@ -33,7 +34,9 @@ module RackGraphql
           map '/healthz' do
             run ->(env) { health_response_builder.new(app_name: app_name, env: env).build }
           end
+        end
 
+        if health_on_root_path
           map '/' do
             run ->(env) { health_response_builder.new(app_name: app_name, env: env).build }
           end

data/lib/rack_graphql/middleware.rb

@@ -70,7 +70,10 @@ module RackGraphql
         [Oj.dump('errors' => [exception_hash(e)])]
       ]
     ensure
-      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
+      if defined?(ActiveRecord::Base)
+        ActiveRecord::Base.clear_active_connections!
+        ActiveRecord::Base.flush_idle_connections!
+      end
     end
 
     private
@@ -178,6 +181,7 @@ module RackGraphql
 
     def log(message)
       return unless logger
+
       logger.debug("[rack-graphql] #{message}")
     end
 

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.7.2'.freeze
 end

data/lib/rack_graphql.rb

@@ -2,6 +2,10 @@ require 'oj'
 require 'rack'
 require 'graphql'
 
+# Timeout needs to be manually required before following fix is released:
+# https://github.com/rmosolgo/graphql-ruby/commit/56abba472dbb48a1f8445d41f928bea72b5148e9
+require 'timeout'
+
 require 'rack_graphql/version'
 require 'rack_graphql/exceptions'
 require 'rack_graphql/health_response_builder'

data/rack-graphql.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/rack-graphql'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/rack-graphql'
   spec.metadata['changelog_uri'] = 'https://github.com/RenoFi/rack-graphql/blob/master/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
@@ -25,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'graphql', '~> 1.11'
+  spec.add_dependency 'graphql', '~> 1.12'
   spec.add_dependency 'oj'
   spec.add_dependency 'rack', '~> 2.2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundler-version"
 - ".dependabot/config.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
@@ -194,9 +195,9 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
 - ".github/workflows/auto-merge.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -218,6 +219,7 @@ metadata:
   homepage_uri: https://github.com/RenoFi/rack-graphql
   source_code_uri: https://github.com/RenoFi/rack-graphql
   changelog_uri: https://github.com/RenoFi/rack-graphql/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -233,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.

data/.travis.yml

@@ -1,12 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-  - 3.0
-before_install: gem install bundler
-script:
-  - bundle exec rake rubocop
-  - bundle exec rake spec