graphql-hive 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf3390c1974107943ff70715481c0986b931b8d7eb8b3fb3f6e38899192d958
-  data.tar.gz: 345f4c6b5a14a83b96d596a007fa1b901c19230555e69f64ac2db421b851089b
+  metadata.gz: 87d3b825ce1bfdcf80d8ce3ca76848804bb4ee8b6a0dce1288a91da51d9b0e23
+  data.tar.gz: 6d8c6971ac626be6b790e53e98500f721b39b05f7ef496cd3add8b3616791a65
 SHA512:
-  metadata.gz: 36d075c01c81e9e9c1c359a05b1787227c0f13cf54f45437ef09cbfb72a95c53c6b1a83777e76ec724fbbe15af1fca9e65ec4ea1f451cc489500458a4c29eeec
-  data.tar.gz: d211dd70a405153f492254210c330f0d5fbd6e63d8d96a5267ec651eb8712654238780f997b1ee95a1f1bbbba5b1e1440a2539ec1ae1a9edeca1b61cbb537f18
+  metadata.gz: d934a8056bac2871c626b36a7404384aebf2810b462a7ea5b4b3f21ce71957d2555adf257542f2074c32985c9437b4e931228c40b9d89a17776d9f9e58feb0b4
+  data.tar.gz: 7d1a9a441c579088a70d24dbe08ac599c1a5f0edbaa4fcd5257de86cea6528d1fd7664120d408ff7ff5b023434f9e22222ed052214506fe3dbd52f09ddb3fa24

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    graphql-hive (0.5.4)
-      graphql (>= 2.3, < 3)
+    graphql-hive (0.6.0)
+      graphql (>= 2.4.12, < 3)
 
 GEM
   remote: https://rubygems.org/
@@ -19,8 +19,11 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     diff-lcs (1.5.1)
-    graphql (2.3.7)
+    fiber-storage (1.0.0)
+    graphql (2.4.14)
       base64
+      fiber-storage
+      logger
     hashdiff (1.1.1)
     io-console (0.7.2)
     irb (1.14.1)
@@ -29,6 +32,7 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
+    logger (1.6.6)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     parallel (1.26.3)

data/README.md

@@ -28,6 +28,10 @@
 
 If you are using Hive as a service, please refer to our documentation: https://docs.graphql-hive.com/features/tokens.
 
+### Organization-level tokens
+
+If you are using an organization-level access token (tokens starting with `hvo1/`), you must also provide a `target` parameter to specify which target the usage data should be reported to. See the [organization access tokens documentation](https://the-guild.dev/graphql/hive/docs/migration-guides/organization-access-tokens#usage-data-reporting) for more details.
+
 ## 1. Install the `graphql-hive` gem
 
 ```
@@ -48,6 +52,8 @@ class Schema < GraphQL::Schema
       GraphQL::Hive,
       {
         token: '<YOUR_TOKEN>',
+        # target is only needed if you're using an organization level token
+        target: 'your-org/your-project/production', # or target UUID
         reporting: {
           author: ENV['GITHUB_USER'],
           commit: ENV['GITHUB_COMMIT']
@@ -148,6 +154,9 @@ class MySchema < GraphQL::Schema
     {
       # Token is the only required configuration value.
       token: 'YOUR-REGISTRY-TOKEN',
+      # Target is required when using organization-level tokens (tokens starting with 'hvo1/').
+      # Can be a target slug (e.g., 'org/project/target') or target UUID.
+      target: 'your-org/your-project/production',
       #
       # The following are optional configuration values.
       #

data/graphql-hive.gemspec

@@ -24,5 +24,5 @@ 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.3", "< 3"
+  spec.add_dependency "graphql", ">= 2.4.12", "< 3"
 end

data/lib/graphql-hive/client.rb

@@ -12,6 +12,10 @@ module GraphQL
       end
 
       def send(path, body, _log_type)
+        path = path.to_s
+        if path == "/usage" && @options[:target] && @options[:target] != ""
+          path = "/usage/#{@options[:target]}"
+        end
         uri =
           URI::HTTP.build(
             scheme: (@options[:port].to_s == "443") ? "https" : "http",
@@ -45,7 +49,7 @@ module GraphQL
 
       def build_request(uri, body)
         request = Net::HTTP::Post.new(uri.request_uri)
-        request["Authorization"] = @options[:token]
+        request["Authorization"] = "Bearer #{@options[:token]}"
         request["X-Usage-API-Version"] = "2"
         request["content-type"] = "application/json"
         request["User-Agent"] = "Hive@#{Graphql::Hive::VERSION}"

data/lib/graphql-hive/usage_reporter.rb

@@ -108,7 +108,8 @@ module GraphQL
           analyzer = GraphQL::Hive::Analyzer.new(query)
           visitor = GraphQL::Analysis::AST::Visitor.new(
             query: query,
-            analyzers: [analyzer]
+            analyzers: [analyzer],
+            timeout: nil
           )
 
           result = visitor.visit

data/lib/graphql-hive/version.rb

@@ -2,6 +2,6 @@
 
 module Graphql
   module Hive
-    VERSION = "0.5.4"
+    VERSION = "0.6.0"
   end
 end

data/lib/graphql-hive.rb

@@ -39,7 +39,8 @@ module GraphQL
       buffer_size: 50,
       queue_size: 1000,
       logger: nil,
-      collect_usage_sampling: 1.0
+      collect_usage_sampling: 1.0,
+      target: nil
     }.freeze
 
     self.platform_keys = {
@@ -141,10 +142,14 @@ module GraphQL
         }
         options[:logger].level = options[:debug] ? Logger::DEBUG : Logger::INFO
       end
-      if !options.include?(:token) && (!options.include?(:enabled) || options.enabled)
+      if !options.include?(:token) && (!options.include?(:enabled) || options[:enabled])
         options[:logger].warn("`token` options is missing")
         options[:enabled] = false
         false
+      elsif options[:token]&.start_with?("hvo1/") && (options[:target].nil? || options[:target] == "")
+        options[:logger].warn("Organization-level token detected but `target` option is missing. Target must be specified for organization-level tokens.")
+        options[:enabled] = false
+        false
       elsif options[:report_schema] &&
           (
             !options.include?(:reporting) ||
@@ -168,18 +173,25 @@ module GraphQL
     def send_report_schema(schema)
       sdl = GraphQL::Schema::Printer.new(schema).print_schema
 
+      input = {
+        sdl: sdl,
+        author: @options[:reporting][:author],
+        commit: @options[:reporting][:commit],
+        service: @options[:reporting][:service_name],
+        url: @options[:reporting][:service_url],
+        force: true
+      }
+
+      # Add target for organization-level tokens
+      if @options[:target]
+        input[:target] = @options[:target]
+      end
+
       body = {
         query: REPORT_SCHEMA_MUTATION,
         operationName: "schemaPublish",
         variables: {
-          input: {
-            sdl: sdl,
-            author: @options[:reporting][:author],
-            commit: @options[:reporting][:commit],
-            service: @options[:reporting][:service_name],
-            url: @options[:reporting][:service_url],
-            force: true
-          }
+          input: input
         }
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-hive
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Charly POLY
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.4.12
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.4.12
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'