graphql 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433f1170eb17ab192761efcd8c27cf9efe5f952ab47b501baca270e33d6007cd
-  data.tar.gz: c56045f746385ae37ebd0f82116aad10782e9265c13e0e85e39488ef3db02c74
+  metadata.gz: 292a830cc392302b9cb20a7290b8026bc8c0d56982b64f3675ab0617341a82a6
+  data.tar.gz: 3d1b22c24b94f9352e295bf0c3ca714437f3bff82694ca69a075c43fb1c2520a
 SHA512:
-  metadata.gz: 6d580c78b6b659602067fcfd3043eff7ef2b20da1d50c1ca2b234614d864e1a232cb65e7456cfdf85764523f30bd5232823ea19b4664208aef875cc68e2e5fc9
-  data.tar.gz: 172bc16fadfeee1f022646498dd2ce359bd885fb96ddbeeab50f7583d27811501e583194dd582a7cf47d63545c2fe00c4fa4625b6b247155f537ff4a6de60ac1
+  metadata.gz: 5711c019ac9b7fcffd0224d8438f5dea04c114a5e170900ec292c3f80a8b672a0a13d4449188888f85c83b4f386a7276a3d91530f38a4bf66df21608711cf95b
+  data.tar.gz: 6fb9c18db01f800f9b018dc8c1a1e27c463b6ab7a81f7de59c9d30967f409c25061b779eb672b828058d769b9aebab8c5f45406a373869a893d6b5a5e574572f

data/lib/graphql/dataloader.rb

@@ -36,7 +36,7 @@ module GraphQL
         }
       }
       @waiting_fibers = []
-      @yielded_fibers = Set.new
+      @yielded_fibers = {}
     end
 
     # @return [Hash] the {Multiplex} context
@@ -69,9 +69,10 @@ module GraphQL
       nil
     end
 
-    # @return [Boolean] Returns true if the current Fiber has yielded once via Dataloader
-    def yielded?
-      @yielded_fibers.include?(Fiber.current)
+    # @param path [Array<String, Integer>] A graphql response path
+    # @return [Boolean] True if the current Fiber has yielded once via Dataloader at {path}
+    def yielded?(path)
+      @yielded_fibers[Fiber.current] == path
     end
 
     # Run all Fibers until they're all done
@@ -160,7 +161,7 @@ module GraphQL
       if fiber.alive?
         if !@yielded_fibers.include?(fiber)
           # This fiber hasn't yielded yet, we should enqueue a continuation fiber
-          @yielded_fibers.add(fiber)
+          @yielded_fibers[fiber] = current_runtime.progress_path
           current_runtime.enqueue_selections_fiber
         end
         fiber_stack << fiber

data/lib/graphql/dataloader/null_dataloader.rb

@@ -15,7 +15,7 @@ module GraphQL
       # executed sychronously.
       def run; end
       def yield; end
-      def yielded?; false; end
+      def yielded?(_path); false; end
     end
   end
 end

data/lib/graphql/execution/interpreter/runtime.rb

@@ -188,13 +188,15 @@ module GraphQL
             evaluate_selection(path, result_name, field_ast_nodes_or_ast_node, scoped_context, owner_object, owner_type, is_eager_selection)
             # The dataloader knows if ^^ that selection halted and later selections were executed in another fiber.
             # If that's the case, then don't continue execution here.
-            if @dataloader.yielded?
+            if @dataloader.yielded?(path)
               break
             end
           end
           nil
         end
 
+        attr_reader :progress_path
+
         # @return [void]
         def evaluate_selection(path, result_name, field_ast_nodes_or_ast_node, scoped_context, owner_object, owner_type, is_eager_field)
           # As a performance optimization, the hash key will be a `Node` if

data/lib/graphql/static_validation/validator.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require "timeout"
+
 module GraphQL
   module StaticValidation
     # Initialized with a {GraphQL::Schema}, then it can validate {GraphQL::Language::Nodes::Documents}s based on that schema.

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Robert Mosolgo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A plain-Ruby implementation of GraphQL.
 email:
 - rdmosolgo@gmail.com
@@ -766,7 +780,7 @@ metadata:
   source_code_uri: https://github.com/rmosolgo/graphql-ruby
   bug_tracker_uri: https://github.com/rmosolgo/graphql-ruby/issues
   mailing_list_uri: https://tinyletter.com/graphql-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -781,8 +795,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby
 test_files: []