graphql-batch 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69567be96fe5b00779872cbb3a6d1e14b3d2a28
-  data.tar.gz: cfc2323ef559f92884560f68713b3d9cd41a3017
+  metadata.gz: c839447dcaacc5db8e6e16d95a30c2fc2db4e899
+  data.tar.gz: ca03f0ee057d56cd2311ef51df54de199baa53ca
 SHA512:
-  metadata.gz: 423111d4a94fde2835dcfea8cafa234047100d0dd2bc248362b988537ee1dc1c35c86e5924f8db3730d95b09fbb20a49c3dfa3d6e8858271d1ad060a8303e086
-  data.tar.gz: d31cc1b4cddb5db6d1650e51632b26f113e5414c6d9dc44916785b7a5911c0c953e9b1fd476395fea8d9eca2ad502e08a55ead3c7bec994ebdd4059284635980
+  metadata.gz: e5b0461239a98c5aa53924f2c9a721bfe8d3fc7a59ae70d261255ecf3421b574fc44626d55c514b57b403368ca94c7e2714f37ca66cf324fbdc3ca69735ea8fc
+  data.tar.gz: abcf9f692f944ac758fa21d6bcd9929a1ceaa9edf8adb6c9c14e019c4c032445dc532cd564fca0010471b02f32903bbdcb13df4a8bae0adde74958bad11387a3

data/lib/graphql/batch.rb

@@ -20,7 +20,11 @@ module GraphQL
     end
 
     def self.use(schema_defn)
-      schema_defn.instrument(:query, GraphQL::Batch::Setup)
+      if GraphQL::VERSION >= "1.6.0"
+        schema_defn.instrument(:multiplex, GraphQL::Batch::SetupMultiplex)
+      else
+        schema_defn.instrument(:query, GraphQL::Batch::Setup)
+      end
       schema_defn.lazy_resolve(::Promise, :sync)
     end
 
@@ -34,3 +38,4 @@ require_relative "batch/loader"
 require_relative "batch/executor"
 require_relative "batch/promise"
 require_relative "batch/setup"
+require_relative "batch/setup_multiplex"

data/lib/graphql/batch/loader.rb

@@ -58,6 +58,7 @@ module GraphQL::Batch
     # For Promise#sync
     def wait #:nodoc:
       if executor
+        executor.loaders.delete(loader_key)
         executor.resolve(self)
       else
         resolve

data/lib/graphql/batch/setup_multiplex.rb

@@ -0,0 +1,14 @@
+module GraphQL::Batch
+  module SetupMultiplex
+    extend self
+
+    def before_multiplex(multiplex)
+      raise NestedError if GraphQL::Batch::Executor.current
+      GraphQL::Batch::Executor.current = GraphQL::Batch::Executor.new
+    end
+
+    def after_multiplex(multiplex)
+      GraphQL::Batch::Executor.current = nil
+    end
+  end
+end

data/lib/graphql/batch/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Batch
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-batch
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -124,6 +124,7 @@ files:
 - lib/graphql/batch/mutation_execution_strategy.rb
 - lib/graphql/batch/promise.rb
 - lib/graphql/batch/setup.rb
+- lib/graphql/batch/setup_multiplex.rb
 - lib/graphql/batch/version.rb
 homepage: https://github.com/Shopify/graphql-batch
 licenses: