graphql-batch 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 235150e8e0307968c17a84dbfe6e3020ab58f0eb
-  data.tar.gz: c85fa65eb8e23ca836fe1848e9be4e3a5c93fe94
+  metadata.gz: b611b5510ff666b9ed400c9066839af2a64d8695
+  data.tar.gz: 15aca5ee2baeffd739b1a23192e33d0c50aa31bc
 SHA512:
-  metadata.gz: f8336eb9099406bd9172fd88c72300d343fbde12133060e3e90efe0ee0a2d5f88dd3e628eb640728dc1b006223592dfe216a9710393208883f1344a438c6461e
-  data.tar.gz: 7241576a1d9f864524dde9ff03362f4a3fe850e198b446f0142e1d29f8c6ccb749adac6eacc5fbe7ce6d710046eb5e2c2b335ba611fdab2fd46a6fafb3f6b247
+  metadata.gz: bc8fa00ef926af4abbba3c22ebdc8c0a1c91d0ffb3ba2172efaa5ab5628d6fa80245710365128bf0e701340d266d94c9c00d8fa291aa455df8790cc913b14b4a
+  data.tar.gz: 697e6c1f7b077a8b7803ba0aab1decfb4e77f699dc96d7d4cb41424faf5d695b5289198831b1b62f5b752c0ce8636aa9482529cbfcae1c898e036527ffbeaa40

data/lib/graphql/batch.rb

@@ -7,15 +7,14 @@ require "promise.rb"
 module GraphQL
   module Batch
     BrokenPromiseError = ::Promise::BrokenError
-    class NestedError < StandardError; end
+    class NoExecutorError < StandardError; end
 
-    def self.batch
-      raise NestedError if GraphQL::Batch::Executor.current
+    def self.batch(executor_class: GraphQL::Batch::Executor)
       begin
-        GraphQL::Batch::Executor.current = GraphQL::Batch::Executor.new
+        GraphQL::Batch::Executor.start_batch(executor_class)
         ::Promise.sync(yield)
       ensure
-        GraphQL::Batch::Executor.current = nil
+        GraphQL::Batch::Executor.end_batch
       end
     end
 

data/lib/graphql/batch/executor.rb

@@ -3,12 +3,28 @@ module GraphQL::Batch
     THREAD_KEY = :"#{name}.batched_queries"
     private_constant :THREAD_KEY
 
-    def self.current
-      Thread.current[THREAD_KEY]
-    end
+    class << self
+      def current
+        Thread.current[THREAD_KEY]
+      end
+
+      def current=(executor)
+        Thread.current[THREAD_KEY] = executor
+      end
+
+      def start_batch(executor_class)
+        executor = Thread.current[THREAD_KEY] ||= executor_class.new
+        executor.increment_level
+      end
 
-    def self.current=(executor)
-      Thread.current[THREAD_KEY] = executor
+      def end_batch
+        executor = current
+        unless executor
+          raise NoExecutorError, 'Cannot end a batch without an Executor.'
+        end
+        return unless executor.decrement_level < 1
+        self.current = nil
+      end
     end
 
     # Set to true when performing a batch query, otherwise, it is false.
@@ -19,6 +35,7 @@ module GraphQL::Batch
     def initialize
       @loaders = {}
       @loading = false
+      @nesting_level = 0
     end
 
     def loader(key)
@@ -48,6 +65,14 @@ module GraphQL::Batch
       @loaders.clear
     end
 
+    def increment_level
+      @nesting_level += 1
+    end
+
+    def decrement_level
+      @nesting_level -= 1
+    end
+
     def around_promise_callbacks
       # We need to set #loading to false so that any queries that happen in the promise
       # callback aren't interpreted as being performed in GraphQL::Batch::Loader#perform

data/lib/graphql/batch/loader.rb

@@ -1,15 +1,17 @@
 module GraphQL::Batch
   class Loader
-    class NoExecutorError < StandardError; end
+    NoExecutorError = GraphQL::Batch::NoExecutorError
+    deprecate_constant :NoExecutorError if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3")
 
     def self.for(*group_args)
       loader_key = loader_key_for(*group_args)
       executor = Executor.current
 
       unless executor
-        raise NoExecutorError, "Cannot create loader without an Executor."\
-          " Wrap the call to `for` with `GraphQL::Batch.batch` or use"\
-          " `GraphQL::Batch::Setup` as a query instrumenter if using with `graphql-ruby`"
+        raise GraphQL::Batch::NoExecutorError, 'Cannot create loader without'\
+          ' an Executor. Wrap the call to `for` with `GraphQL::Batch.batch`'\
+          ' or use `GraphQL::Batch::Setup` as a query instrumenter if'\
+          ' using with `graphql-ruby`'
       end
 
       executor.loader(loader_key) { new(*group_args) }

data/lib/graphql/batch/setup.rb

@@ -2,12 +2,11 @@ module GraphQL::Batch
   class Setup
     class << self
       def start_batching(executor_class)
-        raise NestedError if GraphQL::Batch::Executor.current
-        GraphQL::Batch::Executor.current = executor_class.new
+        GraphQL::Batch::Executor.start_batch(executor_class)
       end
 
       def end_batching
-        GraphQL::Batch::Executor.current = nil
+        GraphQL::Batch::Executor.end_batch
       end
 
       def instrument_field(schema, type, field)

data/lib/graphql/batch/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Batch
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-batch
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A query batching executor for the graphql gem