Take advantage of improvements in promise.rb (#34)

Author: dylanahsmith

README.md

@@ -109,7 +109,7 @@ end
 
 ## Unit Testing
 
-GraphQL::Batch::Promise#sync can be used to wait for a promise to be resolved and return its result. This can be useful for debugging and unit testing loaders.
+Promise#sync can be used to wait for a promise to be resolved and return its result. This can be useful for debugging and unit testing loaders.
 
 ```ruby
   def test_single_query
@@ -119,19 +119,6 @@ GraphQL::Batch::Promise#sync can be used to wait for a promise to be resolved an
   end
 ```
 
-Use GraphQL::Batch::Promise.all instead of Promise.all to be able to call sync on the returned promise.
-
-```ruby
-  def test_batch_query
-    products = [products(:snowboard), products(:jacket)]
-    query1 = RecordLoader.for(Product).load(products(:snowboard).id).then(&:title)
-    query2 = RecordLoader.for(Product).load(products(:jacket).id).then(&:title)
-    results = GraphQL::Batch::Promise.all([query1, query2]).sync
-    assert_equal products(:snowboard).title, results[0]
-    assert_equal products(:jacket).title, results[1]
-  end
-```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

graphql-batch.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "graphql", ">= 0.8", "< 2"
-  spec.add_runtime_dependency "promise.rb", "~> 0.7.0.rc2"
+  spec.add_runtime_dependency "promise.rb", "~> 0.7.2"
 
   spec.add_development_dependency "byebug" if RUBY_ENGINE == 'ruby'
   spec.add_development_dependency "bundler", "~> 1.10"

lib/graphql/batch.rb

@@ -3,7 +3,7 @@
 
 module GraphQL
   module Batch
-    BrokenPromiseError = Class.new(StandardError)
+    BrokenPromiseError = ::Promise::BrokenError
   end
 end
 

lib/graphql/batch/execution_strategy.rb

@@ -3,7 +3,7 @@ class ExecutionStrategy < GraphQL::Query::SerialExecution
     attr_accessor :disable_batching
 
     def execute(_, _, query)
-      as_promise(super).sync
+      Promise.sync(as_promise_unless_resolved(super))
     rescue GraphQL::InvalidNullError => err
       err.parent_error? || query.context.errors.push(err)
       nil
@@ -13,10 +13,6 @@ def execute(_, _, query)
 
     private
 
-    def as_promise(result)
-      GraphQL::Batch::Promise.resolve(as_promise_unless_resolved(result))
-    end
-
     def as_promise_unless_resolved(result)
       all_promises = []
       each_promise(result) do |obj, key, promise|

lib/graphql/batch/executor.rb

@@ -30,7 +30,7 @@ def tick
     def wait(promise)
       tick while promise.pending? && !loaders.empty?
       if promise.pending?
-        promise.reject(BrokenPromiseError.new("Promise wasn't fulfilled after all queries were loaded"))
+        promise.reject(::Promise::BrokenError.new("Promise wasn't fulfilled after all queries were loaded"))
       end
     end
 

lib/graphql/batch/loader.rb

@@ -91,7 +91,7 @@ def each_pending_promise(load_keys)
 
     def check_for_broken_promises(load_keys)
       each_pending_promise(load_keys) do |key, promise|
-        promise.reject(BrokenPromiseError.new("#{self.class} didn't fulfill promise for key #{key.inspect}"))
+        promise.reject(::Promise::BrokenError.new("#{self.class} didn't fulfill promise for key #{key.inspect}"))
       end
     end
   end

test/loader_test.rb

@@ -44,7 +44,7 @@ def test_single_query
   end
 
   def test_query_group
-    group = GraphQL::Batch::Promise.all([
+    group = Promise.all([
       GroupCountLoader.for('two').load(:a),
       GroupCountLoader.for('one').load(:a),
       GroupCountLoader.for('two').load(:b),
@@ -57,15 +57,15 @@ def test_query_many
   end
 
   def test_empty_group_query
-    assert_equal [], GraphQL::Batch::Promise.all([]).sync
+    assert_equal [], Promise.all([]).sync
   end
 
   def test_group_query_with_non_queries
-    assert_equal [1, :a, 'b'], GraphQL::Batch::Promise.all([1, :a, 'b']).sync
+    assert_equal [1, :a, 'b'], Promise.all([1, :a, 'b']).sync
   end
 
   def test_group_query_with_some_queries
-    group = GraphQL::Batch::Promise.all([
+    group = Promise.all([
       GroupCountLoader.for("two").load(:a),
       'one',
       GroupCountLoader.for("two").load(:b),
@@ -112,7 +112,7 @@ def test_broken_promise_loader_check
   end
 
   def test_loader_class_grouping
-    group = GraphQL::Batch::Promise.all([
+    group = Promise.all([
       EchoLoader.load(:a),
       IncrementLoader.load(1),
     ])