Merge pull request rmosolgo#3325 from splattael/fix-prepended-modules

Allow types to be prepended by a module

Author: Robert Mosolgo

lib/graphql/schema/find_inherited_value.rb

@@ -20,7 +20,9 @@ def find_inherited_value(method_name, default_value = nil)
         if self.is_a?(Class)
           superclass.respond_to?(method_name, true) ? superclass.send(method_name) : default_value
         else
-          ancestors[1..-1].each do |ancestor|
+          ancestors_except_self = ancestors
+          ancestors_except_self.delete(self)
+          ancestors_except_self.each do |ancestor|
             if ancestor.respond_to?(method_name, true)
               return ancestor.send(method_name)
             end

lib/graphql/schema/member/has_fields.rb

@@ -74,11 +74,8 @@ def field_class(new_field_class = nil)
             @field_class = new_field_class
           elsif defined?(@field_class) && @field_class
             @field_class
-          elsif self.is_a?(Class)
-            superclass.respond_to?(:field_class) ? superclass.field_class : GraphQL::Schema::Field
           else
-            ancestor = ancestors[1..-1].find { |a| a.respond_to?(:field_class) && a.field_class }
-            ancestor ? ancestor.field_class : GraphQL::Schema::Field
+            find_inherited_value(:field_class, GraphQL::Schema::Field)
           end
         end
 

spec/support/jazz.rb

@@ -167,9 +167,15 @@ def self.find(id)
     end
   end
 
+  module WithNameField
+    def self.prepended(base)
+      base.field :name, String, null: false
+    end
+  end
+
   module NamedEntity
     include BaseInterface
-    field :name, String, null: false
+    prepend WithNameField
   end
 
   class PrivateMembership < GraphQL::Schema::TypeMembership