graphql_rails 1.2.3 → 2.1.0

data/lib/graphql_rails/attributes/input_attribute.rb

@@ -4,22 +4,19 @@ module GraphqlRails
   module Attributes
     # contains info about single graphql input attribute
     class InputAttribute
+      require 'graphql_rails/model/build_enum_type'
       require_relative './input_type_parser'
       require_relative './attribute_name_parser'
       include Attributable
+      include AttributeConfigurable
 
-      attr_reader :description
+      chainable_option :subtype
+      chainable_option :enum
 
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(name, type: nil, description: nil, subtype: nil, required: nil, options: {})
+      def initialize(name, config:)
+        @config = config
         @initial_name = name
-        @initial_type = type
-        @description = description
-        @options = options
-        @subtype = subtype
-        @required = required
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def input_argument_args
         type = raw_input_type || input_type_parser.input_type_arg
@@ -28,7 +25,7 @@ module GraphqlRails
       end
 
       def input_argument_options
-        { required: required?, description: description, camelize: false }
+        { required: required?, description: description, camelize: false, groups: groups }
       end
 
       def paginated?
@@ -37,7 +34,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :initial_name, :initial_type, :options, :subtype
+      attr_reader :initial_name, :config
 
       def attribute_name_parser
         @attribute_name_parser ||= AttributeNameParser.new(
@@ -51,14 +48,23 @@ module GraphqlRails
 
       def input_type_parser
         @input_type_parser ||= begin
-          initial_parseable_type = initial_type || attribute_name_parser.graphql_type
+          initial_parseable_type = type || enum_type || attribute_name_parser.graphql_type
           InputTypeParser.new(initial_parseable_type, subtype: subtype)
         end
       end
 
+      def enum_type
+        return if enum.blank?
+
+        ::GraphqlRails::Model::BuildEnumType.call(
+          "#{config.name}_#{initial_name}_enum",
+          allowed_values: enum
+        )
+      end
+
       def raw_input_type
-        return initial_type if initial_type.is_a?(GraphQL::InputObjectType)
-        return initial_type.graphql_input_type if initial_type.is_a?(Model::Input)
+        return type if type.is_a?(GraphQL::InputObjectType)
+        return type.graphql_input_type if type.is_a?(Model::Input)
       end
     end
   end

data/lib/graphql_rails/attributes/input_type_parser.rb

@@ -15,12 +15,6 @@ module GraphqlRails
         @subtype = subtype
       end
 
-      def graphql_type
-        return nil if unparsed_type.nil?
-
-        partly_parsed_type || parsed_type
-      end
-
       def input_type_arg
         if list?
           list_type_arg
@@ -34,7 +28,11 @@ module GraphqlRails
       attr_reader :unparsed_type, :subtype
 
       def unwrapped_type
-        raw_unwrapped_type || unwrapped_scalar_type || unwrapped_model_input_type || raise_not_supported_type_error
+        raw_unwrapped_type ||
+          unwrapped_scalar_type ||
+          unwrapped_model_input_type ||
+          graphql_type_object ||
+          raise_not_supported_type_error
       end
 
       def raw_unwrapped_type

data/lib/graphql_rails/attributes/type_parseable.rb

@@ -16,18 +16,27 @@ module GraphqlRails
         'int' => GraphQL::Types::Int,
         'integer' => GraphQL::Types::Int,
 
+        'big_int' => GraphQL::Types::BigInt,
+        'bigint' => GraphQL::Types::BigInt,
+
+        'float' => GraphQL::Types::Float,
+        'double' => GraphQL::Types::Float,
+        'decimal' => GraphQL::Types::Float,
+
+        'bool' => GraphQL::Types::Boolean,
+        'boolean' => GraphQL::Types::Boolean,
+
         'string' => GraphQL::Types::String,
         'str' => GraphQL::Types::String,
         'text' => GraphQL::Types::String,
-        'time' => GraphQL::Types::String,
-        'date' => GraphQL::Types::String,
 
-        'bool' => GraphQL::Types::Boolean,
-        'boolean' => GraphQL::Types::Boolean,
+        'date' => GraphQL::Types::ISO8601Date,
 
-        'float' => GraphQL::Types::Float,
-        'double' => GraphQL::Types::Float,
-        'decimal' => GraphQL::Types::Float
+        'time' => GraphQL::Types::ISO8601DateTime,
+        'datetime' => GraphQL::Types::ISO8601DateTime,
+        'date_time' => GraphQL::Types::ISO8601DateTime,
+
+        'json' => GraphQL::Types::JSON
       }.freeze
 
       WRAPPER_TYPES = [
@@ -43,10 +52,16 @@ module GraphqlRails
         GraphQL::InputObjectType
       ].freeze
 
+      PARSEABLE_RAW_GRAPHQL_TYPES = [
+        GraphQL::Schema::Object,
+        GraphQL::Schema::Scalar,
+        GraphQL::Schema::Enum
+      ].freeze
+
       RAW_GRAPHQL_TYPES = (WRAPPER_TYPES + GRAPHQL_BASE_TYPES).freeze
 
       def unwrapped_scalar_type
-        TYPE_MAPPING[nullable_inner_name.downcase.downcase]
+        TYPE_MAPPING[nullable_inner_name.downcase]
       end
 
       def raw_graphql_type?
@@ -58,25 +73,46 @@ module GraphqlRails
       end
 
       def core_scalar_type?
-        unwrapped_scalar_type.in?(TYPE_MAPPING.values)
+        unwrapped_scalar_type.present?
       end
 
       def graphql_model
-        type_class = \
-          if unparsed_type.is_a?(Class) && unparsed_type < GraphqlRails::Model
-            unparsed_type
-          else
-            nullable_inner_name.safe_constantize
-          end
-
-        return if type_class.nil?
-        return unless type_class < GraphqlRails::Model
+        extract_type_class_if { |type| graphql_model?(type) }
+      end
 
-        type_class
+      def graphql_type_object
+        type_object = extract_type_class_if { |type| graphql_type_object?(type) }
+        type_object || graphql_model&.graphql&.graphql_type
       end
 
       protected
 
+      def extract_type_class_if
+        return unparsed_type if yield(unparsed_type)
+
+        type_class = nullable_inner_name.safe_constantize
+        return type_class if yield(type_class)
+
+        nil
+      end
+
+      def graphql_model?(type_class)
+        type_class.is_a?(Class) && type_class < GraphqlRails::Model
+      end
+
+      def graphql_type_object?(type_class)
+        return false unless type_class.is_a?(Class)
+
+        PARSEABLE_RAW_GRAPHQL_TYPES.any? { |parent_type| type_class < parent_type }
+      end
+
+      def applicable_graphql_type?(type)
+        return false unless type.is_a?(Class)
+        return true if type < GraphqlRails::Model
+
+        false
+      end
+
       def unwrap_type(type)
         unwrappable = type
         unwrappable = unwrappable.of_type while wrapped_type?(unwrappable)

data/lib/graphql_rails/attributes/type_parser.rb

@@ -51,7 +51,9 @@ module GraphqlRails
       def paginated_type_arg
         return graphql_model.graphql.connection_type if graphql_model
 
-        raise NotSupportedFeature, 'pagination is only supported for models which include GraphqlRails::Model'
+        error_message = "Unable to paginate #{unparsed_type.inspect}. " \
+                        'Pagination is only supported for models which include GraphqlRails::Model'
+        raise NotSupportedFeature, error_message
       end
 
       def list_type_arg
@@ -107,14 +109,7 @@ module GraphqlRails
       end
 
       def type_by_name
-        unwrapped_scalar_type || unwrapped_model_type || raise_not_supported_type_error
-      end
-
-      def unwrapped_model_type
-        type_class = graphql_model
-        return unless type_class
-
-        type_class.graphql.graphql_type
+        unwrapped_scalar_type || graphql_type_object || raise_not_supported_type_error
       end
     end
   end

data/lib/graphql_rails/concerns/chainable_options.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  # Allows defining methods chained way
+  module ChainableOptions
+    NOT_SET = Object.new
+
+    # nodoc
+    module ClassMethods
+      def chainable_option(option_name, default: nil)
+        define_method(option_name) do |value = NOT_SET|
+          get_or_set_chainable_option(option_name, value, default: default)
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def initialize_copy(other)
+      super
+      @chainable_option = other.instance_variable_get(:@chainable_option).dup
+    end
+
+    def with(**options)
+      options.each do |method_name, args|
+        send_args = [method_name]
+        send_args << args if method(method_name).parameters.present?
+        public_send(*send_args)
+      end
+      self
+    end
+
+    private
+
+    def fetch_chainable_option(option_name, *default, &block)
+      @chainable_option.fetch(option_name.to_sym, *default, &block)
+    end
+
+    def get_or_set_chainable_option(option_name, value = NOT_SET, default: nil)
+      @chainable_option ||= {}
+      return fetch_chainable_option(option_name, default) if value == NOT_SET
+
+      @chainable_option[option_name.to_sym] = value
+      self
+    end
+  end
+end

data/lib/graphql_rails/controller/build_controller_action_resolver/controller_action_resolver.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'graphql_rails/controller/request'
+require 'graphql_rails/types/argument_type'
 
 module GraphqlRails
   class Controller
@@ -8,6 +9,8 @@ module GraphqlRails
       # Resolver which includes controller specific methods.
       # Used to simplify resolver build for each controller action
       class ControllerActionResolver < GraphQL::Schema::Resolver
+        argument_class(GraphqlRails::Types::ArgumentType)
+
         def self.controller(controller_class = nil)
           @controller = controller_class if controller_class
           @controller

data/lib/graphql_rails/decorator/relation_decorator.rb

@@ -5,7 +5,7 @@ module GraphqlRails
     # wrapps active record relation and returns decorated object instead
     class RelationDecorator
       delegate :map, :each, to: :to_a
-      delegate :limit_value, :offset_value, :count, :size, to: :relation
+      delegate :limit_value, :offset_value, :count, :size, :empty?, to: :relation
 
       def self.decorates?(object)
         (defined?(ActiveRecord) && object.is_a?(ActiveRecord::Relation)) ||
@@ -24,7 +24,7 @@ module GraphqlRails
         end
       end
 
-      %i[first second last].each do |method_name|
+      %i[first second last find find_by].each do |method_name|
         define_method method_name do |*args, &block|
           decoratable_object_method(method_name, *args, &block)
         end

data/lib/graphql_rails/input_configurable.rb

@@ -3,9 +3,14 @@
 module GraphqlRails
   # contains configuration options related with inputs
   module InputConfigurable
-    def permit(*no_type_attributes, **typed_attributes)
-      no_type_attributes.each { |attribute| permit_input(attribute) }
-      typed_attributes.each { |attribute, type| permit_input(attribute, type: type) }
+    def permit(*args)
+      args.each do |arg|
+        if arg.is_a? Hash
+          arg.each { |attribute, type| permit_input(attribute, type: type) }
+        else
+          permit_input(arg)
+        end
+      end
       self
     end
 
@@ -37,11 +42,8 @@ module GraphqlRails
     end
 
     def build_input_attribute(name, options: {}, **other_options)
-      Attributes::InputAttribute.new(
-        name.to_s,
-        options: input_attribute_options.merge(options),
-        **other_options
-      )
+      input_options = input_attribute_options.merge(options)
+      Attributes::InputAttribute.new(name.to_s, config: self).with(options: input_options, **other_options)
     end
   end
 end

data/lib/graphql_rails/model/build_graphql_input_type.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require 'graphql_rails/types/argument_type'
+require 'graphql_rails/concerns/service'
+
 module GraphqlRails
   module Model
     # stores information about model specific config, like attributes and types
     class BuildGraphqlInputType
-      require 'graphql_rails/concerns/service'
-
       include ::GraphqlRails::Service
 
       def initialize(name:, description: nil, attributes:)
@@ -20,6 +21,7 @@ module GraphqlRails
         type_attributes = attributes
 
         Class.new(GraphQL::Schema::InputObject) do
+          argument_class(GraphqlRails::Types::ArgumentType)
           graphql_name(type_name)
           description(type_description)
 

data/lib/graphql_rails/model/configurable.rb

@@ -2,25 +2,47 @@
 
 module GraphqlRails
   module Model
-    # contains methods which are shared between various configurations
-    # expects `default_name` to be defined
+    # Contains methods which are shared between various configurations.
+    #
+    # Expects `default_name` to be defined.
+    # Expects `build_attribute(attr_name)` method to be defined.
     module Configurable
+      require 'active_support/concern'
+      require 'graphql_rails/concerns/chainable_options'
+
+      extend ActiveSupport::Concern
+
+      included do
+        include GraphqlRails::ChainableOptions
+
+        chainable_option :description
+      end
+
+      def initialize_copy(other)
+        super
+        @type_name = nil
+        @attributes = other.attributes.transform_values(&:dup)
+      end
+
       def attributes
         @attributes ||= {}
       end
 
-      def name(graphql_name = nil)
-        @name = graphql_name if graphql_name
-        @name || default_name
+      def name(*args)
+        get_or_set_chainable_option(:name, *args) || default_name
       end
 
       def type_name
         @type_name ||= "#{name.camelize}Type#{SecureRandom.hex}"
       end
 
-      def description(new_description = nil)
-        @description = new_description if new_description
-        @description
+      def attribute(attribute_name, **attribute_options)
+        key = attribute_name.to_s
+
+        attributes[key] ||= build_attribute(attribute_name).tap do |new_attribute|
+          new_attribute.with(**attribute_options) unless attribute_options.empty?
+          yield(new_attribute) if block_given?
+        end
       end
     end
   end

data/lib/graphql_rails/model/configuration.rb

@@ -2,7 +2,6 @@
 
 require 'graphql_rails/attributes'
 require 'graphql_rails/model/find_or_build_graphql_type'
-require 'graphql_rails/model/build_enum_type'
 require 'graphql_rails/model/input'
 require 'graphql_rails/model/configurable'
 require 'graphql_rails/model/build_connection_type'
@@ -11,6 +10,7 @@ module GraphqlRails
   module Model
     # stores information about model specific config, like attributes and types
     class Configuration
+      include ChainableOptions
       include Configurable
 
       def initialize(model_class)
@@ -22,22 +22,14 @@ module GraphqlRails
         @connection_type = nil
         @graphql_type = nil
         @input = other.instance_variable_get(:@input)&.transform_values(&:dup)
-        @attributes = other.instance_variable_get(:@attributes)&.transform_values(&:dup)
       end
 
       def attribute(attribute_name, **attribute_options)
         key = attribute_name.to_s
 
-        attributes[key] ||= Attributes::Attribute.new(attribute_name)
-
-        attributes[key].tap do |attribute|
-          attribute_options.each do |method_name, args|
-            send_args = [method_name]
-            send_args << args if attribute.method(method_name).parameters.present?
-            attribute.public_send(*send_args)
-          end
-
-          yield(attribute) if block_given?
+        attributes[key] ||= build_attribute(attribute_name).tap do |new_attribute|
+          new_attribute.with(**attribute_options)
+          yield(new_attribute) if block_given?
         end
       end
 
@@ -68,13 +60,35 @@ module GraphqlRails
         @connection_type ||= BuildConnectionType.call(graphql_type)
       end
 
+      def with_ensured_fields!
+        return self if @graphql_type.blank?
+
+        reset_graphql_type if attributes.any? && graphql_type.fields.length != attributes.length
+
+        self
+      end
+
       private
 
       attr_reader :model_class
 
+      def build_attribute(attribute_name)
+        Attributes::Attribute.new(attribute_name)
+      end
+
       def default_name
         @default_name ||= model_class.name.split('::').last
       end
+
+      def reset_graphql_type
+        @graphql_type = FindOrBuildGraphqlType.call(
+          name: name,
+          description: description,
+          attributes: attributes,
+          type_name: type_name,
+          force_define_attributes: true
+        )
+      end
     end
   end
 end

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -10,20 +10,21 @@ module GraphqlRails
 
       include ::GraphqlRails::Service
 
-      def initialize(name:, description:, attributes:, type_name:)
+      def initialize(name:, description:, attributes:, type_name:, force_define_attributes: false)
         @name = name
         @description = description
         @attributes = attributes
         @type_name = type_name
+        @force_define_attributes = force_define_attributes
       end
 
       def call
-        klass.tap { add_fields_to_graphql_type if new_class? }
+        klass.tap { add_fields_to_graphql_type if new_class? || force_define_attributes }
       end
 
       private
 
-      attr_reader :name, :description, :attributes, :type_name
+      attr_reader :name, :description, :attributes, :type_name, :force_define_attributes
 
       delegate :klass, :new_class?, to: :type_class_finder
 
@@ -36,29 +37,30 @@ module GraphqlRails
       end
 
       def add_fields_to_graphql_type
-        AddFieldsToGraphqlType.call(klass: klass, attributes: attributes.values.select(&:scalar_type?))
+        scalar_attributes, dynamic_attributes = attributes.values.partition(&:scalar_type?)
 
