graphql-rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea68c93a7c58f20140405e57455f817f587a89f7
-  data.tar.gz: 1c70ce478b3283ed412d7d27c0c373d039907579
+  metadata.gz: e7b3163d3f0025e46cd6b51b90b2e4816e15ee36
+  data.tar.gz: 7fb736049261de9c5051281f51c2088cbc217076
 SHA512:
-  metadata.gz: 226d8b3ec2ddfa287937c239caaaaa845a6e226fd821ac514d15de6ee0e12b40716286ef083b74f87f6302129abc2d0049fe1c5ab2cec231730ae296cb938060
-  data.tar.gz: 90420d7f666c395dfb827f27d24b6ead1ac7f8faaa5b342940b046cf9124485df6a8aac1f903ab22d307bec5cb48db01c0707c871d26c88c2e91638e508bf65b
+  metadata.gz: ce7bd2ef2e8c9cf05288df3258f05f5d2dc73ac50cb4f4bf152fab41d643c7d4e021be3ea62de19618bcd92566760f223c846eb7f06d3b6265b7d7cc445ceddf
+  data.tar.gz: d54360b65c917072a7eca4e2b7982da20075102b34b9b9a6636873cd6e68b764b2fd3e0896d17273228a60f4adbd46b171456e408b3ca536c579bd84b05ed05d

data/lib/graphql/execution/pool.rb

@@ -0,0 +1,34 @@
+require 'celluloid/current'
+
+module GraphQL
+  module Execution
+
+    class Pool
+      def self.future(&block)
+        _pool.future.perform(block)
+      end
+
+      protected
+
+      class Worker
+        include Celluloid
+
+        def perform(block)
+          value = block.call
+          value = value.value if value.is_a?(Celluloid::Future)
+          value
+        end
+      end
+
+      def self._pool
+        Celluloid::Actor[pool_id] ||= Worker.pool
+      end
+
+      def self.pool_id
+        @pool_id ||= SecureRandom.uuid
+      end
+
+    end
+
+  end
+end

data/lib/graphql/executor.rb

@@ -1,42 +1,6 @@
-require 'celluloid/current'
-require 'singleton'
-
 module GraphQL
   class Executor
 
-    class FutureCompleter
-      include Celluloid
-      include Singleton
-
-      def self.complete_value(context, field_type, resolved_object, selection_set)
-        completer = resolved_object.is_a?(Celluloid::Future) ? instance.future : instance
-        completer.complete_value(context, field_type, resolved_object, selection_set)
-      end
-
-      def complete_value(context, field_type, resolved_object, selection_set)
-        return nil if resolved_object.nil?
-
-        resolved_object = resolved_object.value if resolved_object.is_a?(Celluloid::Future)
-
-        case field_type
-        when GraphQLNonNull
-          completed_object = complete_value(context, field_type.of_type, resolved_object, selection_set)
-          raise "Field error: expecting non null value" if completed_object.nil?
-          completed_object
-        when GraphQLList
-          resolved_object.map do |item|
-            complete_value(context, field_type.of_type, item, selection_set)
-          end
-        when GraphQLScalarType, GraphQLEnumType
-          field_type.serialize(resolved_object)
-        when GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType
-          field_type = field_type.resolve_type(resolved_object) if field_type.is_a?(GraphQLAbstractType)
-          selection_set.evaluate(context, field_type, resolved_object)
-        end
-
-      end
-    end
-
     attr_reader :document, :schema, :context
 
     def initialize(document, schema)
@@ -44,7 +8,8 @@ module GraphQL
       @schema   = schema
       @context  = {
         document:   document,
-        schema:     schema
+        schema:     schema,
+        errors:     []
       }
     end
 
@@ -60,23 +25,26 @@ module GraphQL
       context[:root]    = root
       context[:params]  = params
 
-      materialize(operation.evaluate(context))
+      return materialize(operation.evaluate(context)), context[:errors]
     end
 
     def materialize(data)
       case data
+      when Celluloid::Future
+        materialize(data.value)
       when Hash
-        data.each do |key, value|
-          data[key] = value.value if value.is_a?(Celluloid::Future)
-          materialize(data[key])
+        data.reduce({}) do |memo, pair|
+          memo[pair.first] = materialize(pair.last)
+          memo
         end
       when Array
-        data.each_with_index do |value, i|
-          data[i] = value.value if value.is_a?(Celluloid::Future)
-          materialize(data[i])
+        data.each_with_index.reduce([]) do |memo, pair|
+          memo[pair.last] = materialize(pair.first)
+          memo
         end
