graphql-batch 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfa918397c9799aca7a3ac30e4031c7f57ad472c
-  data.tar.gz: 540ea8eba74692bdf2e10cf1561e9d26b1cff52b
+  metadata.gz: 4e77963ea5a8725ac853785527d846124905e7df
+  data.tar.gz: 22b03ac3a94f6a790cf1415970eb99c738c3b5e7
 SHA512:
-  metadata.gz: 3ec623bdc6aa34b85246b338f2a61710f57e2d76b8a3c1b0f502848b2e89b8e54373958db073e48f52843dbdd95a10da07ef54767f50f1f86d9d51dae4ccd80f
-  data.tar.gz: 7f396d708a3a4d0fa96ce32db63d4788b442b0390b91baa97ab9972f02de39c8c0508ad91e64cd6fa964cb80e6268d6aeabb8d335b4e3ed95835e1f50f66a211
+  metadata.gz: 01003e5050f187156315c06d83386a2851baaaae370900f38b410c0dba9121feaac1ea10027a65a4448e3a7c757a74e639d88662838bd670d38a2a700f29d949
+  data.tar.gz: 102b45b5b6db3d71509d5fa8d9ac1f409d7b29418823493e8ac198cc258245d43bc5c7851f6be71b7b3d34cbe8e19e9bdad90e4f5fa1a8e1720132c4164e4d64

data/graphql-batch.gemspec

@@ -5,7 +5,7 @@ require 'graphql/batch/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "graphql-batch"
-  spec.version       = Graphql::Batch::VERSION
+  spec.version       = GraphQL::Batch::VERSION
   spec.authors       = ["Dylan Thacker-Smith"]
   spec.email         = ["Dylan.Smith@shopify.com"]
 

data/lib/graphql/batch/executor.rb

@@ -9,8 +9,14 @@ module GraphQL::Batch
 
     attr_reader :loaders
 
+    # Set to true when performing a batch query, otherwise, it is false.
+    #
+    # Can be used to detect unbatched queries in an ActiveSupport::Notifications.subscribe block.
+    attr_reader :loading
+
     def initialize
       @loaders = {}
+      @loading = false
     end
 
     def shift
@@ -18,7 +24,7 @@ module GraphQL::Batch
     end
 
     def tick
-      shift.resolve
+      with_loading(true) { shift.resolve }
     end
 
     def wait(promise)
@@ -35,5 +41,23 @@ module GraphQL::Batch
     def clear
       loaders.clear
     end
+
+    def defer
+      # Since we aren't actually deferring callbacks, we need to set #loading to false so that any queries
+      # that happen in the callback aren't interpreted as being performed in GraphQL::Batch::Loader#perform
+      with_loading(false) { yield }
+    end
+
+    private
+
+    def with_loading(loading)
+      was_loading = @loading
+      begin
+        @loading = loading
+        yield
+      ensure
+        @loading = was_loading
+      end
+    end
   end
 end

data/lib/graphql/batch/promise.rb

@@ -3,5 +3,9 @@ module GraphQL::Batch
     def wait
       Executor.current.wait(self)
     end
+
+    def defer
+      Executor.current.defer { super }
+    end
   end
 end

data/lib/graphql/batch/version.rb

@@ -1,5 +1,5 @@
-module Graphql
+module GraphQL
   module Batch
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-batch
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql