graphql 1.9.4 → 1.9.5

data/lib/graphql/language/token.rb

@@ -12,7 +12,7 @@ module GraphQL
 
       def initialize(value:, name:, line:, col:, prev_token:)
         @name = name
-        @value = value.freeze
+        @value = -value
         @line = line
         @col = col
         @prev_token = prev_token

data/lib/graphql/language/visitor.rb

@@ -24,7 +24,7 @@ module GraphQL
     #   end
     #
     #   # Initialize a visitor
-    #   visitor = GraphQL::Language::Visitor.new(document, "name")
+    #   visitor = NameCounter.new(document, "name")
     #   # Run it
     #   visitor.visit
     #   # Check the result

data/lib/graphql/query/arguments.rb

@@ -14,12 +14,12 @@ module GraphQL
           self.argument_definitions = argument_definitions
 
           argument_definitions.each do |_arg_name, arg_definition|
-            expose_as = arg_definition.expose_as.to_s
-            expose_as_underscored = GraphQL::Schema::Member::BuildType.underscore(expose_as)
+            expose_as = -arg_definition.expose_as.to_s
+            expose_as_underscored = -GraphQL::Schema::Member::BuildType.underscore(expose_as)
             method_names = [expose_as, expose_as_underscored].uniq
             method_names.each do |method_name|
               # Don't define a helper method if it would override something.
