graphql 0.8.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c0ce19c395ce2fa16c8bdda05deb21afff1ed50
-  data.tar.gz: 3b0d23d2040af5c80c658540184c73b498e9953e
+  metadata.gz: 443760bcd1ca8e0c763ba9216cfc511c8c3d1185
+  data.tar.gz: df070125ce170c79d75bb7f5abe4c4303aaf6332
 SHA512:
-  metadata.gz: 8d19a08cc0c1924b68cffbfc70684fd72c9294eb11a96262efbbd6941c8885aec35a19c5bb2776ffb470b90be6f83dfafb969c275bdde6af25cdf236b7f1faec
-  data.tar.gz: dcc7027ef6dabc7a901e7c0b355df51b3fbbbea5922f987a835dcb0dc85ebdef9c27f9d5a12e4c43279d465feacc4862a58eef9c041c8ebe46c7fcc6a124b116
+  metadata.gz: 9bbe4e2c99893d0bbb4d68ede2bff4acb9e3f8f11b9ff339a4e159db0baf4ccea21f3168ca69eb3cfb1737528f7dcf1a389df2f219b397c1a321416c061ab2af
+  data.tar.gz: ed66af0387e274413d89bed95e9b1f4e36c5d90b542505759046f53d8b6a310894a09f0ca4197872eab1b50bda74b01ad1a745a80f149fba042a8628d02ebfad

data/lib/graphql.rb

@@ -1,4 +1,3 @@
-require "celluloid/current"
 require "json"
 require "parslet"
 require "singleton"

data/lib/graphql/query.rb

@@ -53,7 +53,6 @@ end
 require 'graphql/query/arguments'
 require 'graphql/query/base_execution'
 require 'graphql/query/serial_execution'
-require 'graphql/query/parallel_execution'
 require 'graphql/query/type_resolver'
 require 'graphql/query/directive_chain'
 require 'graphql/query/executor'

data/lib/graphql/query/base_execution.rb

@@ -37,12 +37,6 @@ module GraphQL
         get_class :SelectionResolution
       end
 
-      # ParallelExecution overrides this to provide
-      # real async behavior
-      def async(&block)
-        block.call
-      end
-
       private
 
       def get_class(class_name)

data/lib/graphql/query/context.rb

@@ -11,10 +11,6 @@ module GraphQL
       def [](key)
         @values[key]
       end
-
-      def async(&block)
-        execution_strategy.async(block)
-      end
     end
   end
 end

data/lib/graphql/query/executor.rb

@@ -31,10 +31,10 @@ module GraphQL
         operation = find_operation(operation_name, query.operations)
         if operation.operation_type == "query"
           root_type = query.schema.query
-          execution_strategy_class = query.schema.query_execution_strategy || GraphQL::Query::ParallelExecution
+          execution_strategy_class = query.schema.query_execution_strategy
         elsif operation.operation_type == "mutation"
           root_type = query.schema.mutation
-          execution_strategy_class =  query.schema.mutation_execution_strategy || GraphQL::Query::SerialExecution
+          execution_strategy_class = query.schema.mutation_execution_strategy
         end
         execution_strategy = execution_strategy_class.new
         query.context.execution_strategy = execution_strategy

data/lib/graphql/schema.rb

@@ -4,7 +4,7 @@ class GraphQL::Schema
   DYNAMIC_FIELDS = ["__type", "__typename", "__schema"]
 
   attr_reader :query, :mutation, :directives, :static_validator
-  # Override these if you don't want the default executors:
+  # Override these if you don't want the default executor:
   attr_accessor :query_execution_strategy, :mutation_execution_strategy
 
 
@@ -15,6 +15,9 @@ class GraphQL::Schema
     @mutation = mutation
     @directives = DIRECTIVES.reduce({}) { |m, d| m[d.name] = d; m }
     @static_validator = GraphQL::StaticValidation::Validator.new(schema: self)
+    # Default to the built-in execution strategy:
+    self.query_execution_strategy = GraphQL::Query::SerialExecution
+    self.mutation_execution_strategy = GraphQL::Query::SerialExecution
   end
 
   # A `{ name => type }` hash of types in this schema

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.8.1"
+  VERSION = "0.9.2"
 end

data/readme.md

@@ -123,7 +123,7 @@ If you're building a backend for [Relay](http://facebook.github.io/relay/), you'
 - `graphql-ruby` + Rails demo ([src](https://github.com/rmosolgo/graphql-ruby-demo) / [heroku](http://graphql-ruby-demo.herokuapp.com))
 - [GraphQL Slack](https://graphql-slack.herokuapp.com/)
 - [Example Relay support](https://github.com/rmosolgo/graphql-relay-ruby) in Ruby
-- [`graphql-parallel`][https://github.com/rmosolgo/graphql-parallel], an asynchronous query execution strategy
+- [`graphql-parallel`](https://github.com/rmosolgo/graphql-parallel), an asynchronous query execution strategy
 
 ## P.S.
 

data/spec/support/dairy_app.rb

@@ -41,9 +41,7 @@ CheeseType = GraphQL::ObjectType.define do
     description("Cheeses like this one")
     argument :source, !types[!DairyAnimalEnum]
     resolve -> (t, a, c) {
-      c.async do
-        CHEESES.values.find { |c| c.source == a["source"] }
-      end
+      CHEESES.values.find { |c| c.source == a["source"] }
     }
   end
 
@@ -161,7 +159,7 @@ QueryType = GraphQL::ObjectType.define do
   field :error do
     description "Raise an error"
     type GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { c.async { raise("This error was raised on purpose") } }
+    resolve -> (t, a, c) { raise("This error was raised on purpose") }
   end
 
   # To test possibly-null fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Robert Mosolgo
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +213,6 @@ files:
 - lib/graphql/query/context.rb
 - lib/graphql/query/directive_chain.rb
 - lib/graphql/query/executor.rb
-- lib/graphql/query/parallel_execution.rb
 - lib/graphql/query/serial_execution.rb
 - lib/graphql/query/serial_execution/field_resolution.rb
 - lib/graphql/query/serial_execution/fragment_spread_resolution.rb
@@ -288,7 +273,6 @@ files:
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/executor_spec.rb
-- spec/graphql/query/parallel_execution_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/schema/field_validator_spec.rb
 - spec/graphql/schema/type_reducer_spec.rb
@@ -315,7 +299,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
-- spec/support/parallel_schema.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb
 homepage: http://github.com/rmosolgo/graphql-ruby
@@ -359,7 +342,6 @@ test_files:
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/object_type_spec.rb
 - spec/graphql/query/executor_spec.rb
-- spec/graphql/query/parallel_execution_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/schema/field_validator_spec.rb
 - spec/graphql/schema/type_reducer_spec.rb
@@ -386,6 +368,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/dairy_app.rb
 - spec/support/dairy_data.rb
-- spec/support/parallel_schema.rb
 - spec/support/star_wars_data.rb
 - spec/support/star_wars_schema.rb

data/lib/graphql/query/parallel_execution.rb

@@ -1,102 +0,0 @@
-module GraphQL
-  class Query
-    # Utilize Celluloid::Future to run field resolution in parallel.
-    class ParallelExecution < GraphQL::Query::BaseExecution
-      def initialize
-        # Why isn't `require "celluloid/current"` enough here?
-        Celluloid.boot unless Celluloid.running?
-        @has_futures = false
-      end
-
-      def pool
-        @pool ||= ExecutionPool.run!
-        @pool[:execution_worker_pool]
-      end
-
-      def async(block)
-        @has_futures ||= true
-        warn("GraphQL::Query::ParallelExecution has been extracted to the `graphql-parallel` gem, use that instead!")
-        pool.future.resolve(block)
-      end
-
-      def has_futures?
-        @has_futures
-      end
-
-      class OperationResolution < GraphQL::Query::SerialExecution::OperationResolution
-        def result
-          result_futures = super
-          if execution_strategy.has_futures?
-            finished_result = finish_all_futures(result_futures)
-          else
-            # Don't bother re-traversing the result if there are no futures.
-            finished_result = result_futures
-          end
-        ensure
-          execution_strategy.pool.terminate
-          finished_result
-        end
-
-        # Recurse over `result_object`, finding any futures and
-        # getting their finished values.
-        def finish_all_futures(result_object)
-          if result_object.is_a?(FutureFieldResolution)
-            resolved_value = finish_all_futures(result_object.result)
-          elsif result_object.is_a?(Hash)
-            result_object.each do |key, value|
-              result_object[key] = finish_all_futures(value)
-            end
-            resolved_value = result_object
-          elsif result_object.is_a?(Array)
-            resolved_value = result_object.map { |v| finish_all_futures(v) }
-          else
-            resolved_value = result_object
-          end
-        end
-      end
-
-      class SelectionResolution < GraphQL::Query::SerialExecution::SelectionResolution
-      end
-
-      class FieldResolution < GraphQL::Query::SerialExecution::FieldResolution
-        def get_finished_value(raw_value)
-          if raw_value.is_a?(Celluloid::Future)
-            GraphQL::Query::ParallelExecution::FutureFieldResolution.new(field_resolution: self, future: raw_value)
-          else
-            super
-          end
-        end
-      end
-
-      class InlineFragmentResolution < GraphQL::Query::SerialExecution::InlineFragmentResolution
-      end
-
-      class FragmentSpreadResolution < GraphQL::Query::SerialExecution::FragmentSpreadResolution
-      end
-
-      class ExecutionWorker
-        include Celluloid
-        def resolve(proc)
-          proc.call
-        end
-      end
-
-      class ExecutionPool < Celluloid::Supervision::Container
-        pool ExecutionWorker, as: :execution_worker_pool
-      end
-
-      class FutureFieldResolution
-        def initialize(field_resolution:, future:)
-          @field_resolution = field_resolution
-          @future = future
-        end
-
-        def result
-          resolved_value = @future.value
-          result_value = @field_resolution.get_finished_value(resolved_value)
-          result_value
-        end
-      end
-    end
-  end
-end

data/spec/graphql/query/parallel_execution_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe GraphQL::Query::ParallelExecution do
-  let(:result) { GraphQL::Query.new(SlowSchema, query_string).result }
-  describe "fields that take a long time" do
-    let(:query_string) {%|
-      {
-        slow1: slow { slow1, slow2, slows { slow1 } }
-        slow2: slow { slow1, slow2, lastSlow: slow3 }
-      }
-    |}
-
-    it "runs them in parallel, not in sequence" do
-      elapsed = Benchmark.realtime { result }
-      assert elapsed < 0.7, "It takes less that the sum of all sleeps"
-
-      expected = { "data" => {
-        "slow1" => { "slow1" => 1, "slow2" => 1, "slows" => [
-            { "slow1" => 1 },
-            { "slow1" => 1 },
-            { "slow1" => 1 },
-          ]
-        },
-        "slow2" => { "slow1" => 1, "slow2" => 1, "lastSlow" => 1},
-      }}
-      assert_equal expected, result, "It renders the right result"
-    end
-  end
-end

data/spec/support/parallel_schema.rb

@@ -1,31 +0,0 @@
-
-def create_slow_field
-  GraphQL::Field.define do
-    type(types.Int)
-    resolve -> (obj, args, ctx) {
-      ctx.async {
-        sleep 0.3
-        1
-      }
-    }
-  end
-end
-
-SlowType = GraphQL::ObjectType.define do
-  name "Slow"
-  field :slow1, field: create_slow_field
-  field :slow2, field: create_slow_field
-  field :slow3, field: create_slow_field
-  field :slows, -> { types[SlowType] } do
-    resolve -> (o, a, ctx)  { ctx.async { [:slow, :slow, :slow] } }
-  end
-end
-
-SlowQueryType = GraphQL::ObjectType.define do
-  name "Query"
-  field :slow, SlowType do
-    resolve -> (o, a, c) { :slow }
-  end
-end
-
-SlowSchema = GraphQL::Schema.new(query: SlowQueryType)