graphql-hive 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a06a58701ba3765dfebe9dfa1a38a3dcfd033074007d7eed9a9f874101dab85
-  data.tar.gz: 0a8bbfae27e91256dec594148f0d78f620669cb278268a97f3e79fd38eaa20b0
+  metadata.gz: 106c7046e201f4d021220655ad1154600715f32f0f9e7d59aacd395967ce9927
+  data.tar.gz: 998bebf3e0c0fecdb349726cc44e4ffd262e5c2178977c5f9cf5d779c779376c
 SHA512:
-  metadata.gz: e9ebbabe3b6321cde6e1f2aee46a4f8d240eec1acc3a9622b11921bb44b09b8e16473e65a5d3146fcc9c397289ef4563b261bbaa8ac3d39749d8c11752cc6db1
-  data.tar.gz: 96c8e202377d6e7ddfef13ee956482df5b61a285d188a10ed25e0752a285721cc09c1182c1317724e396e96d7143c9049417e9a08a695e754c0098685626edd9
+  metadata.gz: 32fda0f43ef90c4d583ca1dd2017cfc1388ff5750b02962a2f0e883602b40bfb40b332661b437361c985fe016223ae8d04dde96aeb7c5eb6b4fc6d7438c4e1cc
+  data.tar.gz: b762a1a23d6cae5f226a2bf33acfc9f7a998214028e9f88524374e69c4168db3192ae4432138b7a76cd9ff42bac911f0472155a37ec262641e919517d40c4106

data/.github/workflows/benchmark.yml

@@ -9,27 +9,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node
-        uses: actions/setup-node@master
+        uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 22
           cache: 'yarn'
           cache-dependency-path: 'k6/yarn.lock'
 
       - name: Use Ruby
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
         with:
           working-directory: ./k6/graphql-api
-          ruby-version: 2.6
+          ruby-version: '3.3'
           bundler-cache: true
 
       - name: Start GraphQL API with hive enabled
         working-directory: ./k6/graphql-api
         run: |
           bundle
-          bundle exec puma -t 0:1 -p 9292 & sleep 5
+          bundle exec puma -t 0:1 -p 9292 &
+          npx wait-on http://localhost:9292 --timeout 5s
         env:
           HIVE_ENABLED: 'true'
 
@@ -37,7 +38,8 @@ jobs:
         working-directory: ./k6/graphql-api
         run: |
           bundle
-          bundle exec puma -t 0:1 -p 9291 & sleep 5
+          bundle exec puma -t 0:1 -p 9291 &
+          npx wait-on http://localhost:9291 --timeout 5s
         env:
           HIVE_ENABLED: 'false'
 
@@ -45,15 +47,21 @@ jobs:
         working-directory: ./k6/
         run: |
           yarn
-          node usage-api.js & sleep 5s
+          node usage-api.js &
+          npx wait-on http://localhost:8888 --timeout 5s
 
-      - name: Setup K6
-        run: |
-          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747E3415A3642D57D77C6C491D6AC1D69
-          echo "deb https://dl.k6.io/deb stable main" | sudo tee /etc/apt/sources.list.d/k6.list
-          sudo apt-get update
-          sudo apt-get install k6=0.37.0
+      - name: Install k6
+        working-directory: ./k6
+        env:
+          K6_RELEASE_ARTIFACT_URL:
+            https://github.com/grafana/k6/releases/download/v0.37.0/k6-v0.37.0-linux-amd64.tar.gz
+        run: curl "${K6_RELEASE_ARTIFACT_URL}" -L | tar xvz --strip-components 1
 
-      - name: Start and Report Benchmark
-        working-directory: ./k6/
-        run: k6 -e GITHUB_PR=${{ github.event.number }} -e GITHUB_SHA=${{ github.sha }} -e GITHUB_TOKEN=${{secrets.GH_PA_TOKEN}} run k6.js
+      - name: Run Benchmark
+        working-directory: ./k6
+        run: |
+          ./k6 \
+            -e GITHUB_PR=${{ github.event.number }} \
+            -e GITHUB_SHA=${{ github.sha }} \
+            -e GITHUB_TOKEN=${{secrets.GH_PA_TOKEN}} \
+            run k6.js

data/.github/workflows/ci.yml

@@ -11,22 +11,30 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+    - uses: actions/checkout@v4
+
+    - uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
       with:
-        ruby-version: 2.6
+        ruby-version: '3.3'
         bundler-cache: true
+
     - run: bundle exec rake rubocop
+      
   test:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.1', '3.0', '2.7', '2.6']
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '3.3'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+    - uses: actions/checkout@v4
+
+    - uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+
     - run: bundle exec rake spec

data/.rubocop.yml

@@ -36,3 +36,6 @@ Metrics/MethodLength:
 
 Metrics/ClassLength:
   Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: 'gemspec'

data/Gemfile.lock

@@ -1,58 +1,69 @@
 PATH
   remote: .
   specs:
-    graphql-hive (0.3.3)
-      graphql (~> 2.0.9)
+    graphql-hive (0.3.4)
+      graphql (>= 2.3, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.5.0)
-    graphql (2.0.21)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    base64 (0.2.0)
+    diff-lcs (1.5.1)
+    graphql (2.3.7)
+      base64
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
+      racc
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (10.5.0)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    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-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      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.18.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2)
   graphql-hive!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.30)
+  rake (~> 13)
+  rspec (~> 3)
+  rubocop (~> 1)
 
 BUNDLED WITH
-   1.17.3
+   2.5.15

data/examples/simple-api/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    graphql-hive (0.1.4)
+    graphql-hive (0.3.3)
       graphql (~> 2.0.9)
 
 GEM
@@ -45,4 +45,4 @@ DEPENDENCIES
   sinatra-contrib
 
 BUNDLED WITH
-   1.17.3
+   2.5.15

data/examples/simple-api/schema.rb

@@ -41,7 +41,12 @@ end
 class Schema < GraphQL::Schema
   query QueryType
 
-  use(GraphQL::Hive, { buffer_size: 2, token: 'YOUR_TOKEN', debug: true, reporting: { author: 'Charly Poly', commit: '109bb1e748bae21bdfe663c0ffc7e830' }, client_info: proc { |context|
-                                                                                                                                                                                                { name: context[:client_name], version: context[:client_version] }
-                                                                                                                                                                                              } })
+  use(
+    GraphQL::Hive,
+    buffer_size: 2,
+    token: 'YOUR_TOKEN',
+    debug: true,
+    reporting: { author: 'Charly Poly', commit: '109bb1e748bae21bdfe663c0ffc7e830' },
+    client_info: proc { |context|{ name: context[:client_name], version: context[:client_version] }}
+  )
 end

data/graphql-hive.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
 
-  spec.add_dependency 'graphql', '~> 2.0.9'
+  spec.add_dependency 'graphql', '>= 2.3', '< 3'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.30'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 13'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rubocop', '~> 1'
 end

data/k6/graphql-api/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'graphql'
+gem 'graphql', '~> 2'
 gem 'graphql-hive', path: '../../'
-gem 'puma'
-gem 'rack-contrib'
-gem 'sinatra'
+gem 'puma', '~> 6'
+gem 'racc'
+gem 'rack-contrib', '~> 2'
+gem 'sinatra', '~> 2'
 gem 'sinatra-contrib'

data/k6/graphql-api/Gemfile.lock

@@ -1,48 +1,52 @@
 PATH
   remote: ../..
   specs:
-    graphql-hive (0.3.3)
-      graphql (~> 2.0.9)
+    graphql-hive (0.3.4)
+      graphql (>= 2.3, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    graphql (2.0.9)
+    base64 (0.2.0)
+    graphql (2.3.7)
+      base64
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.8)
-    puma (5.6.4)
+    nio4r (2.7.3)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    rack (2.2.3.1)
-    rack-contrib (2.3.0)
-      rack (~> 2.0)
-    rack-protection (2.2.0)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-contrib (2.5.0)
+      rack (< 4)
+    rack-protection (2.2.4)
       rack
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.4)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.2.0)
+    sinatra-contrib (2.2.4)
       multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.2.0)
-      sinatra (= 2.2.0)
+      mustermann (~> 2.0)
+      rack-protection (= 2.2.4)
+      sinatra (= 2.2.4)
       tilt (~> 2.0)
-    tilt (2.0.10)
+    tilt (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  graphql
+  graphql (~> 2)
   graphql-hive!
-  puma
-  rack-contrib
-  sinatra
+  puma (~> 6)
+  racc
+  rack-contrib (~> 2)
+  sinatra (~> 2)
   sinatra-contrib
 
 BUNDLED WITH
-   1.17.3
+   2.5.15

data/k6/graphql-api/app.rb

@@ -7,6 +7,10 @@ require_relative 'schema'
 class DemoApp < Sinatra::Base
   use Rack::JSONBodyParser
 
+  get '/' do
+    status 200
+  end
+
   post '/graphql' do
     result = Schema.execute(
       params['query'],

data/k6/graphql-api/schema.rb

@@ -29,7 +29,13 @@ end
 class Schema < GraphQL::Schema
   query QueryType
 
-  use(GraphQL::Hive,
-      { enabled: ENV['HIVE_ENABLED'] === 'true', endpoint: 'localhost', debug: true, port: 8888, token: 'stress-token',
-        report_schema: false })
+  use(
+    GraphQL::Hive,
+    enabled: ENV['HIVE_ENABLED'] === 'true',
+    endpoint: 'localhost',
+    debug: true,
+    port: 8888,
+    token: 'stress-token',
+    report_schema: false
+  )
 end

data/k6/usage-api.js

@@ -6,6 +6,10 @@ app.use(express.json());
 
 let count = 0;
 
+app.get("/", (req, res) => {
+  res.status(200).send({ status: 'ok' })
+});
+
 app.get("/count", (req, res) => {
   res.status(200).send({ count });
 });

data/lib/graphql-hive/printer.rb

@@ -6,32 +6,43 @@ module GraphQL
     # - removes aliases
     # - sort nodes and directives (files, arguments, variables)
     class Printer < GraphQL::Language::Printer
+      def print_string(str)
+        @out.append(str)
+      end
+
       def print_node(node, indent: '')
         case node
         when Float, Integer
-          '0'
+          print_string '0'
         when String
-          ''
+          print_string ''
         else
-          super(node, indent: indent)
+          super
         end
       end
 
-      # rubocop:disable Style/RedundantInterpolation
+      # from GraphQL::Language::Printer with sort_by name
+      # ignores aliases
       def print_field(field, indent: '')
-        out = "#{indent}".dup
-        out << "#{field.name}"
-        out << "(#{field.arguments.sort_by(&:name).map { |a| print_argument(a) }.join(', ')})" if field.arguments.any?
-        out << print_directives(field.directives)
-        out << print_selections(field.selections, indent: indent)
-        out
+        print_string(indent)
+        print_string(field.name)
+        if field.arguments.any?
+          print_string('(')
+          field.arguments.sort_by(&:name).each_with_index do |a, i|
+            print_argument(a)
+            print_string(', ') if i < field.arguments.size - 1
+          end
+          print_string(')')
+        end
+        print_directives(field.directives)
+        print_selections(field.selections, indent: indent)
       end
-      # rubocop:enable Style/RedundantInterpolation
 
       def print_directives(directives)
         super(directives.sort_by(&:name))
       end
 
+      # from GraphQL::Language::Printer with sort_by name
       def print_selections(selections, indent: '')
         sorted_nodes = selections.sort_by do |s|
           next s.name if s.respond_to?(:name)
@@ -42,29 +53,41 @@ module GraphQL
         super(sorted_nodes, indent: indent)
       end
 
+      # from GraphQL::Language::Printer with sort_by name
       def print_directive(directive)
-        out = "@#{directive.name}".dup
+        print_string('@')
+        print_string(directive.name)
 
-        if directive.arguments.any?
-          out << "(#{directive.arguments.sort_by(&:name).map { |a| print_argument(a) }.join(', ')})"
-        end
+        return if directive.arguments.blank?
 
-        out
+        print_string('(')
+        directive.arguments.sort_by(&:name).each_with_index do |a, i|
+          print_argument(a)
+          print_string(', ') if i < directive.arguments.size - 1
+        end
+        print_string(')')
       end
 
+      # from GraphQL::Language::Printer with sort_by name
       def print_operation_definition(operation_definition, indent: '')
-        out = "#{indent}#{operation_definition.operation_type}".dup
-        out << " #{operation_definition.name}" if operation_definition.name
+        print_string(indent)
+        print_string(operation_definition.operation_type)
+        if operation_definition.name
+          print_string(' ')
+          print_string(operation_definition.name)
+        end
 
-        # rubocop:disable Layout/LineLength
         if operation_definition.variables.any?
-          out << "(#{operation_definition.variables.sort_by(&:name).map { |v| print_variable_definition(v) }.join(', ')})"
+          print_string('(')
+          operation_definition.variables.sort_by(&:name).each_with_index do |v, i|
+            print_variable_definition(v)
+            print_string(', ') if i < operation_definition.variables.size - 1
+          end
+          print_string(')')
         end
-        # rubocop:enable Layout/LineLength
 
-        out << print_directives(operation_definition.directives)
-        out << print_selections(operation_definition.selections, indent: indent)
-        out
+        print_directives(operation_definition.directives)
+        print_selections(operation_definition.selections, indent: indent)
       end
     end
   end

data/lib/graphql-hive/usage_reporter.rb

@@ -65,7 +65,7 @@ module GraphQL
               end
             end
           end
-          unless buffer.size.zero?
+          unless buffer.empty?
             @options[:logger].debug('shuting down with buffer, sending!')
             process_operations(buffer)
           end
@@ -111,12 +111,12 @@ module GraphQL
             analyzers: [analyzer]
           )
 
-          visitor.visit
+          result = visitor.visit
 
           fields.merge(analyzer.result)
 
           operation += "\n" unless operation.empty?
-          operation += GraphQL::Hive::Printer.new.print(visitor.result)
+          operation += GraphQL::Hive::Printer.new.print(result)
         end
 
         md5 = Digest::MD5.new
@@ -154,7 +154,7 @@ module GraphQL
           errors = result.to_h.fetch('errors', [])
           errors.each do |error|
             acc[:errorsTotal] += 1
-            acc[:errors] << { message: error['message'], path: error['path'].join('.') }
+            acc[:errors] << { message: error['message'], path: error['path']&.join('.') }
           end
         end
         acc

data/lib/graphql-hive/version.rb

@@ -2,6 +2,6 @@
 
 module Graphql
   module Hive
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,85 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: graphql-hive
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Charly POLY
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '1'
 description: '"Monitor operations, inspect your queries and publish your GraphQL schema
   with GraphQL Hive"'
 email:
@@ -142,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: '"GraphQL Hive integration for `graphql-ruby`"'