graphql 0.19.3 → 0.19.4

data/lib/graphql/static_validation/arguments_validator.rb

@@ -6,7 +6,7 @@ module GraphQL
 
       def validate(context)
         visitor = context.visitor
-        visitor[GraphQL::Language::Nodes::Argument] << -> (node, parent) {
+        visitor[GraphQL::Language::Nodes::Argument] << ->(node, parent) {
           if parent.is_a?(GraphQL::Language::Nodes::InputObject)
             arg_defn = context.argument_definition
             if arg_defn.nil?

data/lib/graphql/static_validation/rules/directives_are_defined.rb

@@ -5,7 +5,7 @@ module GraphQL
 
       def validate(context)
         directive_names = context.schema.directives.keys
-        context.visitor[GraphQL::Language::Nodes::Directive] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::Directive] << ->(node, parent) {
           validate_directive(node, directive_names, context)
         }
       end

data/lib/graphql/static_validation/rules/directives_are_in_valid_locations.rb

@@ -7,7 +7,7 @@ module GraphQL
       def validate(context)
         directives = context.schema.directives
 
-        context.visitor[Nodes::Directive] << -> (node, parent) {
+        context.visitor[Nodes::Directive] << ->(node, parent) {
           validate_location(node, parent, directives, context)
         }
       end

data/lib/graphql/static_validation/rules/fields_are_defined_on_type.rb

@@ -5,7 +5,7 @@ module GraphQL
 
       def validate(context)
         visitor = context.visitor
-        visitor[GraphQL::Language::Nodes::Field] << -> (node, parent) {
+        visitor[GraphQL::Language::Nodes::Field] << ->(node, parent) {
           return if context.skip_field?(node.name)
           parent_type = context.object_types[-2]
           parent_type = parent_type.unwrap

data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb

@@ -6,7 +6,7 @@ module GraphQL
       include GraphQL::StaticValidation::Message::MessageHelper
 
       def validate(context)
-        context.visitor[GraphQL::Language::Nodes::Field] << -> (node, parent)  {
+        context.visitor[GraphQL::Language::Nodes::Field] << ->(node, parent)  {
           return if context.skip_field?(node.name)
           field_defn = context.field_definition
           validate_field_selections(node, field_defn, context)

data/lib/graphql/static_validation/rules/fields_will_merge.rb

@@ -5,12 +5,12 @@ module GraphQL
         fragments = {}
         has_selections = []
         visitor = context.visitor
-        visitor[GraphQL::Language::Nodes::OperationDefinition] << -> (node, parent) {
+        visitor[GraphQL::Language::Nodes::OperationDefinition] << ->(node, parent) {
           if node.selections.any?
             has_selections << node
           end
         }
-        visitor[GraphQL::Language::Nodes::Document].leave << -> (node, parent) {
+        visitor[GraphQL::Language::Nodes::Document].leave << ->(node, parent) {
           has_selections.each { |node|
             field_map = gather_fields_by_name(node.selections, {}, [], context)
             find_conflicts(field_map, [], context)
@@ -92,6 +92,7 @@ module GraphQL
             JSON.dump(arg)
           end
         end
+
         # Turn AST tree into a hash
         # can't look up args, the names just have to match
         def reduce_list(args)

data/lib/graphql/static_validation/rules/fragment_spreads_are_possible.rb

@@ -5,7 +5,7 @@ module GraphQL
 
       def validate(context)
 
-        context.visitor[GraphQL::Language::Nodes::InlineFragment] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::InlineFragment] << ->(node, parent) {
           fragment_parent = context.object_types[-2]
           fragment_child = context.object_types.last
           if fragment_child
@@ -15,12 +15,12 @@ module GraphQL
 
         spreads_to_validate = []
 
-        context.visitor[GraphQL::Language::Nodes::FragmentSpread] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::FragmentSpread] << ->(node, parent) {
           fragment_parent = context.object_types.last
           spreads_to_validate << FragmentSpread.new(node: node, parent_type: fragment_parent, path: context.path)
         }
 
-        context.visitor[GraphQL::Language::Nodes::Document].leave << -> (doc_node, parent) {
+        context.visitor[GraphQL::Language::Nodes::Document].leave << ->(doc_node, parent) {
           spreads_to_validate.each do |frag_spread|
             fragment_child_name = context.fragments[frag_spread.node.name].type
             fragment_child = context.schema.types.fetch(fragment_child_name, nil) # Might be non-existent type name

data/lib/graphql/static_validation/rules/fragment_types_exist.rb

@@ -10,7 +10,7 @@ module GraphQL
 
       def validate(context)
         FRAGMENTS_ON_TYPES.each do |node_class|
-          context.visitor[node_class] << -> (node, parent) { validate_type_exists(node, context) }
+          context.visitor[node_class] << ->(node, parent) { validate_type_exists(node, context) }
         end
       end
 

data/lib/graphql/static_validation/rules/fragments_are_finite.rb

@@ -4,8 +4,8 @@ module GraphQL
       include GraphQL::StaticValidation::Message::MessageHelper
 
       def validate(context)
-        context.visitor[GraphQL::Language::Nodes::FragmentDefinition] << -> (node, parent) {
-          if has_nested_spread(node, [], context)
+        context.visitor[GraphQL::Language::Nodes::FragmentDefinition] << ->(node, parent) {
+          if has_nested_spread?(node, [], context)
             context.errors << message("Fragment #{node.name} contains an infinite loop", node, context: context)
           end
         }
@@ -13,12 +13,17 @@ module GraphQL
 
       private
 
-      def has_nested_spread(fragment_def, parent_fragment_names, context)
+      def has_nested_spread?(fragment_def, parent_fragment_names, context)
         nested_spreads = get_spreads(fragment_def.selections)
 
         nested_spreads.any? do |spread|
           nested_def = context.fragments[spread.name]
-          parent_fragment_names.include?(spread.name) || has_nested_spread(nested_def, parent_fragment_names + [fragment_def.name], context)
+          if nested_def.nil?
+            # this is another kind of error
+            false
+          else
+            parent_fragment_names.include?(spread.name) || has_nested_spread?(nested_def, parent_fragment_names + [fragment_def.name], context)
+          end
         end
       end
 

data/lib/graphql/static_validation/rules/fragments_are_named.rb

@@ -4,7 +4,7 @@ module GraphQL
       include GraphQL::StaticValidation::Message::MessageHelper
 
       def validate(context)
-        context.visitor[GraphQL::Language::Nodes::FragmentDefinition] << -> (node, parent) { validate_name_exists(node, context) }
+        context.visitor[GraphQL::Language::Nodes::FragmentDefinition] << ->(node, parent) { validate_name_exists(node, context) }
       end
 
       private

data/lib/graphql/static_validation/rules/fragments_are_on_composite_types.rb

@@ -10,7 +10,7 @@ module GraphQL
 
       def validate(context)
         HAS_TYPE_CONDITION.each do |node_class|
-          context.visitor[node_class] << -> (node, parent) {
+          context.visitor[node_class] << ->(node, parent) {
             validate_type_is_composite(node, context)
           }
         end

data/lib/graphql/static_validation/rules/fragments_are_used.rb

@@ -8,19 +8,19 @@ module GraphQL
         used_fragments = []
         defined_fragments = []
 
-        v[GraphQL::Language::Nodes::Document] << -> (node, parent) {
+        v[GraphQL::Language::Nodes::Document] << ->(node, parent) {
           defined_fragments = node.definitions
             .select { |defn| defn.is_a?(GraphQL::Language::Nodes::FragmentDefinition) }
             .map { |node| FragmentInstance.new(node: node, path: context.path) }
         }
 
-        v[GraphQL::Language::Nodes::FragmentSpread] << -> (node, parent) {
+        v[GraphQL::Language::Nodes::FragmentSpread] << ->(node, parent) {
           used_fragments << FragmentInstance.new(node: node, path: context.path)
           if defined_fragments.none? { |defn| defn.name == node.name }
             GraphQL::Language::Visitor::SKIP
           end
         }
-        v[GraphQL::Language::Nodes::Document].leave << -> (node, parent) { add_errors(context, used_fragments, defined_fragments) }
+        v[GraphQL::Language::Nodes::Document].leave << ->(node, parent) { add_errors(context, used_fragments, defined_fragments) }
       end
 
       private

data/lib/graphql/static_validation/rules/mutation_root_exists.rb

@@ -8,7 +8,7 @@ module GraphQL
 
         visitor = context.visitor
 
-        visitor[GraphQL::Language::Nodes::OperationDefinition].enter << -> (ast_node, prev_ast_node) {
+        visitor[GraphQL::Language::Nodes::OperationDefinition].enter << ->(ast_node, prev_ast_node) {
           if ast_node.operation_type == 'mutation'
             context.errors << message('Schema is not configured for mutations', ast_node, context: context)
             return GraphQL::Language::Visitor::SKIP

data/lib/graphql/static_validation/rules/required_arguments_are_present.rb

@@ -5,8 +5,8 @@ module GraphQL
 
       def validate(context)
         v = context.visitor
-        v[GraphQL::Language::Nodes::Field] << -> (node, parent) { validate_field(node, context) }
-        v[GraphQL::Language::Nodes::Directive] << -> (node, parent) { validate_directive(node, context) }
+        v[GraphQL::Language::Nodes::Field] << ->(node, parent) { validate_field(node, context) }
+        v[GraphQL::Language::Nodes::Directive] << ->(node, parent) { validate_directive(node, context) }
       end
 
       private

data/lib/graphql/static_validation/rules/subscription_root_exists.rb

@@ -8,7 +8,7 @@ module GraphQL
 
         visitor = context.visitor
 
-        visitor[GraphQL::Language::Nodes::OperationDefinition].enter << -> (ast_node, prev_ast_node) {
+        visitor[GraphQL::Language::Nodes::OperationDefinition].enter << ->(ast_node, prev_ast_node) {
           if ast_node.operation_type == 'subscription'
             context.errors << message('Schema is not configured for subscriptions', ast_node, context: context)
             return GraphQL::Language::Visitor::SKIP

data/lib/graphql/static_validation/rules/variable_default_values_are_correctly_typed.rb

@@ -5,7 +5,7 @@ module GraphQL
 
       def validate(context)
         literal_validator = GraphQL::StaticValidation::LiteralValidator.new
-        context.visitor[GraphQL::Language::Nodes::VariableDefinition] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::VariableDefinition] << ->(node, parent) {
           if !node.default_value.nil?
             validate_default_value(node, literal_validator, context)
           end

data/lib/graphql/static_validation/rules/variable_usages_are_allowed.rb

@@ -7,11 +7,11 @@ module GraphQL
         # holds { name => ast_node } pairs
         declared_variables = {}
 
-        context.visitor[GraphQL::Language::Nodes::OperationDefinition] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::OperationDefinition] << ->(node, parent) {
           declared_variables = node.variables.each_with_object({}) { |var, memo| memo[var.name] = var }
         }
 
-        context.visitor[GraphQL::Language::Nodes::Argument] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::Argument] << ->(node, parent) {
           return if !node.value.is_a?(GraphQL::Language::Nodes::VariableIdentifier)
           if parent.is_a?(GraphQL::Language::Nodes::Field)
             arguments = context.field_definition.arguments

data/lib/graphql/static_validation/rules/variables_are_input_types.rb

@@ -4,7 +4,7 @@ module GraphQL
       include GraphQL::StaticValidation::Message::MessageHelper
 
       def validate(context)
-        context.visitor[GraphQL::Language::Nodes::VariableDefinition] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::VariableDefinition] << ->(node, parent) {
           validate_is_input_type(node, context)
         }
       end

data/lib/graphql/static_validation/rules/variables_are_used_and_defined.rb

@@ -35,19 +35,19 @@ module GraphQL
 
         # OperationDefinitions and FragmentDefinitions
         # both push themselves onto the context stack (and pop themselves off)
-        push_variable_context_stack = -> (node, parent) {
+        push_variable_context_stack = ->(node, parent) {
           # initialize the hash of vars for this context:
           variable_usages_for_context[node]
           variable_context_stack.push(node)
         }
 
-        pop_variable_context_stack = -> (node, parent) {
+        pop_variable_context_stack = ->(node, parent) {
           variable_context_stack.pop
         }
 
 
         context.visitor[GraphQL::Language::Nodes::OperationDefinition] << push_variable_context_stack
-        context.visitor[GraphQL::Language::Nodes::OperationDefinition] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::OperationDefinition] << ->(node, parent) {
           # mark variables as defined:
           var_hash = variable_usages_for_context[node]
           node.variables.each { |var|
@@ -64,7 +64,7 @@ module GraphQL
         # For FragmentSpreads:
         #  - find the context on the stack
         #  - mark the context as containing this spread
-        context.visitor[GraphQL::Language::Nodes::FragmentSpread] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::FragmentSpread] << ->(node, parent) {
           variable_context = variable_context_stack.last
           spreads_for_context[variable_context] << node.name
         }
@@ -72,7 +72,7 @@ module GraphQL
         # For VariableIdentifiers:
         #  - mark the variable as used
         #  - assign its AST node
-        context.visitor[GraphQL::Language::Nodes::VariableIdentifier] << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::VariableIdentifier] << ->(node, parent) {
           usage_context = variable_context_stack.last
           declared_variables = variable_usages_for_context[usage_context]
           usage = declared_variables[node.name]
@@ -82,7 +82,7 @@ module GraphQL
         }
 
 
-        context.visitor[GraphQL::Language::Nodes::Document].leave << -> (node, parent) {
+        context.visitor[GraphQL::Language::Nodes::Document].leave << ->(node, parent) {
           fragment_definitions = variable_usages_for_context.select { |key, value| key.is_a?(GraphQL::Language::Nodes::FragmentDefinition) }
           operation_definitions = variable_usages_for_context.select { |key, value| key.is_a?(GraphQL::Language::Nodes::OperationDefinition) }
 

data/lib/graphql/static_validation/type_stack.rb

@@ -41,8 +41,8 @@ module GraphQL
         @directive_definitions = []
         @argument_definitions = []
         @path = []
-        visitor.enter << -> (node, parent) { PUSH_STRATEGIES[node.class].push(self, node) }
-        visitor.leave << -> (node, parent) { PUSH_STRATEGIES[node.class].pop(self, node) }
+        visitor.enter << ->(node, parent) { PUSH_STRATEGIES[node.class].push(self, node) }
+        visitor.leave << ->(node, parent) { PUSH_STRATEGIES[node.class].pop(self, node) }
       end
 
       private

data/lib/graphql/string_type.rb

@@ -2,6 +2,6 @@ GraphQL::STRING_TYPE = GraphQL::ScalarType.define do
   name "String"
   description "Represents textual data as UTF-8 character sequences. This type is most often used by GraphQL to represent free-form human-readable text."
 
-  coerce_result -> (value) { value.to_s }
-  coerce_input -> (value) { value.is_a?(String) ? value : nil }
+  coerce_result ->(value) { value.to_s }
+  coerce_input ->(value) { value.is_a?(String) ? value : nil }
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.19.3"
+  VERSION = "0.19.4"
 end

data/readme.md

@@ -48,7 +48,7 @@ QueryType = GraphQL::ObjectType.define do
   field :post do
     type PostType
     argument :id, !types.ID
-    resolve -> (obj, args, ctx) { Post.find(args["id"]) }
+    resolve ->(obj, args, ctx) { Post.find(args["id"]) }
   end
 end
 

data/spec/graphql/analysis/analyze_query_spec.rb

@@ -17,7 +17,7 @@ describe GraphQL::Analysis do
 
   describe ".analyze_query" do
     let(:node_counter) {
-      -> (memo, visit_type, irep_node) {
+      ->(memo, visit_type, irep_node) {
         memo ||= Hash.new { |h,k| h[k] = 0 }
         visit_type == :enter && memo[irep_node.ast_node.class] += 1
         memo
@@ -57,7 +57,7 @@ describe GraphQL::Analysis do
           }
         }
       |}
-      let(:variable_accessor) { -> (memo, visit_type, irep_node) { query.variables["cheeseId"] } }
+      let(:variable_accessor) { ->(memo, visit_type, irep_node) { query.variables["cheeseId"] } }
 
       before do
         @previous_query_analyzers = DummySchema.query_analyzers.dup
@@ -78,7 +78,7 @@ describe GraphQL::Analysis do
 
     describe "when processing fields" do
       let(:connection_counter) {
-        -> (memo, visit_type, irep_node) {
+        ->(memo, visit_type, irep_node) {
           memo ||= Hash.new { |h,k| h[k] = 0 }
           if visit_type == :enter
             if irep_node.ast_node.is_a?(GraphQL::Language::Nodes::Field)

data/spec/graphql/analysis/query_complexity_spec.rb

@@ -223,12 +223,12 @@ describe GraphQL::Analysis::QueryComplexity do
       single_complexity_type = GraphQL::ObjectType.define do
         name "SingleComplexity"
         field :value, types.Int, complexity: 0.1 do
-          resolve -> (obj, args, ctx) { obj }
+          resolve ->(obj, args, ctx) { obj }
         end
         field :complexity, single_complexity_type do
           argument :value, types.Int
-          complexity -> (ctx, args, child_complexity) { args[:value] + child_complexity }
-          resolve -> (obj, args, ctx) { args[:value] }
+          complexity ->(ctx, args, child_complexity) { args[:value] + child_complexity }
+          resolve ->(obj, args, ctx) { args[:value] }
         end
         interfaces [complexity_interface]
       end
@@ -236,7 +236,7 @@ describe GraphQL::Analysis::QueryComplexity do
       double_complexity_type = GraphQL::ObjectType.define do
         name "DoubleComplexity"
         field :value, types.Int, complexity: 4 do
-          resolve -> (obj, args, ctx) { obj }
+          resolve ->(obj, args, ctx) { obj }
         end
         interfaces [complexity_interface]
       end
@@ -245,13 +245,13 @@ describe GraphQL::Analysis::QueryComplexity do
         name "Query"
         field :complexity, single_complexity_type do
           argument :value, types.Int
-          complexity -> (ctx, args, child_complexity) { args[:value] + child_complexity }
-          resolve -> (obj, args, ctx) { args[:value] }
+          complexity ->(ctx, args, child_complexity) { args[:value] + child_complexity }
+          resolve ->(obj, args, ctx) { args[:value] }
         end
 
         field :innerComplexity, complexity_interface do
           argument :value, types.Int
-          resolve -> (obj, args, ctx) { args[:value] }
+          resolve ->(obj, args, ctx) { args[:value] }
         end
       end
 

data/spec/graphql/introspection/directive_type_spec.rb

@@ -23,7 +23,7 @@ describe GraphQL::Introspection::DirectiveType do
       "__schema" => {
         "directives" => [
           {
-            "name" => "skip",
+            "name" => "include",
             "args" => [
               {"name"=>"if", "type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Boolean"}}}
             ],
@@ -33,7 +33,7 @@ describe GraphQL::Introspection::DirectiveType do
             "onOperation" => false,
           },
           {
-            "name" => "include",
+            "name" => "skip",
             "args" => [
               {"name"=>"if", "type"=>{"name"=>"Non-Null", "ofType"=>{"name"=>"Boolean"}}}
             ],

data/spec/graphql/introspection/introspection_query_spec.rb

@@ -9,18 +9,18 @@ describe "GraphQL::Introspection::INTROSPECTION_QUERY" do
   end
 
   it "handles deeply nested (<= 7) schemas" do
-     query_type =  GraphQL::ObjectType.define do
-        name "DeepQuery"
-        field :foo do
-          type !GraphQL::ListType.new(
-            of_type: !GraphQL::ListType.new(
-              of_type: !GraphQL::ListType.new(
-                of_type: GraphQL::FLOAT_TYPE
-              )
-            )
-          )
-        end
-     end
+    query_type =  GraphQL::ObjectType.define do
+      name "DeepQuery"
+       field :foo do
+         type !GraphQL::ListType.new(
+           of_type: !GraphQL::ListType.new(
+             of_type: !GraphQL::ListType.new(
+               of_type: GraphQL::FLOAT_TYPE
+             )
+           )
+         )
+       end
+    end
 
      deep_schema = GraphQL::Schema.define do
        query query_type
@@ -31,20 +31,20 @@ describe "GraphQL::Introspection::INTROSPECTION_QUERY" do
   end
 
   it "doesn't handle too deeply nested (< 8) schemas" do
-     query_type =  GraphQL::ObjectType.define do
-        name "DeepQuery"
-        field :foo do
-          type !GraphQL::ListType.new(
-            of_type: !GraphQL::ListType.new(
-              of_type: !GraphQL::ListType.new(
-                of_type: !GraphQL::ListType.new(
-                  of_type: GraphQL::FLOAT_TYPE
-                )
-              )
-            )
-          )
-        end
-     end
+    query_type =  GraphQL::ObjectType.define do
+      name "DeepQuery"
+       field :foo do
+         type !GraphQL::ListType.new(
+           of_type: !GraphQL::ListType.new(
+             of_type: !GraphQL::ListType.new(
+               of_type: !GraphQL::ListType.new(
+                 of_type: GraphQL::FLOAT_TYPE
+               )
+             )
+           )
+         )
+       end
+    end
 
      deep_schema = GraphQL::Schema.define do
        query query_type