-        attributes.values.reject(&:scalar_type?).tap do |dynamic_attributes|
-          find_or_build_dynamic_graphql_types(dynamic_attributes) do |name, description, attributes, type_name|
-            self.class.call(
-              name: name, description: description,
-              attributes: attributes, type_name: type_name
-            )
-          end
-          AddFieldsToGraphqlType.call(klass: klass, attributes: dynamic_attributes)
-        end
+        AddFieldsToGraphqlType.call(klass: klass, attributes: scalar_attributes)
+        dynamic_attributes.each { |attribute| find_or_build_dynamic_type(attribute) }
+        AddFieldsToGraphqlType.call(klass: klass, attributes: dynamic_attributes)
       end
 
-      def find_or_build_dynamic_graphql_types(dynamic_attributes)
-        dynamic_attributes.each do |attribute|
-          yield(
-            attribute.graphql_model.graphql.name,
-            attribute.graphql_model.graphql.description,
-            attribute.graphql_model.graphql.attributes,
-            attribute.graphql_model.graphql.type_name
-          )
+      def find_or_build_dynamic_type(attribute)
+        graphql_model = attribute.graphql_model
+        if graphql_model
+          find_or_build_graphql_model_type(graphql_model)
+        else
+          AddFieldsToGraphqlType.call(klass: klass, attributes: [attribute])
         end
       end
+
+      def find_or_build_graphql_model_type(graphql_model)
+        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
+        )
+      end
     end
   end
 end

data/lib/graphql_rails/model/find_or_build_graphql_type_class.rb

@@ -5,6 +5,7 @@ module GraphqlRails
     # Initializes class to define graphql type and fields.
     class FindOrBuildGraphqlTypeClass
       require 'graphql_rails/concerns/service'
+      require 'graphql_rails/types/object_type'
 
       include ::GraphqlRails::Service
 
@@ -32,7 +33,7 @@ module GraphqlRails
         graphql_type_name = name
         graphql_type_description = description
 
-        graphql_type_klass = Class.new(GraphQL::Schema::Object) do
+        graphql_type_klass = Class.new(GraphqlRails::Types::ObjectType) do
           graphql_name(graphql_type_name)
           description(graphql_type_description)
         end

data/lib/graphql_rails/model/input.rb

@@ -1,58 +1,42 @@
 # frozen_string_literal: true
 
-require 'graphql_rails/model/build_graphql_input_type'
-require 'graphql_rails/model/configurable'
-
 module GraphqlRails
   module Model
     # stores information about model input specific config, like attributes and types
     class Input
+      require 'graphql_rails/concerns/chainable_options'
+      require 'graphql_rails/model/configurable'
+      require 'graphql_rails/model/build_graphql_input_type'
+
       include Configurable
 
+      chainable_option :enum
+
       def initialize(model_class, input_name_suffix)
         @model_class = model_class
         @input_name_suffix = input_name_suffix
       end
 
-      def initialize_copy(other)
-        super
-        @attributes = other.instance_variable_get(:@attributes)&.transform_values(&:dup)
-      end
-
       def graphql_input_type
         @graphql_input_type ||= BuildGraphqlInputType.call(
           name: name, description: description, attributes: attributes
         )
       end
 
-      def attribute(attribute_name, type: nil, enum: nil, **attribute_options)
-        input_type = attribute_type(attribute_name, type: type, enum: enum, **attribute_options)
-
-        attributes[attribute_name.to_s] = Attributes::InputAttribute.new(
-          attribute_name, type: input_type, **attribute_options
-        )
-      end
-
       private
 
       attr_reader :input_name_suffix, :model_class
 
+      def build_attribute(attribute_name)
+        Attributes::InputAttribute.new(attribute_name, config: self)
+      end
+
       def default_name
         @default_name ||= begin
           suffix = input_name_suffix ? input_name_suffix.to_s.camelize : ''
           "#{model_class.name.split('::').last}#{suffix}Input"
         end
       end
-
-      def attribute_type(attribute_name, type:, enum:, description: nil, **_other)
-        return type unless enum
-
-        BuildEnumType.call(
-          "#{name}_#{attribute_name}_enum",
-          allowed_values: enum,
-          description: description
-        )
-      end
     end
   end
 end

data/lib/graphql_rails/model.rb

@@ -28,7 +28,7 @@ module GraphqlRails
 
       def graphql
         @graphql ||= Model::Configuration.new(self)
-        yield(@graphql) if block_given?
+        @graphql.tap { |it| yield(it) }.with_ensured_fields! if block_given?
         @graphql
       end
     end