-              if instance_methods.include?(method_name.to_sym)
+              if method_defined?(method_name)
                 warn(
                   "Unable to define a helper for argument with name '#{method_name}' "\
                   "as this is a reserved name. If you're using an argument such as "\

data/lib/graphql/query/context.rb

@@ -44,11 +44,11 @@ module GraphQL
         # @api private
         def spawn_child(key:, irep_node:, object:)
           FieldResolutionContext.new(
-            context: @context,
-            parent: self,
-            object: object,
-            key: key,
-            irep_node: irep_node,
+            @context,
+            key,
+            irep_node,
+            self,
+            object
           )
         end
 
@@ -203,7 +203,7 @@ module GraphQL
         attr_reader :irep_node, :field, :parent_type, :query, :schema, :parent, :key, :type
         alias :selection :irep_node
 
-        def initialize(context:, key:, irep_node:, parent:, object:)
+        def initialize(context, key, irep_node, parent, object)
           @context = context
           @key = key
           @parent = parent

data/lib/graphql/query/variable_validation_error.rb

@@ -9,6 +9,11 @@ module GraphQL
         @validation_result = validation_result
 
         msg = "Variable #{variable_ast.name} of type #{type} was provided invalid value"
+
+        if problem_fields.any?
+          msg += " for #{problem_fields.join(", ")}"
+        end
+
         super(msg)
         self.ast_node = variable_ast
       end
@@ -25,6 +30,15 @@ module GraphQL
           end
         end
       end
+
+      private
+
+      def problem_fields
+        @problem_fields ||= @validation_result
+          .problems
+          .reject { |problem| problem["path"].empty? }
+          .map { |problem| "#{problem['path'].join('.')} (#{problem['explanation']})" }
+      end
     end
   end
 end

data/lib/graphql/schema.rb

@@ -246,13 +246,13 @@ module GraphQL
     # Validate a query string according to this schema.
     # @param string_or_document [String, GraphQL::Language::Nodes::Document]
     # @return [Array<GraphQL::StaticValidation::Error >]
-    def validate(string_or_document, rules: nil)
+    def validate(string_or_document, rules: nil, context: nil)
       doc = if string_or_document.is_a?(String)
         GraphQL.parse(string_or_document)
       else
         string_or_document
       end
-      query = GraphQL::Query.new(self, document: doc)
+      query = GraphQL::Query.new(self, document: doc, context: context)
       validator_opts = { schema: self }
       rules && (validator_opts[:rules] = rules)
       validator = GraphQL::StaticValidation::Validator.new(validator_opts)

data/lib/graphql/schema/argument.rb

@@ -32,7 +32,7 @@ module GraphQL
       # @param camelize [Boolean] if true, the name will be camelized when building the schema
       def initialize(arg_name = nil, type_expr = nil, desc = nil, required:, type: nil, name: nil, description: nil, default_value: NO_DEFAULT, as: nil, camelize: true, prepare: nil, owner:, &definition_block)
         arg_name ||= name
-        @name = camelize ? Member::BuildType.camelize(arg_name.to_s) : arg_name.to_s
+        @name = -(camelize ? Member::BuildType.camelize(arg_name.to_s) : arg_name.to_s)
         @type_expr = type_expr || type
         @description = desc || description
         @null = !required

data/lib/graphql/schema/field.rb

@@ -130,7 +130,7 @@ module GraphQL
           # The default was overridden
           @scope
         else
-          @return_type_expr.is_a?(Array) || (@return_type_expr.is_a?(String) && @return_type_expr.include?("[")) || connection?
+          @return_type_expr && (@return_type_expr.is_a?(Array) || (@return_type_expr.is_a?(String) && @return_type_expr.include?("[")) || connection?)
         end
       end
 
@@ -173,8 +173,8 @@ module GraphQL
           raise ArgumentError, "keyword `extras:` may only be used with method-based resolve and class-based field such as mutation class, please remove `field:`, `function:` or `resolve:`"
         end
         @original_name = name
-        @underscored_name = Member::BuildType.underscore(name.to_s)
-        @name = camelize ? Member::BuildType.camelize(name.to_s) : name.to_s
+        @underscored_name = -Member::BuildType.underscore(name.to_s)
+        @name = -(camelize ? Member::BuildType.camelize(name.to_s) : name.to_s)
         @description = description
         if field.is_a?(GraphQL::Schema::Field)
           raise ArgumentError, "Instead of passing a field as `field:`, use `add_field(field)` to add an already-defined field."
@@ -504,6 +504,9 @@ module GraphQL
             err = GraphQL::UnauthorizedFieldError.new(object: application_object, type: object.class, context: ctx, field: self)
             ctx.schema.unauthorized_field(err)
           end
+        rescue GraphQL::UnauthorizedFieldError => err
+          err.field ||= self
+          ctx.schema.unauthorized_field(err)
         rescue GraphQL::UnauthorizedError => err
           ctx.schema.unauthorized_object(err)
         end

data/lib/graphql/schema/object.rb

@@ -37,8 +37,8 @@ module GraphQL
         def authorized_new(object, context)
           auth_val = begin
             authorized?(object, context)
-          # rescue GraphQL::UnauthorizedError => err
-          #   context.schema.unauthorized_object(err)
+          rescue GraphQL::UnauthorizedError => err
+            context.schema.unauthorized_object(err)
           end
 
           context.schema.after_lazy(auth_val) do |is_authorized|

data/lib/graphql/schema/relay_classic_mutation.rb

@@ -32,7 +32,7 @@ module GraphQL
         # Without the interpreter, the inputs are unwrapped by an instrumenter.
         # But when using the interpreter, no instrumenters are applied.
         if context.interpreter?
-          input = inputs[:input].to_h
+          input = inputs[:input].to_kwargs
           # Transfer these from the top-level hash to the
           # shortcutted `input:` object
           self.class.extras.each do |ext|

data/lib/graphql/schema/rescue_middleware.rb

@@ -43,8 +43,13 @@ module GraphQL
       def attempt_rescue(err)
         rescue_table.each { |klass, handler|
           if klass.is_a?(Class) && err.is_a?(klass) && handler
-            message = handler.call(err)
-            return GraphQL::ExecutionError.new(message)
+            result = handler.call(err)
+            case result
+            when String
+              return GraphQL::ExecutionError.new(result)
+            when GraphQL::ExecutionError
+              return result
+            end
           end
         }
 

data/lib/graphql/schema/validation.rb

@@ -12,11 +12,16 @@ module GraphQL
       # @param object [Object] something to be validated
       # @return [String, Nil] error message, if there was one
       def self.validate(object)
-        rules = RULES.reduce([]) do |memo, (parent_class, validations)|
-          memo + (object.is_a?(parent_class) ? validations : [])
+        RULES.each do |parent_class, validations|
+          if object.is_a?(parent_class)
+            validations.each do |rule|
+              if error = rule.call(object)
+                return error
+              end
+            end
+          end
         end
-        # Stops after the first error
-        rules.reduce(nil) { |memo, rule| memo || rule.call(object) }
+        nil
       end
 
       module Rules

data/lib/graphql/static_validation/base_visitor.rb

@@ -146,11 +146,14 @@ module GraphQL
         end
 
         def on_input_object(node, parent)
-          is_list = @argument_definitions.last&.type&.list? == true
-
-          @path.push(parent.children.index(node)) if is_list
-          super
-          @path.pop if is_list
+          arg_defn = @argument_definitions.last
+          if arg_defn && arg_defn.type.list?
+            @path.push(parent.children.index(node))
+            super
+            @path.pop
+          else
+            super
+          end
         end
 
         # @return [GraphQL::BaseType] The current object type

data/lib/graphql/subscriptions/action_cable_subscriptions.rb

@@ -26,7 +26,9 @@ module GraphQL
     #       variables = ensure_hash(data["variables"])
     #       operation_name = data["operationName"]
     #       context = {
-    #         current_user: current_user,
+    #         # Re-implement whatever context methods you need 
+    #         # in this channel or ApplicationCable::Channel
+    #         # current_user: current_user,
     #         # Make sure the channel is in the context
     #         channel: self,
     #       }

data/lib/graphql/tracing.rb

@@ -42,12 +42,12 @@ module GraphQL
   # execute_multiplex | `{ multiplex: GraphQL::Execution::Multiplex }`
   # execute_query | `{ query: GraphQL::Query }`
   # execute_query_lazy | `{ query: GraphQL::Query?, multiplex: GraphQL::Execution::Multiplex? }`
-  # execute_field | `{ context: GraphQL::Query::Context::FieldResolutionContext?, owner: Class?, field: GraphQL::Schema::Field?, path: Array<String, Integer>?}`
-  # execute_field_lazy | `{ context: GraphQL::Query::Context::FieldResolutionContext?, owner: Class?, field: GraphQL::Schema::Field?, path: Array<String, Integer>?}`
+  # execute_field | `{ context: GraphQL::Query::Context::FieldResolutionContext?, owner: Class?, field: GraphQL::Schema::Field?, query: GraphQL::Query?, path: Array<String, Integer>?}`
+  # execute_field_lazy | `{ context: GraphQL::Query::Context::FieldResolutionContext?, owner: Class?, field: GraphQL::Schema::Field?, query: GraphqL::Query?, path: Array<String, Integer>?}`
   #
   # Note that `execute_field` and `execute_field_lazy` receive different data in different settings:
   #
-  # - When using {GraphQL::Execution::Interpreter}, they receive `{field:, path:}`
+  # - When using {GraphQL::Execution::Interpreter}, they receive `{field:, path:, query:}`
   # - Otherwise, they receive `{context: ...}`
   #
   module Tracing

data/lib/graphql/types.rb

@@ -5,5 +5,6 @@ require "graphql/types/float"
 require "graphql/types/id"
 require "graphql/types/int"
 require "graphql/types/iso_8601_date_time"
+require "graphql/types/json"
 require "graphql/types/string"
 require "graphql/types/relay"

data/lib/graphql/types/json.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module GraphQL
+  module Types
+    # An untyped JSON scalar that maps to Ruby hashes, arrays, strings, integers, floats, booleans and nils.
+    # This should be used judiciously because it subverts the GraphQL type system.
+    #
+    # Use it for fields or arguments as follows:
+    #
+    #     field :template_parameters, GraphQL::Types::JSON, null: false
+    #
+    #     argument :template_parameters, GraphQL::Types::JSON, null: false
+    #
+    class JSON < GraphQL::Schema::Scalar
+      description "Represents untyped JSON"
+
+      def self.coerce_input(value, _context)
+        value
+      end
+
+      def self.coerce_result(value, _context)
+        value
+      end
+    end
+  end
+end

data/lib/graphql/types/relay/base_edge.rb

@@ -28,14 +28,15 @@ module GraphQL
           # Get or set the Object type that this edge wraps.
           #
           # @param node_type [Class] A `Schema::Object` subclass
-          def node_type(node_type = nil)
+          # @param null [Boolean]
+          def node_type(node_type = nil, null: true)
             if node_type
               @node_type = node_type
               wrapped_type_name = node_type.graphql_name
               # Set this to be named like the node type, but suffixed with `Edge`
               graphql_name("#{wrapped_type_name}Edge")
               # Add a default `node` field
-              field :node, node_type, null: true, description: "The item at the end of the edge."
+              field :node, node_type, null: null, description: "The item at the end of the edge."
             end
             @node_type
           end

data/lib/graphql/unauthorized_field_error.rb

@@ -2,7 +2,7 @@
 module GraphQL
   class UnauthorizedFieldError < GraphQL::UnauthorizedError
     # @return [Field] the field that failed the authorization check
-    attr_reader :field
+    attr_accessor :field
 
     def initialize(message = nil, object: nil, type: nil, context: nil, field: nil)
       if message.nil? && [field, type].any?(&:nil?)

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.9.4"
+  VERSION = "1.9.5"
 end

data/spec/dummy/Gemfile.lock

@@ -0,0 +1,157 @@
+PATH
+  remote: /Users/rmosolgo/code/graphql-ruby
+  specs:
+    graphql (1.9.0.pre2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    builder (3.2.3)
+    capybara (3.7.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    ffi (1.9.25)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    public_suffix (3.0.3)
+    puma (3.12.0)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ruby_dep (1.5.0)
+    rubyzip (1.2.2)
+    selenium-webdriver (3.14.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  graphql!
+  listen
+  puma
+  rails (~> 5.2.1)
+  selenium-webdriver
+
+BUNDLED WITH
+   2.0.1