graphql 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49947bd83b909728424ef018fe58f3e4d7a2d1d1e0fd6688fc48fdf12026aae
-  data.tar.gz: c369b4e0efaa1889cebd8774103e541e2860db4f920962bcc107cdbf3c072ca2
+  metadata.gz: 9a58a3c98ecdee8503c62c2bab39d34c0b91ba0b84401b10e1e5fc80afcf8e81
+  data.tar.gz: 1287f3143845004cde0c7c031ebb6d18ee2370835bca23a6a7c3ed0d6d53c81a
 SHA512:
-  metadata.gz: '059d1323a0bfe78d29bfdcf2523b26cf3d3a82195d1b8f4a490092a61ce074ae232c7e93e6330b9659d07d28b7cd66a0f2d42e0f38040556ec265773d4a34260'
-  data.tar.gz: 6bd1e3ddc66378e37914fb54806560ca05aeb1294bea4704f53b6445f3b83883ccab45c2d2b0c6b750fd37f4b10aa1351065bb0553f13429ede9343174e1dc62
+  metadata.gz: 466e806e15a2084248db753bf2a4b444665dd61750c468f15c182f190bff1f97983a34de2c8715ceb777040c8684563a8048556b28f2e5b6f0b53c817babec6f
+  data.tar.gz: 9fab0b39b1d7d0d44f26116bdb6493f18ff735d7d926256a0529060546512c58c50cefb462496c3bdd69fc298b0a9e57b371c6c314b72543dec39d731ebf6e52

data/lib/graphql/execution/interpreter.rb

@@ -111,15 +111,15 @@ module GraphQL
                     data_result
                   end
                 else
-                  result = {
-                    "data" => query.context.namespace(:interpreter_runtime)[:runtime].final_result
-                  }
+                  result = {}
 
                   if query.context.errors.any?
                     error_result = query.context.errors.map(&:to_h)
                     result["errors"] = error_result
                   end
 
+                  result["data"] = query.context.namespace(:interpreter_runtime)[:runtime].final_result
+
                   result
                 end
                 if query.context.namespace?(:__query_result_extensions__)

data/lib/graphql/schema/base_64_encoder.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
-
-require 'graphql/schema/base_64_bp'
-
+require "base64"
 module GraphQL
   class Schema
     # @api private
     module Base64Encoder
       def self.encode(unencoded_text, nonce: false)
-        Base64Bp.urlsafe_encode64(unencoded_text, padding: false)
+        Base64.urlsafe_encode64(unencoded_text, padding: false)
       end
 
       def self.decode(encoded_text, nonce: false)
         # urlsafe_decode64 is for forward compatibility
-        Base64Bp.urlsafe_decode64(encoded_text)
+        Base64.urlsafe_decode64(encoded_text)
       rescue ArgumentError
         raise GraphQL::ExecutionError, "Invalid input: #{encoded_text.inspect}"
       end

data/lib/graphql/schema/unique_within_type.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'graphql/schema/base_64_bp'
+require "base64"
 
 module GraphQL
   class Schema

data/lib/graphql/testing/helpers.rb

@@ -5,10 +5,7 @@ module GraphQL
       # @param schema_class [Class<GraphQL::Schema>]
       # @return [Module] A helpers module which always uses the given schema
       def self.for(schema_class)
-        Module.new do
-          include SchemaHelpers
-          @@schema_class_for_helpers = schema_class
-        end
+        SchemaHelpers.for(schema_class)
       end
 
       class Error < GraphQL::Error
@@ -119,6 +116,13 @@ module GraphQL
           # schema will be added later
           super(nil, *args, **kwargs, &block)
         end
+
+        def self.for(schema_class)
+          Module.new do
+            include SchemaHelpers
+            @@schema_class_for_helpers = schema_class
+          end
+        end
       end
     end
   end

data/lib/graphql/tracing/sentry_trace.rb

@@ -16,8 +16,8 @@ module GraphQL
         "execute_query_lazy" => "graphql.execute"
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
-        def #{trace_method}(**data, &block)
-          instrument_execution("#{platform_key}", "#{trace_method}", data, &block)
+        def #{trace_method}(**data)
+          instrument_execution("#{platform_key}", "#{trace_method}", data) { super }
         end
         RUBY
       end
@@ -64,9 +64,10 @@ module GraphQL
         return yield unless Sentry.initialized?
 
         Sentry.with_child_span(op: platform_key, start_timestamp: Sentry.utc_now.to_f) do |span|
-          result = block.call
-          span.finish
+          result = yield
+          return result unless span
 
+          span.finish
           if trace_method == "execute_multiplex" && data.key?(:multiplex)
             operation_names = data[:multiplex].queries.map{|q| operation_name(q) }
             span.set_description(operation_names.join(", "))

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.2.7"
+  VERSION = "2.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -386,7 +386,6 @@ files:
 - lib/graphql/schema/addition.rb
 - lib/graphql/schema/always_visible.rb
 - lib/graphql/schema/argument.rb
-- lib/graphql/schema/base_64_bp.rb
 - lib/graphql/schema/base_64_encoder.rb
 - lib/graphql/schema/build_from_definition.rb
 - lib/graphql/schema/build_from_definition/resolve_map.rb

data/lib/graphql/schema/base_64_bp.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'base64'
-
-# backport from ruby v2.5 to v2.2 that has no `padding` things
-# @api private
-module Base64Bp
-  extend Base64
-
-  module_function
-
-  def urlsafe_encode64(bin, padding:)
-    str = strict_encode64(bin)
-    str.tr!("+/", "-_")
-    str.delete!("=") unless padding
-    str
-  end
-
-  def urlsafe_decode64(str)
-    str = str.tr("-_", "+/")
-    if !str.end_with?("=") && str.length % 4 != 0
-      str = str.ljust((str.length + 3) & ~3, "=")
-    end
-    strict_decode64(str)
-  end
-end