graphql-batch 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7998f99327121197626be0735b7af3a016ca5a
-  data.tar.gz: f4a64bc74b428f31cc331bf8c9c7399df048a341
+  metadata.gz: b69567be96fe5b00779872cbb3a6d1e14b3d2a28
+  data.tar.gz: cfc2323ef559f92884560f68713b3d9cd41a3017
 SHA512:
-  metadata.gz: be04e6e7d48f326f2e5fdfdad8b9c3e42401f2a84e43a5bb420aa329bdf2fe5f0b25a478c2a53c3356858d49522a65d8c8a7aa7386146600fe687fc5d48001bc
-  data.tar.gz: 123332a5424e352958781e69767cc818f9ef66c0b06397ab88ceff309bd58c93775225b99f15e806ca5e1575019dc5ac4ff56c5dfa6b81615a5ade1580047681
+  metadata.gz: 423111d4a94fde2835dcfea8cafa234047100d0dd2bc248362b988537ee1dc1c35c86e5924f8db3730d95b09fbb20a49c3dfa3d6e8858271d1ad060a8303e086
+  data.tar.gz: d31cc1b4cddb5db6d1650e51632b26f113e5414c6d9dc44916785b7a5911c0c953e9b1fd476395fea8d9eca2ad502e08a55ead3c7bec994ebdd4059284635980

data/lib/graphql/batch/loader.rb

@@ -3,7 +3,7 @@ module GraphQL::Batch
     class NoExecutorError < StandardError; end
 
     def self.for(*group_args)
-      loader_key = [self].concat(group_args)
+      loader_key = loader_key_for(*group_args)
       executor = Executor.current
 
       unless executor
@@ -18,6 +18,10 @@ module GraphQL::Batch
       end
     end
 
+    def self.loader_key_for(*group_args)
+      [self].concat(group_args)
+    end
+
     def self.load(key)
       self.for.load(key)
     end
@@ -40,8 +44,8 @@ module GraphQL::Batch
     end
 
     def resolve #:nodoc:
+      return if resolved?
       load_keys = queue
-      return if load_keys.empty?
       @queue = nil
       perform(load_keys)
       check_for_broken_promises(load_keys)
@@ -54,13 +58,16 @@ module GraphQL::Batch
     # For Promise#sync
     def wait #:nodoc:
       if executor
-        executor.loaders.delete(loader_key)
         executor.resolve(self)
       else
         resolve
       end
     end
 
+    def resolved?
+      @queue.nil? || @queue.empty?
+    end
+
     protected
 
     # Fulfill the key with provided value, for use in #perform

data/lib/graphql/batch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-batch
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql