graphql-rb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e85ee1f949bceb0fe95f2dada16f74ffc19e0d
-  data.tar.gz: 252501b803d6731e69043cda2ad89c1954b781db
+  metadata.gz: 937f24e359a15a25d629f4b31ce3bece3339e88f
+  data.tar.gz: 15030d0283c03ba88bad726e1592e688eafe92c2
 SHA512:
-  metadata.gz: 9c94dccf0f87b8f7445ed82f96dd92314e172c6b08eec7e46825f09b01c3616790dcdd519e739cf02b39bd561d29fa3bc7d0ef2c28f6d40e5f2274cd74837425
-  data.tar.gz: ed564c11be1c16c1638ddc58ac2ed569dab46bac35337919e6daaf054831b228123a8013c279ad0684c1550a5a738ea15ae4d4646d4b692c988bf8d13388ae53
+  metadata.gz: 37c9f986ef04796ae4a4385d8c051064c1184803b92d30a3ee91b973e67b31d8ae18de18f53defab7ec0ea391e19a110f9a5fe3434adeba72015ac4846d90152
+  data.tar.gz: 7f5136940b38fab58a8f9db8c4d64d26edfd2861f0f6b0eadda57c67237a004b5de58e32fde49d9ff7ecd78decf2e7878c7e7bad27d72a817f66f71704c48a7f

data/lib/graphql/execution/pool.rb

@@ -21,8 +21,8 @@ module GraphQL
       end
 
       def self._pool
-        Celluloid::Actor[pool_id] || Worker.supervise(as: pool_id)
-        Celluloid::Actor[pool_id]
+        Celluloid::Actor[pool_id] ||= Worker.pool#(as: pool_id)
+        # Celluloid::Actor[pool_id]
       end
 
       def self.pool_id

data/lib/graphql/language/field.rb

@@ -23,7 +23,7 @@ module GraphQL
         arguments = [
             object,
             materialize_arguments(object_type, context[:variables]),
-            context
+            context.merge(parent_type: object_type)
         ]
 
         resolve   = schema_field(object_type).resolve
@@ -41,6 +41,7 @@ module GraphQL
         end
       end
 
+
       def schema_field(object_type)
         case
         when GraphQL::Introspection.meta_field?(name)

data/lib/graphql/language/selection_set.rb

@@ -14,30 +14,34 @@ module GraphQL
       #
       #
       def evaluate(context, object_type, object)
-        Execution::Pool.future do
+        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
+
 
-          collect_fields(context, object_type).reduce({}) do |memo, (key, fields)|
-            field             = fields.first
-            field_definition  = case
+          memo[key.to_sym]      = begin
+            resolved_object     = field.resolve(context, object_type, object)
 
-            when GraphQL::Introspection.meta_field?(field.name)
-              GraphQL::Introspection.meta_field(field.name)
+            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
-              object_type.field(field.name)
+              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[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
+          memo
         end
       end
 
@@ -105,8 +109,6 @@ module GraphQL
       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)

data/lib/graphql/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eugene Kovalev