rm respects_convention from schema, fix docs

Author: Marc-Andre Giroux

lib/graphql/language/document_from_schema_definition.rb

@@ -9,9 +9,9 @@ module Language
     # @param context [Hash]
     # @param only [<#call(member, ctx)>]
     # @param except [<#call(member, ctx)>]
-    # @param include_introspection_types [Boolean] Wether or not to include introspection types in the AST
-    # @param include_built_in_scalars [Boolean] Wether or not to include built in scalars in the AST
-    # @param include_built_in_directives [Boolean] Wether or not to include built in diirectives in the AST
+    # @param include_introspection_types [Boolean] Whether or not to include introspection types in the AST
+    # @param include_built_in_scalars [Boolean] Whether or not to include built in scalars in the AST
+    # @param include_built_in_directives [Boolean] Whether or not to include built in diirectives in the AST
     class DocumentFromSchemaDefinition
       def initialize(
         schema, context: nil, only: nil, except: nil, include_introspection_types: false,
@@ -39,16 +39,12 @@ def document
       def build_schema_node
         schema_node = GraphQL::Language::Nodes::SchemaDefinition.new
 
-        if schema.query && warden.get_type(schema.query.name)
-          schema_node.query = schema.query.name
-        end
-
-        if schema.mutation && warden.get_type(schema.mutation.name)
-          schema_node.mutation = schema.mutation.name
-        end
+        ["query", "mutation", "subscription"].each do |operation_name|
+          root_type = schema.root_type_for_operation(operation_name)
 
-        if schema.subscription && warden.get_type(schema.subscription.name)
-          schema_node.subscription = schema.subscription.name
+          if root_type
+            schema_node.public_send("#{operation_name}=", warden.get_type(root_type.name))
+          end
         end
 
         schema_node
@@ -271,7 +267,13 @@ def build_field_nodes(fields)
       private
 
       def include_schema_node?
-        always_include_schema || !schema.respects_root_name_conventions?
+        always_include_schema || !schema_respects_root_name_conventions?(schema)
+      end
+
+      def schema_respects_root_name_conventions?(schema)
+        (schema.query.nil? || schema.query.name == 'Query') &&
+        (schema.mutation.nil? || schema.mutation.name == 'Mutation') &&
+        (schema.subscription.nil? || schema.subscription.name == 'Subscription')
       end
 
       attr_reader :schema, :warden, :always_include_schema,

spec/graphql/schema_spec.rb

@@ -17,28 +17,6 @@
     end
   end
 
-  describe "#respects_root_name_conventions?" do
-    it "returns true when schema respects root name conventions" do
-      schema = GraphQL::Schema.define do
-        query GraphQL::ObjectType.define { name "Query" }
-        mutation GraphQL::ObjectType.define { name "Mutation" }
-        subscription GraphQL::ObjectType.define { name "Subscription" }
-      end
-
-      assert schema.respects_root_name_conventions?
-    end
-
-    it "returns false when schema respects root name conventions" do
-      schema = GraphQL::Schema.define do
-        query GraphQL::ObjectType.define { name "Query" }
-        mutation GraphQL::ObjectType.define { name "MutationType" }
-        subscription GraphQL::ObjectType.define { name "Subscription" }
-      end
-
-      assert_equal false, schema.respects_root_name_conventions?
-    end
-  end
-
   describe "#union_memberships" do
     it "returns a list of unions that include the type" do
       assert_equal [schema.types["Animal"], schema.types["AnimalAsCow"]], schema.union_memberships(schema.types["Cow"])