Merge pull request #3278 from lucianosousa/ruby-3-support

Add support to Ruby 3.0.0

Author: Robert Mosolgo

.github/workflows/ci.yaml

@@ -47,9 +47,9 @@ jobs:
             bundler: "1"
           # Rails 5.2 is tested with Postgresql below
           - gemfile: gemfiles/rails_6.0.gemfile
-            ruby: 2.5
-          - gemfile: gemfiles/rails_master.gemfile
             ruby: 2.7
+          - gemfile: gemfiles/rails_master.gemfile
+            ruby: 3.0
     runs-on: ubuntu-latest
     steps:
     - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV

lib/graphql/invalid_null_error.rb

@@ -39,7 +39,7 @@ def subclass_for(parent_class)
       end
 
       def inspect
-        if name.nil? && parent_class.respond_to?(:mutation) && (mutation = parent_class.mutation)
+        if (name.nil? || parent_class.name.nil?) && parent_class.respond_to?(:mutation) && (mutation = parent_class.mutation)
           "#{mutation.inspect}::#{parent_class.graphql_name}::InvalidNullError"
         else
           super

lib/graphql/tracing/platform_tracing.rb

@@ -95,7 +95,7 @@ def trace_field(type, field)
       end
 
       def self.use(schema_defn, options = {})
-        tracer = self.new(options)
+        tracer = self.new(**options)
         schema_defn.instrument(:field, tracer)
         schema_defn.tracer(tracer)
       end

spec/integration/rails/graphql/relay/connection_type_spec.rb

@@ -35,7 +35,7 @@
           assert_equal [upcased_rebels_name] , bases["edges"].map { |e| e["upcasedParentName"] }.uniq
         end
         assert_equal ["Yavin", "Echo Base", "Secret Hideout"] , bases["edges"].map { |e| e["node"]["name"] }
-        assert_equal ["StarWars::CustomBaseEdge"] , bases["edges"].map { |e| e["edgeClassName"] }.uniq
+        assert_equal [TESTING_INTERPRETER ? "StarWars::NewCustomBaseEdge" : "StarWars::CustomBaseEdge"] , bases["edges"].map { |e| e["edgeClassName"] }.uniq
       end
     end
 

spec/support/star_wars/schema.rb

@@ -66,6 +66,16 @@ def upcased_parent_name
     end
   end
 
+  class NewCustomBaseEdge < GraphQL::Pagination::Connection::Edge
+    def upcased_name
+      node.name.upcase
+    end
+
+    def upcased_parent_name
+      parent.name.upcase
+    end
+  end
+
   class CustomBaseEdgeType < GraphQL::Types::Relay::BaseEdge
     node_type(BaseType)
     field :upcased_name, String, null: true
@@ -78,10 +88,16 @@ def edge_class_name
   end
 
   class CustomEdgeBaseConnectionType < GraphQL::Types::Relay::BaseConnection
-    edge_type(CustomBaseEdgeType, edge_class: CustomBaseEdge, nodes_field: true)
+    edge_type(CustomBaseEdgeType, edge_class: (TESTING_INTERPRETER ? NewCustomBaseEdge : CustomBaseEdge), nodes_field: true)
     field :total_count_times_100, Integer, null: true
     def total_count_times_100
-      object.nodes.count * 100
+      if object.is_a?(GraphQL::Pagination::Connection)
+        # new-style
+        object.items.count * 100
+      else
+        # legacy
+        object.nodes.count * 100
+      end
     end
 
     field :field_name, String, null: true
@@ -318,6 +334,16 @@ def edge_nodes
     end
   end
 
+  class NewLazyNodesRelationConnection < GraphQL::Pagination::ActiveRecordRelationConnection
+    def initialize(wrapper, **kwargs)
+      super(wrapper.relation, **kwargs)
+    end
+
+    def edge_nodes
+      LazyWrapper.new { super }
+    end
+  end
+
   GraphQL::Relay::BaseConnection.register_connection_implementation(LazyNodesWrapper, LazyNodesRelationConnection)
 
   class QueryType < GraphQL::Schema::Object
@@ -436,7 +462,7 @@ class Schema < GraphQL::Schema
       use GraphQL::Execution::Interpreter
       use GraphQL::Analysis::AST
       use GraphQL::Pagination::Connections
-      connections.add(LazyNodesWrapper, LazyNodesRelationConnection)
+      connections.add(LazyNodesWrapper, NewLazyNodesRelationConnection)
     end
 
     def self.resolve_type(type, object, ctx)