graphql 0.7.1 → 0.8.0

data/spec/graphql/object_type_spec.rb

@@ -18,26 +18,6 @@ describe GraphQL::ObjectType do
     assert_equal([EdibleInterface, AnimalProductInterface], type.interfaces)
   end
 
-  it 'becomes non-null with !' do
-    non_null_type = !type
-    assert_equal(GraphQL::TypeKinds::NON_NULL, non_null_type.kind)
-    assert_equal(type, non_null_type.of_type)
-    assert_equal(GraphQL::TypeKinds::NON_NULL, (!GraphQL::STRING_TYPE).kind)
-  end
-
-  it 'can be compared' do
-    assert_equal(!GraphQL::INT_TYPE, !GraphQL::INT_TYPE)
-    refute_equal(!GraphQL::FLOAT_TYPE, GraphQL::FLOAT_TYPE)
-    assert_equal(
-      GraphQL::ListType.new(of_type: MilkType),
-      GraphQL::ListType.new(of_type: MilkType)
-    )
-    refute_equal(
-      GraphQL::ListType.new(of_type: MilkType),
-      GraphQL::ListType.new(of_type: !MilkType)
-    )
-  end
-
   describe '.fields ' do
     it 'exposes fields' do
       field = type.fields["id"]

data/spec/graphql/query/parallel_execution_spec.rb

@@ -0,0 +1,29 @@
+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/graphql/query_spec.rb

@@ -151,16 +151,33 @@ describe GraphQL::Query do
         argument :key, !types.String
         resolve -> (target, args, ctx) { ctx[args[:key]] }
       end
+      field :contextAstNodeName, types.String do
+        resolve -> (target, args, ctx) { ctx.ast_node.class.name }
+      end
     }}
     let(:schema) { GraphQL::Schema.new(query: query_type, mutation: nil)}
     let(:query) { GraphQL::Query.new(schema, query_string, context: {"some_key" => "some value"})}
-    let(:query_string) { %|
-      query getCtx { context(key: "some_key") }
-    |}
 
-    it 'passes context to fields' do
-      expected = {"data" => {"context" => "some value"}}
-      assert_equal(expected, query.result)
+    describe "access to passed-in values" do
+      let(:query_string) { %|
+        query getCtx { context(key: "some_key") }
+      |}
+
+      it 'passes context to fields' do
+        expected = {"data" => {"context" => "some value"}}
+        assert_equal(expected, query.result)
+      end
+    end
+
+    describe "access to the AST node" do
+      let(:query_string) { %|
+        query getCtx { contextAstNodeName }
+      |}
+
+      it 'provides access to the AST node' do
+        expected = {"data" => {"contextAstNodeName" => "GraphQL::Language::Nodes::Field"}}
+        assert_equal(expected, query.result)
+      end
     end
   end
 end

data/spec/graphql/schema/type_reducer_spec.rb

@@ -36,4 +36,29 @@ describe GraphQL::Schema::TypeReducer do
       assert_raises(GraphQL::Schema::InvalidTypeError) { reducer.result }
     end
   end
+
+  describe 'when a schema has multiple types with the same name' do
+    let(:type_1) {
+      GraphQL::ObjectType.define do
+        name "MyType"
+      end
+    }
+    let(:type_2) {
+      GraphQL::ObjectType.define do
+        name "MyType"
+      end
+    }
+    it 'raises an error' do
+      assert_raises(RuntimeError) {
+        GraphQL::Schema::TypeReducer.find_all([type_1, type_2])
+      }
+    end
+  end
+
+  describe 'when getting a type which doesnt exist' do
+    it 'raises an error' do
+      type_map = GraphQL::Schema::TypeReducer.find_all([])
+      assert_raises(RuntimeError) { type_map["SomeType"] }
+    end
+  end
 end

data/spec/graphql/static_validation/validator_spec.rb

@@ -31,8 +31,8 @@ describe GraphQL::StaticValidation::Validator do
 
     describe 'fields & arguments' do
       let(:query_string) { %|
-        query getCheese {
-          cheese(id: 1) {
+        query getCheese($id: Int!) {
+          cheese(id: $id, bogusArg: true) {
             source,
             nonsenseField,
             id(nonsenseArg: 1)
@@ -42,7 +42,8 @@ describe GraphQL::StaticValidation::Validator do
       |}
 
       it 'handles args on invalid fields' do
-        assert_equal(3, errors.length)
+        # nonsenseField, nonsenseArg, bogusField, bogusArg
+        assert_equal(4, errors.length)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 require 'graphql'
-require 'date'
+require "benchmark"
 require "minitest/autorun"
 require "minitest/focus"
 require "minitest/reporters"

data/spec/support/dairy_app.rb

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

data/spec/support/parallel_schema.rb

@@ -0,0 +1,31 @@
+
+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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -24,6 +24,20 @@ 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
@@ -161,6 +175,7 @@ files:
 - MIT-LICENSE
 - lib/graphql.rb
 - lib/graphql/argument.rb
+- lib/graphql/base_type.rb
 - lib/graphql/boolean_type.rb
 - lib/graphql/definition_helpers.rb
 - lib/graphql/definition_helpers/defined_by_config.rb
@@ -208,8 +223,10 @@ files:
 - lib/graphql/query/arguments.rb
 - lib/graphql/query/base_execution.rb
 - lib/graphql/query/base_execution/selected_object_resolution.rb
+- lib/graphql/query/base_execution/value_resolution.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
@@ -217,13 +234,13 @@ files:
 - lib/graphql/query/serial_execution/operation_resolution.rb
 - lib/graphql/query/serial_execution/selection_resolution.rb
 - lib/graphql/query/type_resolver.rb
-- lib/graphql/query/value_resolution.rb
 - lib/graphql/repl.rb
 - lib/graphql/scalar_type.rb
 - lib/graphql/schema.rb
 - lib/graphql/schema/each_item_validator.rb
 - lib/graphql/schema/field_validator.rb
 - lib/graphql/schema/implementation_validator.rb
+- lib/graphql/schema/type_map.rb
 - lib/graphql/schema/type_reducer.rb
 - lib/graphql/schema/type_validator.rb
 - lib/graphql/static_validation.rb
@@ -254,6 +271,7 @@ files:
 - lib/graphql/union_type.rb
 - lib/graphql/version.rb
 - readme.md
+- spec/graphql/base_type_spec.rb
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/field_spec.rb
@@ -269,6 +287,7 @@ 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
@@ -295,6 +314,7 @@ 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
@@ -322,6 +342,7 @@ signing_key:
 specification_version: 4
 summary: A GraphQL implementation for Ruby
 test_files:
+- spec/graphql/base_type_spec.rb
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/field_spec.rb
@@ -337,6 +358,7 @@ 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
@@ -363,5 +385,6 @@ 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/value_resolution.rb

@@ -1,76 +0,0 @@
-module GraphQL
-  class Query
-    module ValueResolution
-      def self.get_strategy_for_kind(kind)
-        TYPE_KIND_STRATEGIES[kind] || raise("No value resolution strategy for #{kind}!")
-      end
-
-      class BaseResolution
-        attr_reader :value, :field_type, :target, :parent_type,
-          :ast_field, :query, :execution_strategy
-        def initialize(value, field_type, target, parent_type, ast_field, query, execution_strategy)
-          @value = value
-          @field_type = field_type
-          @target = target
-          @parent_type = parent_type
-          @ast_field = ast_field
-          @query = query
-          @execution_strategy = execution_strategy
-        end
-
-        def result
-          raise NotImplementedError, "Should return a value based on initialization params"
-        end
-      end
-
-      class ScalarResolution < BaseResolution
-        def result
-          field_type.coerce(value)
-        end
-      end
-
-      class ListResolution < BaseResolution
-        def result
-          wrapped_type = field_type.of_type
-          value.map do |item|
-            resolved_type = wrapped_type.kind.resolve(wrapped_type, item)
-            strategy_class = GraphQL::Query::ValueResolution.get_strategy_for_kind(resolved_type.kind)
-            inner_strategy = strategy_class.new(item, resolved_type, target, parent_type, ast_field, query, execution_strategy)
-            inner_strategy.result
-          end
-        end
-      end
-
-      class ObjectResolution < BaseResolution
-        def result
-          resolver = execution_strategy.selection_resolution.new(value, field_type, ast_field.selections, query, execution_strategy)
-          resolver.result
-        end
-      end
-
-      class EnumResolution < BaseResolution
-        def result
-           value.to_s
-        end
-      end
-
-      class NonNullResolution < BaseResolution
-        def result
-          wrapped_type = field_type.of_type
-          resolved_type = wrapped_type.kind.resolve(wrapped_type, value)
-          strategy_class = GraphQL::Query::ValueResolution.get_strategy_for_kind(resolved_type.kind)
-          inner_strategy = strategy_class.new(value, resolved_type, target, parent_type, ast_field, query, execution_strategy)
-          inner_strategy.result
-        end
-      end
-
-      TYPE_KIND_STRATEGIES = {
-        GraphQL::TypeKinds::SCALAR =>     ScalarResolution,
-        GraphQL::TypeKinds::LIST =>       ListResolution,
-        GraphQL::TypeKinds::OBJECT =>     ObjectResolution,
-        GraphQL::TypeKinds::ENUM =>       EnumResolution,
-        GraphQL::TypeKinds::NON_NULL =>   NonNullResolution,
-      }
-    end
-  end
-end