graphql 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb4d91df18b66c7d1c4a9c712ee771aedb00655
-  data.tar.gz: c787072c016f6995c4742f086cabe05d6d8c931b
+  metadata.gz: '08e688c4046aa3130fe9f427f810356abc25abfc'
+  data.tar.gz: d2896b9042f2bab1dffd256551082168aa52288d
 SHA512:
-  metadata.gz: 58bee87006d10dfc306e17733770d899a93113c5836e30bba8443330afd2131d49e1a35a24606e20a69762b16450a0b779c7cd5dba03b46d70fa880f7e3b560c
-  data.tar.gz: 6369f05cdb38c7d960abab0bd927794f122ac7d82e8c8c422d044ede6d5f099ccd28c532f044ae69a8b89af97306866720996ae1591142e8f9e93bfea89a0b24
+  metadata.gz: 624eb16565591d5df45dc69df9dc5cc7fa6b97ca9ff4d3745427df47e979a15e889458689f1e52d9f8a553b0974f738cb2cff703d1fc98dcc25cfbffee36f408
+  data.tar.gz: 0421334ac91f05b8a0adf48199b811eb81efbcfd4a0c543bf3ff58248e9db3c4c1ba036d5cbeffca69fcb12e10d07e88fa0cf9896cbfd081b884da5d62f5aa8c

data/lib/graphql/backtrace/inspect_result.rb

@@ -43,7 +43,7 @@ module GraphQL
         when GraphQL::Execution::Lazy
           "(unresolved)"
         else
-          obj.inspect
+          "#{obj.inspect}"
         end
       end
     end

data/lib/graphql/backtrace/table.rb

@@ -87,7 +87,7 @@ module GraphQL
           rows << [
             "#{position}",
             "#{field_name}#{field_alias ? " as #{field_alias}" : ""}",
-            ctx.object.inspect,
+            "#{ctx.object.inspect}",
             ctx.irep_node.arguments.to_h.inspect,
             Backtrace::InspectResult.inspect(top && @override_value ? @override_value : ctx.value),
           ]
@@ -107,7 +107,7 @@ module GraphQL
           rows << [
             "#{position}",
             "#{op_type}#{op_name ? " #{op_name}" : ""}",
-            query.root_value.inspect,
+            "#{query.root_value.inspect}",
             query.variables.to_h.inspect,
             Backtrace::InspectResult.inspect(query.context.value),
           ]

data/lib/graphql/input_object_type.rb

@@ -96,7 +96,7 @@ module GraphQL
         end
       end
 
-      arguments_class.instantiate_arguments(input_values)
+      arguments_class.new(input_values)
     end
 
     # @api private

data/lib/graphql/query/arguments.rb

@@ -1,48 +1,6 @@
 # frozen_string_literal: true
 module GraphQL
   class Query
-    class StaticArguments
-      attr_reader :argument_definitions
-
-      def initialize(argument_definitions:)
-        @argument_definitions = argument_definitions
-      end
-
-      def instantiate_arguments(values)
-        arg_class.new(values, argument_definitions: argument_definitions)
-      end
-
-      private
-
-      def arg_class
-        @arg_class ||= begin
-          klass = Class.new(GraphQL::Query::Arguments).instance_exec(self) do |static_arguments|
-            static_arguments.argument_definitions.each do |_arg_name, arg_definition|
-              expose_as = arg_definition.expose_as.to_s
-
-              # Don't define a helper method if it would override something.
-              if instance_methods.include?(expose_as)
-                warn(
-                  "Unable to define a helper for argument with name '#{expose_as}' "\
-                  "as this is a reserved name. If you're using an argument such as "\
-                  "`argument #{expose_as}`, consider renaming this argument.`"
-                )
-                next
-              end
-
-              define_method(expose_as) do
-                self[expose_as]
-              end
-            end
-
-            self
-          end
-
-          klass
-        end
-      end
-    end
-
     # Read-only access to values, normalizing all keys to strings
     #
     # {Arguments} recursively wraps the input in {Arguments} instances.
@@ -50,8 +8,32 @@ module GraphQL
       extend GraphQL::Delegate
 
       def self.construct_arguments_class(argument_owner)
-        arguments_class = GraphQL::Query::StaticArguments.new(argument_definitions: argument_owner.arguments)
-        argument_owner.arguments_class = arguments_class
+        argument_definitions = argument_owner.arguments
+        argument_owner.arguments_class = Class.new(self) do
+          self.argument_definitions = argument_definitions
+
+          def initialize(values)
+            super(values, argument_definitions: self.class.argument_definitions)
+          end
+
+          argument_definitions.each do |_arg_name, arg_definition|
+            expose_as = arg_definition.expose_as.to_s
+
+            # Don't define a helper method if it would override something.
+            if instance_methods.include?(expose_as)
+              warn(
+                "Unable to define a helper for argument with name '#{expose_as}' "\
+                "as this is a reserved name. If you're using an argument such as "\
+                "`argument #{expose_as}`, consider renaming this argument.`"
+              )
+              next
+            end
+
+            define_method(expose_as) do
+              self[expose_as]
+            end
+          end
+        end
       end
 
       def initialize(values, argument_definitions:)
