rack-graphql 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed279cfd6141712d12b1fdad133524bbf7810fd55617d63acee1db40ad4cf0e9
-  data.tar.gz: cbf2ebf25d524c00f0776da35bda3750d939a534398853187fd14cf8355abffa
+  metadata.gz: 78d6b07dd0b65feaf7bf1f42b8f5ed607e47c865a6fb1c774b8c79265a699618
+  data.tar.gz: c733bce94eae77c43c12ce94213c049ca20dea104da4a46de5a3ae182cbf3a44
 SHA512:
-  metadata.gz: 4f999354bfca22277c4c3e582c16e3a5362ddaafd1809257ffac5951359851bc187ad4410abc72cc549d578fab2f4f5254d0724691b6b5cb3e96fb7616c982cb
-  data.tar.gz: bdefebeef6fd3e936a04d84ae5a9a0f20c9fcfae573b30154f455c05e55ae012a4836c0edd7be291cbc3317d34926043a08c77fc0dbdbdd0b3818f72acd7bc6c
+  metadata.gz: de1e1d0ad8a05da26ab297161a06df874d0a2192c3ea3c9d98e6501ee0b4f6af1844c0d5b79ddad668f25bda11bb5eafb16c97fe2627c4b6783e05cb973e03b0
+  data.tar.gz: b421f740d27f958728fb07f287ae4666cec11e7312362ae863a7d5f120b1241f2fdd163fc640f7565e369fc9bd81d4956893a2342b2f47ee08d9a10aae5de355

data/.bundler-version

@@ -1 +1 @@
-2.3.26
+2.4.3

data/.dependabot/config.yml

@@ -14,3 +14,6 @@ update_configs:
       - match:
           dependency_type: "all"
           update_type: "security:patch"
+    labels:
+      - "automerge"
+      - "dependencies"

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

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

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.1.0 - 2023-01-17
+
+- Add X-Http-Status-Code to every response, so clients can recognize graphql errors w/o parsing gql response.
+
+## 3.0.1 - 2023-01-17
+
+-  allow running on rack 2.x, so it can work with apps having sinatra installed (sinatra doesn't support rack 3.x)
+
 ## 3.0.0 - 2022-12-15
 
 - support rack 3.x and graphql 2.x

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rack-graphql (3.0.0)
+    rack-graphql (3.1.0)
       graphql (~> 2.0)
       oj
-      rack (~> 3.0)
+      rack (>= 2.2.6)
 
 GEM
   remote: https://rubygems.org/
@@ -13,17 +13,17 @@ GEM
     awesome_print (1.9.2)
     coderay (1.1.3)
     diff-lcs (1.5.0)
-    graphql (2.0.15)
+    graphql (2.0.16)
     json (2.6.3)
     method_source (1.0.0)
     oj (3.13.23)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (3.0.2)
+    rack (3.0.4)
     rack-test (2.0.2)
       rack (>= 1.3)
     rainbow (3.1.1)
@@ -36,31 +36,34 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.40.0)
+    rubocop (1.43.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.16.0)
+    rubocop-rspec (2.18.0)
       rubocop (~> 1.33)
+      rubocop-capybara
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   aarch64-linux-musl

data/lib/rack_graphql/middleware.rb

@@ -2,6 +2,7 @@ module RackGraphql
   class Middleware
     DEFAULT_STATUS_CODE = 200
     DEFAULT_ERROR_STATUS_CODE = 500
+    STATUS_CODE_HEADER_NAME = 'X-Http-Status-Code'.freeze
     NULL_BYTE = '\u0000'.freeze
 
     def initialize(
@@ -36,10 +37,11 @@ module RackGraphql
 
       log("Executing with params: #{params.inspect}, operationName: #{operation_name}, variables: #{variables.inspect}")
       result = execute(params: params, operation_name: operation_name, variables: variables, context: context)
+      status_code = response_status(result)
 
       [
-        response_status(result),
-        response_headers(result),
+        status_code,
+        response_headers(result, status_code: status_code),
         [response_body(result)]
       ]
     rescue AmbiguousParamError => e
@@ -49,7 +51,7 @@ module RackGraphql
       env[Rack::RACK_ERRORS].flush
       [
         400,
-        { 'Content-Type' => 'application/json' },
+        { 'Content-Type' => 'application/json', STATUS_CODE_HEADER_NAME => 400 },
         [Oj.dump({})]
       ]
     rescue StandardError, LoadError, SyntaxError => e
@@ -64,9 +66,11 @@ module RackGraphql
 
       env[Rack::RACK_ERRORS].puts(exception_string)
       env[Rack::RACK_ERRORS].flush
+
+      status_code = error_status_code_map[e.class] || DEFAULT_ERROR_STATUS_CODE
       [
-        error_status_code_map[e.class] || DEFAULT_ERROR_STATUS_CODE,
-        { 'Content-Type' => 'application/json' },
+        status_code,
+        { 'Content-Type' => 'application/json', STATUS_CODE_HEADER_NAME => status_code },
         [Oj.dump('errors' => [exception_hash(e)])]
       ]
     ensure
@@ -140,10 +144,11 @@ module RackGraphql
       schema.multiplex(queries)
     end
 
-    def response_headers(result = nil)
+    def response_headers(result = nil, status_code: DEFAULT_STATUS_CODE)
       {
         'Access-Control-Expose-Headers' => 'X-Subscription-ID',
-        'Content-Type' => 'application/json'
+        'Content-Type' => 'application/json',
+        STATUS_CODE_HEADER_NAME => status_code,
       }.tap do |headers|
         headers['X-Subscription-ID'] = result.context[:subscription_id] if result_subscription?(result)
       end

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/rack-graphql.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'graphql', '~> 2.0'
   spec.add_dependency 'oj'
-  spec.add_dependency 'rack', '~> 3.0'
+  spec.add_dependency 'rack', '>= 2.2.6'
 
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -42,16 +42,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement