graphql_rails 2.3.0 → 3.0.0

data/lib/graphql_rails/attributes/attribute.rb

@@ -21,18 +21,12 @@ module GraphqlRails
         @attributes ||= {}
       end
 
-      def property(new_value = NOT_SET)
-        return @property if new_value == NOT_SET
-
-        @property = new_value.to_s
-        self
-      end
-
       def field_args
         [
           field_name,
           type_parser.type_arg,
-          description
+          description,
+          *field_args_options
         ].compact
       end
 
@@ -42,7 +36,9 @@ module GraphqlRails
           null: optional?,
           camelize: camelize?,
           groups: groups,
-          **deprecation_reason_params
+          hidden_in_groups: hidden_in_groups,
+          **deprecation_reason_params,
+          **extras_options
         }
       end
 
@@ -52,6 +48,12 @@ module GraphqlRails
 
       private
 
+      def extras_options
+        return {} if extras.empty?
+
+        { extras: extras }
+      end
+
       def camelize?
         options[:input_format] != :original && options[:attribute_name_format] != :original
       end
@@ -59,6 +61,17 @@ module GraphqlRails
       def deprecation_reason_params
         { deprecation_reason: deprecation_reason }.compact
       end
+
+      def field_args_options
+        options = { **field_args_pagination_options }
+        return nil if options.empty?
+
+        [options]
+      end
+
+      def field_args_pagination_options
+        pagination_options || {}
+      end
     end
   end
 end

data/lib/graphql_rails/attributes/attribute_configurable.rb

@@ -17,6 +17,7 @@ module GraphqlRails
 
         chainable_option :description
         chainable_option :options, default: {}
+        chainable_option :extras, default: []
         chainable_option :type
       end
 
@@ -32,6 +33,14 @@ module GraphqlRails
         groups(*args)
       end
 
+      def hidden_in_groups(new_groups = ChainableOptions::NOT_SET)
+        @hidden_in_groups ||= []
+        return @hidden_in_groups if new_groups == ChainableOptions::NOT_SET
+
+        @hidden_in_groups = Array(new_groups).map(&:to_s)
+        self
+      end
+
       def required(new_value = true) # rubocop:disable Style/OptionalBooleanParameter
         @required = new_value
         self
@@ -55,6 +64,24 @@ module GraphqlRails
       def deprecation_reason
         @deprecation_reason
       end
+
+      def property(new_value = ChainableOptions::NOT_SET)
+        return @property if new_value == ChainableOptions::NOT_SET
+
+        @property = new_value.to_s
+        self
+      end
+
+      def same_as(other_attribute)
+        other = other_attribute.dup
+        other.instance_variables.each do |instance_variable|
+          next if instance_variable == :@initial_name
+
+          instance_variable_set(instance_variable, other.instance_variable_get(instance_variable))
+        end
+
+        self
+      end
     end
   end
 end

data/lib/graphql_rails/attributes/attribute_name_parser.rb

@@ -3,7 +3,7 @@
 module GraphqlRails
   module Attributes
     # Parses attribute name and can generates graphql scalar type,
-    # grapqhl name and etc. based on that
+    # graphql name and etc. based on that
     class AttributeNameParser
       def initialize(original_name, options: {})
         @original_name = original_name.to_s
@@ -13,9 +13,9 @@ module GraphqlRails
       def field_name
         @field_name ||= \
           if original_format?
-            preprocesed_name
+            preprocessed_name
           else
-            preprocesed_name.camelize(:lower)
+            preprocessed_name.camelize(:lower)
           end
       end
 
@@ -47,7 +47,7 @@ module GraphqlRails
         options[:input_format] == :original || options[:attribute_name_format] == :original
       end
 
-      def preprocesed_name
+      def preprocessed_name
         if name.end_with?('?')
           "is_#{name.remove(/\?\Z/)}"
         else

data/lib/graphql_rails/attributes/input_attribute.rb

@@ -31,7 +31,9 @@ module GraphqlRails
           description: description,
           camelize: false,
           groups: groups,
+          hidden_in_groups: hidden_in_groups,
           **default_value_option,
+          **property_params,
           **deprecation_reason_params
         }
       end
@@ -58,6 +60,10 @@ module GraphqlRails
         { deprecation_reason: deprecation_reason }.compact
       end
 
+      def property_params
+        { as: property }.compact
+      end
+
       def attribute_naming_options
         options.slice(:input_format)
       end
@@ -79,7 +85,7 @@ module GraphqlRails
       end
 
       def raw_input_type
-        return type if type.is_a?(GraphQL::InputObjectType)
+        return type if type.is_a?(GraphQL::Schema::InputObject)
         return type.graphql_input_type if type.is_a?(Model::Input)
       end
     end

data/lib/graphql_rails/attributes/type_parseable.rb

@@ -42,14 +42,13 @@ module GraphqlRails
       WRAPPER_TYPES = [
         GraphQL::Schema::List,
         GraphQL::Schema::NonNull,
-        GraphQL::NonNullType,
-        GraphQL::ListType
+        GraphQL::Language::Nodes::NonNullType,
+        GraphQL::Language::Nodes::ListType
       ].freeze
 
       GRAPHQL_BASE_TYPES = [
-        GraphQL::BaseType,
-        GraphQL::ObjectType,
-        GraphQL::InputObjectType
+        GraphQL::Schema::Object,
+        GraphQL::Schema::InputObject
       ].freeze
 
       RAW_GRAPHQL_TYPES = (WRAPPER_TYPES + GRAPHQL_BASE_TYPES).freeze
@@ -95,9 +94,9 @@ module GraphqlRails
       end
 
       def graphql_type_object?(type_class)
-        return false unless type_class.is_a?(Class)
+        return false if !type_class.is_a?(Class) && !type_class.is_a?(Module)
 
-        type_class < GraphQL::Schema::Member
+        type_class < GraphQL::Schema::Member::GraphQLTypeNames
       end
 
       def applicable_graphql_type?(type)

data/lib/graphql_rails/controller/action.rb

@@ -43,16 +43,16 @@ module GraphqlRails
         { null: !type_parser.required? }
       end
 
+      def action_config
+        controller.controller_configuration.action_config(name)
+      end
+
       private
 
       attr_reader :route
 
       delegate :type_parser, to: :action_config
 
-      def action_config
-        controller.controller_configuration.action_config(name)
-      end
-
       def namespaced_controller_name
         [route.module_name, controller_name].reject(&:empty?).join('/')
       end

data/lib/graphql_rails/controller/action_configuration.rb

@@ -7,7 +7,7 @@ require 'graphql_rails/errors/error'
 
 module GraphqlRails
   class Controller
-    # stores all graphql_rails contoller specific config
+    # stores all graphql_rails controller specific config
     class ActionConfiguration
       class MissingConfigurationError < GraphqlRails::Error; end
       class DeprecatedDefaultModelError < GraphqlRails::Error; end

data/lib/graphql_rails/controller/build_controller_action_resolver.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'graphql_rails/controller/action'
 require 'graphql_rails/concerns/service'
 require 'graphql_rails/controller/action_configuration'
 require 'graphql_rails/controller/build_controller_action_resolver/controller_action_resolver'
@@ -11,12 +10,12 @@ module GraphqlRails
     class BuildControllerActionResolver
       include ::GraphqlRails::Service
 
-      def initialize(route:)
-        @route = route
+      def initialize(action:)
+        @action = action
       end
 
       def call # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        action = build_action
+        action = self.action
 
         Class.new(ControllerActionResolver) do
           graphql_name("ControllerActionResolver#{SecureRandom.hex}")
@@ -38,17 +37,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :route
-
-      def build_action
-        Action.new(route).tap do |action|
-          assert_action(action)
-        end
-      end
-
-      def assert_action(action)
-        action.return_type
-      end
+      attr_reader :action
     end
   end
 end

data/lib/graphql_rails/controller/configuration.rb

@@ -7,13 +7,13 @@ require 'graphql_rails/errors/error'
 
 module GraphqlRails
   class Controller
-    # stores all graphql_rails contoller specific config
+    # stores all graphql_rails controller specific config
     class Configuration
       class InvalidActionConfiguration < GraphqlRails::Error; end
 
       LIB_REGEXP = %r{/graphql_rails/lib/}
 
-      attr_reader :action_by_name
+      attr_reader :action_by_name, :error_handlers
 
       def initialize(controller)
         @controller = controller
@@ -25,6 +25,7 @@ module GraphqlRails
 
         @action_by_name = {}
         @action_default = nil
+        @error_handlers = {}
       end
 
       def initialize_copy(other)
@@ -56,6 +57,10 @@ module GraphqlRails
           ActionHook.new(name: hook_name, **options, &block)
       end
 
+      def add_error_handler(error, with:, &block)
+        @error_handlers[error] = with || block
+      end
+
       def action_default
         @action_default ||= ActionConfiguration.new(name: :default, controller: nil)
         yield(@action_default) if block_given?

data/lib/graphql_rails/controller/handle_controller_error.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  class Controller
+    # runs {before/around/after}_action controller hooks
+    class HandleControllerError
+      def initialize(error:, controller:)
+        @error = error
+        @controller = controller
+      end
+
+      def call
+        return custom_handle_error if custom_handle_error?
+
+        render_unhandled_error(error)
+      end
+
+      private
+
+      attr_reader :error, :controller
+
+      def render_unhandled_error(error)
+        return render(error: error) if error.is_a?(GraphQL::ExecutionError)
+
+        render(error: SystemError.new(error))
+      end
+
+      def custom_handle_error
+        return unless custom_handler
+
+        begin
+          if custom_handler.is_a?(Proc)
+            controller.instance_exec(error, &custom_handler)
+          else
+            controller.send(custom_handler)
+          end
+        rescue StandardError => e
+          render_unhandled_error(e)
+        end
+      end
+
+      def custom_handler
+        return @custom_handler if defined?(@custom_handler)
+
+        handler = controller_config.error_handlers.detect do |error_class, _handler|
+          error.class <= error_class
+        end
+
+        @custom_handler = handler&.last
+      end
+
+      def custom_handle_error?
+        custom_handler.present?
+      end
+
+      def controller_config
+        @controller_config ||= controller.class.controller_configuration
+      end
+
+      def render(*args, **kwargs, &block)
+        controller.send(:render, *args, **kwargs, &block)
+      end
+    end
+  end
+end

data/lib/graphql_rails/controller/log_controller_action.rb

@@ -7,6 +7,7 @@ module GraphqlRails
     # logs controller start and end times
     class LogControllerAction
       require 'graphql_rails/concerns/service'
+      require 'active_support/notifications'
 
       include ::GraphqlRails::Service
 

data/lib/graphql_rails/controller/request/format_errors.rb

@@ -8,7 +8,7 @@ require 'graphql_rails/errors/custom_execution_error'
 module GraphqlRails
   class Controller
     class Request
-      # Converts user provided free-form errors in to meaningfull graphql error classes
+      # Converts user provided free-form errors in to meaningful graphql error classes
       class FormatErrors
         include Service
 

data/lib/graphql_rails/controller/request.rb

@@ -7,11 +7,12 @@ module GraphqlRails
       require 'graphql_rails/controller/request/format_errors'
 
       attr_accessor :object_to_return
-      attr_reader :errors, :context
+      attr_reader :errors, :context, :lookahead
 
       def initialize(graphql_object, inputs, context)
         @graphql_object = graphql_object
-        @inputs = inputs
+        @inputs = inputs.except(:lookahead)
+        @lookahead = inputs[:lookahead]
         @context = context
       end
 

data/lib/graphql_rails/controller.rb

@@ -6,6 +6,7 @@ require 'graphql_rails/controller/configuration'
 require 'graphql_rails/controller/request'
 require 'graphql_rails/controller/action_hooks_runner'
 require 'graphql_rails/controller/log_controller_action'
+require 'graphql_rails/controller/handle_controller_error'
 require 'graphql_rails/errors/system_error'
 
 module GraphqlRails
@@ -45,6 +46,12 @@ module GraphqlRails
       def controller_configuration
         @controller_configuration ||= Controller::Configuration.new(self)
       end
+
+      def rescue_from(*errors, with: nil, &block)
+        Array(errors).each do |error|
+          controller_configuration.add_error_handler(error, with: with, &block)
+        end
+      end
     end
 
     attr_reader :action_name
@@ -86,12 +93,8 @@ module GraphqlRails
       response = hooks_runner.call { public_send(action_name) }
 
       render response if graphql_request.no_object_to_return?
-    rescue StandardError => error
-      if error.is_a?(GraphQL::ExecutionError)
-        render error: error
-      else
-        render error: SystemError.new(error)
-      end
+    rescue StandardError => e
+      HandleControllerError.new(error: e, controller: self).call
     end
 
     def graphql_errors_from_render_params(rendering_params)

data/lib/graphql_rails/decorator/relation_decorator.rb

@@ -2,10 +2,10 @@
 
 module GraphqlRails
   module Decorator
-    # wrapps active record relation and returns decorated object instead
+    # wraps active record relation and returns decorated object instead
     class RelationDecorator
       delegate :map, :each, to: :to_a
-      delegate :limit_value, :offset_value, :count, :size, :empty?, to: :relation
+      delegate :limit_value, :offset_value, :count, :size, :empty?, :loaded?, to: :relation
 
       def self.decorates?(object)
         (defined?(ActiveRecord) && object.is_a?(ActiveRecord::Relation)) ||

data/lib/graphql_rails/errors/custom_execution_error.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GraphqlRails
-  # base class which is returned in case something bad happens. Contains all error rendering tructure
+  # base class which is returned in case something bad happens. Contains all error rendering structure
   class CustomExecutionError < ExecutionError
     attr_reader :extra_graphql_data
 

data/lib/graphql_rails/errors/execution_error.rb

@@ -3,7 +3,7 @@
 module GraphqlRails
   require 'graphql'
 
-  # base class which is returned in case something bad happens. Contains all error rendering tructure
+  # base class which is returned in case something bad happens. Contains all error rendering structure
   class ExecutionError < GraphQL::ExecutionError
     def to_h
       super.merge(extra_graphql_data)

data/lib/graphql_rails/model/configuration.rb

@@ -24,10 +24,21 @@ module GraphqlRails
         @input = other.instance_variable_get(:@input)&.transform_values(&:dup)
       end
 
+      def implements(*interfaces)
+        previous_implements = get_or_set_chainable_option(:implements) || []
+        return previous_implements if interfaces.blank?
+
+        full_implements = (previous_implements + interfaces).uniq
+
+        get_or_set_chainable_option(:implements, full_implements) || []
+      end
+
       def attribute(attribute_name, **attribute_options)
         key = attribute_name.to_s
 
-        attributes[key] ||= build_attribute(attribute_name).tap do |new_attribute|
+        attributes[key] ||= build_attribute(attribute_name)
+
+        attributes[key].tap do |new_attribute|
           new_attribute.with(**attribute_options)
           yield(new_attribute) if block_given?
         end
@@ -52,7 +63,8 @@ module GraphqlRails
           name: name,
           description: description,
           attributes: attributes,
-          type_name: type_name
+          type_name: type_name,
+          implements: implements
         )
       end
 
@@ -86,6 +98,7 @@ module GraphqlRails
           description: description,
           attributes: attributes,
           type_name: type_name,
+          implements: implements,
           force_define_attributes: true
         )
       end

data/lib/graphql_rails/model/find_or_build_graphql_input_type.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'graphql_rails/types/input_object_type'
+require 'graphql_rails/concerns/service'
+require 'graphql_rails/model/find_or_build_graphql_type'
+
+module GraphqlRails
+  module Model
+    # stores information about model specific config, like attributes and types
+    class FindOrBuildGraphqlInputType < FindOrBuildGraphqlType
+      include ::GraphqlRails::Service
+
+      private
+
+      def parent_class
+        GraphqlRails::Types::InputObjectType
+      end
+
+      def add_attributes_batch(attributes)
+        klass.class_eval do
+          attributes.each do |attribute|
+            argument(*attribute.input_argument_args, **attribute.input_argument_options)
+          end
+        end
+      end
+
+      def find_or_build_dynamic_type(attribute)
+        graphql_model = attribute.graphql_model
+        return unless graphql_model
+
+        graphql = graphql_model.graphql.input(attribute.subtype)
+        find_or_build_graphql_model_type(graphql)
+      end
+    end
+  end
+end

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -10,51 +10,85 @@ module GraphqlRails
 
       include ::GraphqlRails::Service
 
-      def initialize(name:, description:, attributes:, type_name:, force_define_attributes: false)
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(
+        name:,
+        description:,
+        attributes:,
+        type_name:,
+        force_define_attributes: false,
+        implements: []
+      )
         @name = name
         @description = description
         @attributes = attributes
         @type_name = type_name
         @force_define_attributes = force_define_attributes
+        @implements = implements
       end
+      # rubocop:enable Metrics/ParameterLists
 
       def call
-        klass.tap { add_fields_to_graphql_type if new_class? || force_define_attributes }
+        klass.tap do
+          add_attributes if new_class? || force_define_attributes
+          add_interfaces
+        end
       end
 
       private
 
-      attr_reader :name, :description, :attributes, :type_name, :force_define_attributes
+      attr_reader :name, :description, :attributes, :type_name, :force_define_attributes,
+                  :implements
 
       delegate :klass, :new_class?, to: :type_class_finder
 
+      def parent_class
+        GraphqlRails::Types::ObjectType
+      end
+
+      def add_attributes_batch(attributes)
+        AddFieldsToGraphqlType.call(klass: klass, attributes: attributes)
+      end
+
       def type_class_finder
         @type_class_finder ||= FindOrBuildGraphqlTypeClass.new(
           name: name,
           type_name: type_name,
-          description: description
+          description: description,
+          implements: implements,
+          parent_class: parent_class
         )
       end
 
-      def add_fields_to_graphql_type
+      def add_attributes
         scalar_attributes, dynamic_attributes = attributes.values.partition(&:scalar_type?)
 
-        AddFieldsToGraphqlType.call(klass: klass, attributes: scalar_attributes)
+        add_attributes_batch(scalar_attributes)
         dynamic_attributes.each { |attribute| find_or_build_dynamic_type(attribute) }
-        AddFieldsToGraphqlType.call(klass: klass, attributes: dynamic_attributes)
+        add_attributes_batch(dynamic_attributes)
+      end
+
+      def add_interfaces
+        implements.each do |interface|
+          next if klass.interfaces.include?(interface)
+
+          klass.implements(interface)
+        end
       end
 
       def find_or_build_dynamic_type(attribute)
         graphql_model = attribute.graphql_model
-        find_or_build_graphql_model_type(graphql_model) if graphql_model
+        return unless graphql_model
+
+        find_or_build_graphql_model_type(graphql_model.graphql)
       end
 
-      def find_or_build_graphql_model_type(graphql_model)
+      def find_or_build_graphql_model_type(graphql_config)
         self.class.call(
-          name: graphql_model.graphql.name,
-          description: graphql_model.graphql.description,
-          attributes: graphql_model.graphql.attributes,
-          type_name: graphql_model.graphql.type_name
+          name: graphql_config.name,
+          description: graphql_config.description,
+          attributes: graphql_config.attributes,
+          type_name: graphql_config.type_name
         )
       end
     end