rack-graphql 3.5.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499d61ebe65ca554ac40efcfb74dffe22850ab8456e339444f65a171f95b9809
-  data.tar.gz: 2107b50e6fbaecde8ee25440686a9ac0121fa4625ef9aaeddc3c347144520b73
+  metadata.gz: 1d2c1ea90ede4e54c5a5489a0851427ad9b09d6413793cbc3af0be433fd04ccf
+  data.tar.gz: f7ba119713fd428a0f38acd2d1d62d197f03d74179e4e7e8cb2f29d5735c106f
 SHA512:
-  metadata.gz: ea8390fe89e7a32d17c017f63a4ba08971dc652dc1aef67f0895494e8c72c26802fc3da15ed7ce5c279585875b6151de4241f4b56091c2c7e2d2cfbf9f620e8b
-  data.tar.gz: 4ab5cb0f925617682347476cb7b26f840ed8bb594aa7800718f664fccb711555335cf1b7c3f7216849cdd2158493aafff3f39c9903a0b54e442a83b1eb24a68e
+  metadata.gz: 677849f32a33ee3b09fe3bbb43df14b5c5f838995401696a80870b590e02d51c2e9040eee1d0c3ede91915db1fe72723ffef89a23a888134ec1e1c5e59cf757d
+  data.tar.gz: 1bb0f2c112fe088d46be05d4d8b766917e239f8924aa8b1a3b81f8f213e2340772f669413245b313590f68c5fae373a0105325b30d908d93edc25bfe3173c858

data/.bundler-version

@@ -1 +1 @@
-2.5.6
+2.5.23

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "UTC"
+    commit-message:
+      prefix: "[dependabot]"
+    labels:
+      - "automerge"
+      - "dependencies"

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

@@ -1,13 +1,14 @@
 name: Auto approve dependency upgrades and hot-fix PRs
 on:
   pull_request_target:
-    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
-
+    types:
+      - labeled
+      - ready_for_review
 jobs:
   auto-approve:
     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(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'dependencies')
+        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, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

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

@@ -1,22 +1,31 @@
 name: automerge
 on:
+  pull_request_target:
+    types:
+      - labeled
   pull_request_review:
     types:
       - submitted
   check_suite:
     types:
       - completed
-  label:
-    types:
-      - created
   status: {}
 jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.16.2
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "automerge,!automerge blocked"
+      - name: automerge-dependencies
+        uses: pascalgn/automerge-action@v0.16.4
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash
           MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "dependencies,!automerge blocked"
+          MERGE_REMOVE_LABELS: ""

data/.github/workflows/ci.yml

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

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # CHANGELOG
 
-## 3.3.1 - 2024-02-29
-- make ruby 3.1 a minimum version
+## 3.7.0 - 2024-11-08
+- use json gem 2.8+ instead of oj
+
+## 3.6.0 - 2024-04-26
+- drop ruby 3.1 support
+- pass context.headers to the http reponse
+
+## 3.5.0 - 2024-02-29
+- make ruby 3.1 as a minimum ruby version, add ruby 3.3 support
 
 ## 3.3.0 - 2023-11-23
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rack-graphql (3.5.0)
+    rack-graphql (3.7.0)
       graphql (~> 2.0)
-      oj
+      json (>= 2.8.0)
       rack (>= 2.2.6)
 
 GEM
@@ -12,71 +12,60 @@ GEM
     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.1)
-    graphql (2.2.11)
+    fiber-storage (1.0.0)
+    graphql (2.4.2)
       base64
-    json (2.7.1)
+      fiber-storage
+    json (2.8.1)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
-    oj (3.16.3)
-      bigdecimal (>= 3.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    method_source (1.1.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       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.9.1)
+    racc (1.8.1)
+    rack (3.1.8)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
     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-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       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.30.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.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-ast (1.34.1)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   aarch64-linux-musl
@@ -100,4 +89,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.5.6
+   2.5.23

data/lib/rack_graphql/health_response_builder.rb

@@ -18,7 +18,7 @@ module RackGraphql
     end
 
     def body
-      Oj.dump(
+      JSON.dump(
         'status'     => 'ok',
         'request_ip' => request.ip,
         'app_name'   => app_name,

data/lib/rack_graphql/middleware.rb

@@ -55,7 +55,7 @@ module RackGraphql
       [
         400,
         { 'Content-Type' => 'application/json', STATUS_CODE_HEADER_NAME => 400 },
-        [Oj.dump({})]
+        [JSON.dump({})]
       ]
     rescue StandardError, LoadError, SyntaxError => e
       # To respect the graphql spec, all errors need to be returned as json.
@@ -74,7 +74,7 @@ module RackGraphql
       [
         status_code,
         { 'Content-Type' => 'application/json', STATUS_CODE_HEADER_NAME => status_code },
-        [Oj.dump('errors' => [exception_hash(e)])]
+        [JSON.dump('errors' => [exception_hash(e)])]
       ]
     ensure
       request_epilogue.call
@@ -94,8 +94,8 @@ module RackGraphql
       payload = env['rack.input'].read.to_s
       return nil if payload.index(NULL_BYTE)
 
-      ::Oj.load(payload)
-    rescue Oj::ParseError
+      ::JSON.parse(payload)
+    rescue JSON::ParserError
       nil
     end
 
@@ -106,8 +106,8 @@ module RackGraphql
         return {} if ambiguous_param.empty?
 
         begin
-          ensure_hash(Oj.load(ambiguous_param))
-        rescue Oj::ParseError
+          ensure_hash(JSON.parse(ambiguous_param))
+        rescue JSON::ParserError
           raise AmbiguousParamError, "Unexpected parameter: #{ambiguous_param}"
         end
       when Hash
@@ -149,13 +149,15 @@ module RackGraphql
     end
 
     def response_headers(result = nil, status_code: DEFAULT_STATUS_CODE)
-      {
-        'Access-Control-Expose-Headers' => [SUBSCRIPTION_ID_HEADER_NAME, STATUS_CODE_HEADER_NAME].join(', '),
-        'Content-Type' => 'application/json',
-        STATUS_CODE_HEADER_NAME => status_code,
-      }.tap do |headers|
-        headers[SUBSCRIPTION_ID_HEADER_NAME] = result.context[:subscription_id] if result_subscription?(result)
+      headers = { STATUS_CODE_HEADER_NAME => status_code }
+      headers[SUBSCRIPTION_ID_HEADER_NAME] = result.context[:subscription_id] if result_subscription?(result)
+      result_collection = result.is_a?(Array) ? result : [result]
+      result_collection.each do |part|
+        headers.merge!(part.context[:headers]) if part.context[:headers].is_a?(Hash)
       end
+      headers["Access-Control-Expose-Headers"] = [SUBSCRIPTION_ID_HEADER_NAME, STATUS_CODE_HEADER_NAME].join(", ")
+      headers["Content-Type"] = "application/json"
+      headers
     end
 
     def response_status(result)
@@ -176,7 +178,7 @@ module RackGraphql
       else
         body = result.to_h
       end
-      Oj.dump(body)
+      JSON.dump(body)
     end
 
     def result_subscription?(result)

data/lib/rack_graphql/version.rb

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

data/lib/rack_graphql.rb

@@ -1,4 +1,4 @@
-require 'oj'
+require 'json'
 require 'rack'
 require 'graphql'
 

data/rack-graphql.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -65,8 +65,8 @@ files:
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/workflows/auto-approve.yml"
-- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -101,14 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.

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

@@ -1,24 +0,0 @@
-name: automerge-dependencies
-on:
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  label:
-    types:
-      - created
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.16.2
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: "dependencies,!automerge blocked"
-          MERGE_REMOVE_LABELS: ""