@@ -105,6 +87,10 @@ module GraphQL
 
       NO_ARGS = self.new({}, argument_definitions: [])
 
+      class << self
+        attr_accessor :argument_definitions
+      end
+
       private
 
       class ArgumentValue
@@ -129,7 +115,7 @@ module GraphQL
             wrap_value(value, arg_defn_type.of_type)
           when GraphQL::InputObjectType
             if value.is_a?(Hash)
-              self.class.new(value, argument_definitions: arg_defn_type.arguments)
+              arg_defn_type.arguments_class.new(value)
             else
               value
             end

data/lib/graphql/query/literal_input.rb

@@ -105,7 +105,7 @@ module GraphQL
           end
         end
 
-        argument_owner.arguments_class.instantiate_arguments(values_hash)
+        argument_owner.arguments_class.new(values_hash)
       end
     end
   end

data/lib/graphql/relay/base_connection.rb

@@ -140,6 +140,10 @@ module GraphQL
         raise NotImplementedError, "must return a cursor for this object/connection pair"
       end
 
+      def inspect
+        "#<GraphQL::Relay::Connection @parent=#{@parent.inspect} @arguments=#{@arguments.to_h.inspect}>"
+      end
+
       private
 
       # Return a sanitized `arguments[arg_name]` (don't allow negatives)

data/lib/graphql/relay/edge.rb

@@ -4,7 +4,7 @@ module GraphQL
     # Mostly an internal concern.
     #
     # Wraps an object as a `node`, and exposes a connection-specific `cursor`.
-    class Edge < GraphQL::ObjectType
+    class Edge
       attr_reader :node, :connection
       def initialize(node, connection)
         @node = node
@@ -18,6 +18,10 @@ module GraphQL
       def parent
         @parent ||= connection.parent
       end
+
+      def inspect
+        "#<GraphQL::Relay::Edge (#{parent.inspect} => #{node.inspect})>"
+      end
     end
   end
 end

data/lib/graphql/schema/traversal.rb

@@ -104,10 +104,13 @@ module GraphQL
       end
 
       def visit_field_on_type(type_defn, field_defn, dynamic_field: false)
-        instrumented_field_defn = @field_instrumenters.reduce(field_defn) do |defn, inst|
-          inst.instrument(type_defn, defn)
-        end
-        if !dynamic_field
+        if dynamic_field
+          # Don't apply instrumentation to dynamic fields since they're shared constants
+          instrumented_field_defn = field_defn
+        else
+          instrumented_field_defn = @field_instrumenters.reduce(field_defn) do |defn, inst|
+            inst.instrument(type_defn, defn)
+          end
           @instrumented_field_map[type_defn.name][instrumented_field_defn.name] = instrumented_field_defn
         end
         @type_reference_map[instrumented_field_defn.type.unwrap.name] << instrumented_field_defn

data/lib/graphql/version.rb

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

data/spec/graphql/backtrace_spec.rb

@@ -16,11 +16,25 @@ describe GraphQL::Backtrace do
     end
   end
 
+  class ErrorAnalyzer
+    def call(_memo, visit_type, irep_node)
+      if irep_node.name == "raiseError"
+        raise GraphQL::AnalysisError, "this should not be wrapped by a backtrace, but instead, returned to the client"
+      end
+    end
+  end
+
+  class NilInspectObject
+    # Oops, this is evil, but it happens and we should handle it.
+    def inspect; nil; end
+  end
+
   let(:resolvers) {
     {
       "Query" => {
         "field1" => Proc.new { :something },
         "field2" => Proc.new { :something },
+        "nilInspect" => Proc.new { NilInspectObject.new },
       },
       "Thing" => {
         "listField" => Proc.new { :not_a_list },
@@ -36,6 +50,7 @@ describe GraphQL::Backtrace do
     type Query {
       field1: Thing
       field2: OtherThing
+      nilInspect: Thing
     }
 
     type Thing {
@@ -49,6 +64,7 @@ describe GraphQL::Backtrace do
     GRAPHQL
     GraphQL::Schema.from_definition(defn, default_resolve: resolvers).redefine {
       lazy_resolve(LazyError, :raise_err)
+      query_analyzer(ErrorAnalyzer.new)
     }
   }
 
@@ -103,7 +119,7 @@ describe GraphQL::Backtrace do
       assert_includes err.message, rendered_table
       # The message includes the original error message
       assert_includes err.message, "This is broken: Boom"
-      assert_includes err.message, "spec/graphql/backtrace_spec.rb:27", "It includes the original backtrace"
+      assert_includes err.message, "spec/graphql/backtrace_spec.rb:41", "It includes the original backtrace"
       assert_includes err.message, "more lines"
     end
 
@@ -133,6 +149,26 @@ describe GraphQL::Backtrace do
       ].join("\n")
       assert_includes err.message, rendered_table
     end
+
+    it "returns analysis errors to the client" do
+      res = schema.execute("query raiseError { __typename }")
+      assert_equal "this should not be wrapped by a backtrace, but instead, returned to the client", res["errors"].first["message"]
+    end
+
+    it "always stringifies the #inspect response" do
+      err = assert_raises(GraphQL::Backtrace::TracedError) {
+        schema.execute("query { nilInspect { raiseField(message: \"pop!\") } }")
+      }
+
+      rendered_table = [
+        'Loc  | Field            | Object | Arguments           | Result',
+        '1:22 | Thing.raiseField |        | {"message"=>"pop!"} | #<RuntimeError: This is broken: pop!>',
+        '1:9  | Query.nilInspect | nil    | {}                  | {}',
+        '1:1  | query            | nil    | {}                  | {}',
+      ].join("\n")
+
+      assert_includes(err.message, rendered_table)
+    end
   end
 
   # This will get brittle when execution code moves between files

data/spec/graphql/introspection/type_by_name_field_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Introspection::TypeByNameField do
+  describe "after instrumentation" do
+    # Just make sure it returns a new object, not the original field
+    class DupInstrumenter
+      def self.instrument(t, f)
+        f.redefine {
+          resolve ->(o, a, c) { :no_op }
+        }
+      end
+    end
+
+    class ArgAnalyzer
+      def call(_, _, node)
+        if node.ast_node.is_a?(GraphQL::Language::Nodes::Field)
+          node.arguments
+        end
+      end
+    end
+
+    let(:instrumented_schema) {
+      # This was probably assigned earlier in the test suite, but to simulate an application, clear it.
+      GraphQL::Introspection::TypeByNameField.arguments_class = nil
+
+      Dummy::Schema.redefine {
+        instrument(:field, DupInstrumenter)
+        query_analyzer(ArgAnalyzer.new)
+      }
+    }
+
+    it "still works with __type" do
+      res = instrumented_schema.execute("{ __type(name: \"X\") { name } }")
+      assert_equal({"data"=>{"__type"=>nil}}, res)
+    end
+  end
+end

data/spec/graphql/query/arguments_spec.rb

@@ -90,13 +90,15 @@ describe GraphQL::Query::Arguments do
         argument :b, test_input_type
         argument :c, types.Int # will be a hash
       end
+      GraphQL::Query::Arguments.construct_arguments_class(test_input_type)
+      test_input_type
     }
     it "wraps input objects, but not other hashes" do
       args = GraphQL::Query::Arguments.new(
         {a: 1, b: {a: 2}, c: {a: 3}},
         argument_definitions: input_type.arguments
       )
-      assert_instance_of GraphQL::Query::Arguments, args["b"]
+      assert_kind_of GraphQL::Query::Arguments, args["b"]
       assert_instance_of Hash, args["c"]
     end
   end
@@ -304,7 +306,7 @@ describe GraphQL::Query::Arguments do
       assert_equal nil, input_object.arguments_class
 
       GraphQL::Query::Arguments.construct_arguments_class(input_object)
-      args = input_object.arguments_class.instantiate_arguments({foo: 3, bar: -90})
+      args = input_object.arguments_class.new({foo: 3, bar: -90})
 
       assert_equal 3, args.foo
       assert_equal -90, args.bar

data/spec/graphql/relay/base_connection_spec.rb

@@ -49,6 +49,17 @@ describe GraphQL::Relay::BaseConnection do
     end
   end
 
+  describe "#inspect" do
+    it "inspects nicely" do
+      args = {
+        first: 1,
+        last: -1,
+      }
+      conn = GraphQL::Relay::BaseConnection.new([], args, context: context)
+      assert_equal "#<GraphQL::Relay::Connection @parent=nil @arguments={:first=>1, :last=>-1}>", conn.inspect
+    end
+  end
+
   describe "#encode / #decode" do
     module ReverseEncoder
       module_function

data/spec/graphql/relay/edge_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Relay::Edge do
+  it "inspects nicely" do
+    connection = OpenStruct.new(parent: "Parent")
+    edge = GraphQL::Relay::Edge.new("Node", connection)
+    assert_equal '#<GraphQL::Relay::Edge ("Parent" => "Node")>', edge.inspect
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -568,6 +568,7 @@ files:
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
+- spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/equality_spec.rb
@@ -593,6 +594,7 @@ files:
 - spec/graphql/relay/connection_instrumentation_spec.rb
 - spec/graphql/relay/connection_resolve_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
+- spec/graphql/relay/edge_spec.rb
 - spec/graphql/relay/mutation_spec.rb
 - spec/graphql/relay/node_spec.rb
 - spec/graphql/relay/page_info_spec.rb
@@ -728,6 +730,7 @@ test_files:
 - spec/graphql/introspection/input_value_type_spec.rb
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
+- spec/graphql/introspection/type_by_name_field_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/equality_spec.rb
@@ -753,6 +756,7 @@ test_files:
 - spec/graphql/relay/connection_instrumentation_spec.rb
 - spec/graphql/relay/connection_resolve_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
+- spec/graphql/relay/edge_spec.rb
 - spec/graphql/relay/mutation_spec.rb
 - spec/graphql/relay/node_spec.rb
 - spec/graphql/relay/page_info_spec.rb