+      else
+        data
       end
-      data
     end
 
   end

data/lib/graphql/language/selection_set.rb

@@ -12,33 +12,32 @@ module GraphQL
       #       objectType, object, - fields
       #         + context[schema, document]
       #
-      # TODO: think of way to have error accessor at this point. Executor?
       #
       def evaluate(context, object_type, object)
-        grouped_fields = collect_fields(context, object_type)
-
-        #
-        # TODO: Merge equal fields
-        #
-
-        grouped_fields.reduce({}) do |memo, (key, fields)|
-          field             = fields.first
-          field_definition  = case
-          when GraphQL::Introspection.meta_field?(field.name)
-            GraphQL::Introspection.meta_field(field.name)
-          else
-            object_type.field(field.name)
-          end
+        Execution::Pool.future do
 
-          unless field_definition.nil?
-            resolve_context = context.merge({ parent_type: object_type })
+          collect_fields(context, object_type).reduce({}) do |memo, (key, fields)|
+            field             = fields.first
+            field_definition  = case
 
-            resolved_object   = field.resolve(context, object_type, object)
-            selection_set     = merge_selection_sets(fields)
-            memo[key.to_sym]  = Executor::FutureCompleter.complete_value(context, field_definition.type, resolved_object, selection_set)
-          end
+            when GraphQL::Introspection.meta_field?(field.name)
+              GraphQL::Introspection.meta_field(field.name)
+            else
+              object_type.field(field.name)
+            end
 
-          memo
+
+            memo[key.to_sym]      = begin
+              resolution_context  = context.merge({ parent_type: object_type })
+              resolved_object     = field.resolve(resolution_context, object_type, object)
+              complete_value(context, field_definition.type, resolved_object, merge_selection_sets(fields))
+            rescue Celluloid::TaskTerminated => e
+              context[:errors] << "Field '#{field.name}' of '#{object_type}' error: #{e}"
+              nil
+            end unless field_definition.nil?
+
+            memo
+          end
         end
       end
 
@@ -102,6 +101,32 @@ module GraphQL
         SelectionSet.new(selections)
       end
 
+
+      def complete_value(context, field_type, resolved_object, selection_set)
+        return nil if resolved_object.nil?
+
+        return Execution::Pool.future do
+          complete_value(context, field_type, resolved_object.value, selection_set)
+        end if resolved_object.is_a?(Celluloid::Future)
+
+        case field_type
+        when GraphQLNonNull
+          completed_object = complete_value(context, field_type.of_type, resolved_object, selection_set)
+          raise "Field error: expecting non null value" if completed_object.nil?
+          completed_object
+        when GraphQLList
+          resolved_object.map do |item|
+            complete_value(context, field_type.of_type, item, selection_set)
+          end
+        when GraphQLScalarType, GraphQLEnumType
+          field_type.serialize(resolved_object)
+        when GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType
+          field_type = field_type.resolve_type(resolved_object) if field_type.is_a?(GraphQLAbstractType)
+          selection_set.evaluate(context, field_type, resolved_object)
+        end
+
+      end
+
     end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/graphql.rb

@@ -6,14 +6,15 @@ require 'graphql/language'
 require 'graphql/version'
 require 'graphql/executor'
 require 'graphql/validator'
+require 'graphql/execution/pool'
 
 module GraphQL
 
-  def self.graphql(schema, query, root, params, operation = nil)
-    document  = GraphQL::Language.parse(query)
-    executor  = GraphQL::Executor.new(document, schema)
-    result    = executor.execute(root, params, operation)
-    { data: result }
+  def self.graphql(schema, query, root = nil, params = {}, operation = nil)
+    document        = GraphQL::Language.parse(query)
+    executor        = GraphQL::Executor.new(document, schema)
+    result, errors  = executor.execute(root, params, operation)
+    { data: result }.tap { |result| result[:errors] = errors unless errors.empty? }
   rescue StandardError => e
     { errors: [e] }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eugene Kovalev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,6 +109,7 @@ files:
 - lib/graphql/configuration/slot.rb
 - lib/graphql/errors.rb
 - lib/graphql/errors/error.rb
+- lib/graphql/execution/pool.rb
 - lib/graphql/executor.rb
 - lib/graphql/introspection.rb
 - lib/graphql/introspection/meta_fields.rb
@@ -172,9 +173,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="