graphql-rb 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937f24e359a15a25d629f4b31ce3bece3339e88f
-  data.tar.gz: 15030d0283c03ba88bad726e1592e688eafe92c2
+  metadata.gz: 9fc710142a46d8360f72c3e6ba5833c748862ed7
+  data.tar.gz: 2d59d675fd5ac22450c1dfb6330469c881f20f61
 SHA512:
-  metadata.gz: 37c9f986ef04796ae4a4385d8c051064c1184803b92d30a3ee91b973e67b31d8ae18de18f53defab7ec0ea391e19a110f9a5fe3434adeba72015ac4846d90152
-  data.tar.gz: 7f5136940b38fab58a8f9db8c4d64d26edfd2861f0f6b0eadda57c67237a004b5de58e32fde49d9ff7ecd78decf2e7878c7e7bad27d72a817f66f71704c48a7f
+  metadata.gz: b3c4e2b1c74c372b81ef766637784dc2f8be2c22e1d5efa87ed43201cab455fac49ed5c7392894fce7cd5ce5d8acc59c6c68449672b2a02aa4f10782201f9e46
+  data.tar.gz: 600d2484eb3ed46d0e8862b90143ac85d3ebceec0b0552925b8d266603383cf2615922f76e20aa09ba84fa0bf7125f0a11a4a5c783fd68de6dc0fb2f3b975906

data/lib/graphql/execution/pool.rb

@@ -5,7 +5,7 @@ module GraphQL
 
     class Pool
       def self.future(&block)
-        _pool.future.perform(block)
+        pool.future.perform(block)
       end
 
       protected
@@ -17,12 +17,13 @@ module GraphQL
           value = block.call
           value = value.value if value.is_a?(Celluloid::Future)
           value
+        rescue Exception => e
+          e
         end
       end
 
-      def self._pool
-        Celluloid::Actor[pool_id] ||= Worker.pool#(as: pool_id)
-        # Celluloid::Actor[pool_id]
+      def self.pool
+        Celluloid::Actor[pool_id] ||= Worker.pool
       end
 
       def self.pool_id

data/lib/graphql/language/operation_definition.rb

@@ -5,17 +5,16 @@ module GraphQL
 
       def evaluate(context)
         context[:variables] = materialize_variables(context[:schema], context[:params])
-        type == 'mutation' ? execute_serially(context) : execute(context)
+        arguments = [
+          type == 'mutation' ? context[:schema].mutation_type : context[:schema].query_type,
+          type == 'mutation'
+        ]
+        execute(context, *arguments)
       end
 
 
-      def execute(context)
-        selection_set.evaluate(context, context[:schema].query_type, context[:root])
-      end
-
-
-      def execute_serially(context)
-        raise "Not implemented. Yet."
+      def execute(context, type, serially = false)
+        selection_set.evaluate(context, type, context[:root], serially: serially)
       end
 
 

data/lib/graphql/language/selection_set.rb

@@ -13,33 +13,63 @@ module GraphQL
       #         + context[schema, document]
       #
       #
-      def evaluate(context, object_type, object)
-        collect_fields(context, object_type).reduce({}) do |memo, (key, fields)|
-          field             = fields.first
-          field_definition  = case
+      # def evaluate(context, object_type, object)
+      #   collect_fields(context, object_type).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
+      #
+      #
+      #     memo[key.to_sym]      = begin
+      #       resolved_object     = field.resolve(context, object_type, object)
+      #
+      #       if resolved_object.is_a?(Celluloid::Future)
+      #         Execution::Pool.future do
+      #           complete_value(context, field_definition.type, resolved_object.value, merge_selection_sets(fields))
+      #         end
+      #       else
+      #         complete_value(context, field_definition.type, resolved_object, merge_selection_sets(fields))
+      #       end
+      #
+      #     rescue Celluloid::TaskTerminated => e
+      #       context[:errors] << "Field '#{field.name}' of '#{object_type}' error: #{e}"
+      #       nil
+      #     end unless field_definition.nil?
+      #
+      #     memo
+      #   end
+      # end
+
+
+      def evaluate(context, object_type, object, serially: false)
+        grouped_fields = collect_fields(context, object_type)
 
+        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
 
-
-          memo[key.to_sym]      = begin
-            resolved_object     = field.resolve(context, object_type, object)
-
-            if resolved_object.is_a?(Celluloid::Future)
-              Execution::Pool.future do
-                complete_value(context, field_definition.type, resolved_object.value, merge_selection_sets(fields))
-              end
-            else
-              complete_value(context, field_definition.type, resolved_object, merge_selection_sets(fields))
+          unless field_definition.nil?
+            context[:field_name] = field.name
+            value = Execution::Pool.future do
+              resolved_value  = field.resolve(context, object_type, object)
+              resolved_value  = resolved_value.value if resolved_value.is_a?(Celluloid::Future)
+              complete_value(context, field_definition.type, resolved_value, merge_selection_sets(fields))
             end
 
-          rescue Celluloid::TaskTerminated => e
-            context[:errors] << "Field '#{field.name}' of '#{object_type}' error: #{e}"
-            nil
-          end unless field_definition.nil?
+            memo[key.to_sym] = serially ? value.value : value
+          end
 
           memo
         end
@@ -109,6 +139,11 @@ module GraphQL
       def complete_value(context, field_type, resolved_object, selection_set)
         return nil if resolved_object.nil?
 
+        if resolved_object.is_a?(Exception)
+          context[:errors] << "Field '#{field_type}' of '#{context[:field_name]}' error: '#{resolved_object}'."
+          return nil
+        end
+
         case field_type
         when GraphQLNonNull
           completed_object = complete_value(context, field_type.of_type, resolved_object, selection_set)

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/mutation/mutation_spec.rb

@@ -0,0 +1,88 @@
+require 'graphql'
+
+RSpec.describe "Mutation Tests" do
+
+
+  TheNumber = Struct.new('Number', :value)
+
+  class TheNumber
+
+    def self.number
+      @number ||= TheNumber.new
+    end
+
+  end
+
+  NumberHolderType = GraphQL::GraphQLObjectType.new do
+    name 'NumberHolder'
+    field :value, GraphQL::GraphQLInt
+  end
+
+
+  QueryType = GraphQL::GraphQLObjectType.new do
+    name 'Query'
+    field :numberHolder, NumberHolderType
+  end
+
+
+  MutationType = GraphQL::GraphQLObjectType.new do
+    name 'Mutation'
+
+    field :immediatelyChangeTheNumber, type: NumberHolderType do
+      arg :newNumber, GraphQL::GraphQLInt
+
+      resolve lambda { |object, params|
+        TheNumber.number.value = params[:newNumber]
+        return TheNumber.number
+      }
+    end
+
+    field :futureChangeTheNumber, type: NumberHolderType do
+      arg :newNumber, GraphQL::GraphQLInt
+
+      resolve lambda { |object, params|
+        GraphQL::Execution::Pool.future do
+          raise "Cannot change the number"
+          TheNumber.number.value = params[:newNumber]
+          TheNumber.number
+        end
+      }
+    end
+  end
+
+
+  Schema = GraphQL::GraphQLSchema.new do
+
+    query     QueryType
+    mutation  MutationType
+
+  end
+
+
+
+  it "Should evaluate mutations serially" do
+    query = %q(
+      mutation M {
+        first: immediatelyChangeTheNumber(newNumber: 1) {
+          value
+        }
+        second: futureChangeTheNumber(newNumber: 2) {
+          value
+        }
+        third: immediatelyChangeTheNumber(newNumber: 3) {
+          value
+        }
+        fourth: futureChangeTheNumber(newNumber: 4) {
+          value
+        }
+        fifth: immediatelyChangeTheNumber(newNumber: 5) {
+          value
+        }
+      }
+    )
+
+    puts GraphQL.graphql(Schema, query, {}, { newNumber: 1 })
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eugene Kovalev
@@ -155,6 +155,7 @@ files:
 - spec/introspection/full_spec.rb
 - spec/introspection/simple_spec.rb
 - spec/language/parser_spec.rb
+- spec/mutation/mutation_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/type/enum_spec.rb
@@ -193,6 +194,7 @@ test_files:
 - spec/introspection/full_spec.rb
 - spec/introspection/simple_spec.rb
 - spec/language/parser_spec.rb
+- spec/mutation/mutation_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/type/enum_spec.rb