graphql_rails 1.0.0 → 1.2.3

data/lib/graphql_rails/controller/action.rb

@@ -36,7 +36,11 @@ module GraphqlRails
       end
 
       def type_args
-        [type_parser.type_arg, null: !type_parser.required?]
+        [type_parser.type_arg]
+      end
+
+      def type_options
+        { null: !type_parser.required? }
       end
 
       private

data/lib/graphql_rails/controller/build_controller_action_resolver.rb

@@ -19,13 +19,13 @@ module GraphqlRails
         action = build_action
 
         Class.new(ControllerActionResolver) do
-          type(*action.type_args)
+          type(*action.type_args, **action.type_options)
           description(action.description)
           controller(action.controller)
           controller_action_name(action.name)
 
           action.arguments.each do |attribute|
-            argument(*attribute.input_argument_args)
+            argument(*attribute.input_argument_args, **attribute.input_argument_options)
           end
 
           def self.inspect

data/lib/graphql_rails/controller/log_controller_action.rb

@@ -51,8 +51,7 @@ module GraphqlRails
             params
           else
             filter_options = Rails.configuration.filter_parameters
-            parametter_filter = ActionDispatch::Http::ParameterFilter.new(filter_options)
-            parametter_filter.filter(params)
+            parameter_filter_class.new(filter_options).filter(params)
           end
       end
 
@@ -61,6 +60,12 @@ module GraphqlRails
 
         Rails.application.config.filter_parameters || []
       end
+
+      def parameter_filter_class
+        return ActiveSupport::ParameterFilter if Object.const_defined?('ActiveSupport::ParameterFilter')
+
+        ActionDispatch::Http::ParameterFilter
+      end
     end
   end
 end

data/lib/graphql_rails/controller/request.rb

@@ -16,7 +16,7 @@ module GraphqlRails
       end
 
       def errors=(new_errors)
-        @errors = FormatErrors.call(new_errors)
+        @errors = FormatErrors.call(not_formatted_errors: new_errors)
 
         @errors.each { |error| context.add_error(error) }
       end

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

@@ -12,7 +12,7 @@ module GraphqlRails
       class FormatErrors
         include Service
 
-        def initialize(not_formatted_errors)
+        def initialize(not_formatted_errors:)
           @not_formatted_errors = not_formatted_errors
         end
 

data/lib/graphql_rails/decorator/relation_decorator.rb

@@ -71,9 +71,5 @@ module GraphqlRails
         self.class.new(decorator: decorator, relation: new_relation, decorator_args: decorator_args)
       end
     end
-
-    GraphQL::Relay::BaseConnection.register_connection_implementation(
-      RelationDecorator, GraphQL::Relay::RelationConnection
-    )
   end
 end

data/lib/graphql_rails/model/add_fields_to_graphql_type.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # Adds graphql attributes as graphql fields to given graphql schema object.
+    class AddFieldsToGraphqlType
+      require 'graphql_rails/concerns/service'
+      require 'graphql_rails/model/call_graphql_model_method'
+
+      include ::GraphqlRails::Service
+
+      def initialize(klass:, attributes:)
+        @klass = klass
+        @attributes = attributes
+      end
+
+      def call
+        attributes.each { |attribute| define_graphql_field(attribute) }
+      end
+
+      private
+
+      attr_reader :attributes, :klass
+
+      def define_graphql_field(attribute) # rubocop:disable Metrics/MethodLength)
+        klass.class_eval do
+          field(*attribute.field_args, **attribute.field_options) do
+            attribute.attributes.values.each do |arg_attribute|
+              argument(*arg_attribute.input_argument_args, **arg_attribute.input_argument_options)
+            end
+          end
+
+          define_method(attribute.field_name) do |**kwargs|
+            CallGraphqlModelMethod.call(
+              model: object,
+              attribute_config: attribute,
+              method_keyword_arguments: kwargs,
+              graphql_context: context
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/model/build_connection_type.rb

@@ -30,7 +30,11 @@ module GraphqlRails
           graphql_name("#{type.graphql_name}Connection")
           edge_type(edge_type)
 
-          field :total, Integer, null: false, resolve: CountItems
+          field :total, Integer, null: false
+
+          def total
+            CountItems.call(object)
+          end
         end
       end
 

data/lib/graphql_rails/model/build_connection_type/count_items.rb

@@ -10,7 +10,7 @@ module GraphqlRails
 
         include ::GraphqlRails::Service
 
-        def initialize(graphql_object, _args, _ctx)
+        def initialize(graphql_object)
           @graphql_object = graphql_object
         end
 
@@ -27,7 +27,7 @@ module GraphqlRails
         attr_reader :graphql_object
 
         def list
-          graphql_object.nodes
+          graphql_object.items
         end
 
         def active_record?

data/lib/graphql_rails/model/build_graphql_input_type.rb

@@ -24,7 +24,7 @@ module GraphqlRails
           description(type_description)
 
           type_attributes.each_value do |type_attribute|
-            argument(*type_attribute.input_argument_args)
+            argument(*type_attribute.input_argument_args, **type_attribute.input_argument_options)
           end
 
           def self.inspect

data/lib/graphql_rails/model/call_graphql_model_method.rb

@@ -31,10 +31,23 @@ module GraphqlRails
         if custom_keyword_arguments.empty?
           model.send(method_name)
         else
-          model.send(method_name, **custom_keyword_arguments)
+          formatted_arguments = formatted_method_input(custom_keyword_arguments)
+          model.send(method_name, **formatted_arguments)
         end
       end
 
+      def formatted_method_input(keyword_arguments)
+        keyword_arguments.transform_values do |input_argument|
+          formatted_method_input_argument(input_argument)
+        end
+      end
+
+      def formatted_method_input_argument(argument)
+        return argument.to_h if argument.is_a?(GraphQL::Schema::InputObject)
+
+        argument
+      end
+
       def method_name
         attribute_config.property
       end

data/lib/graphql_rails/model/configurable.rb

@@ -9,11 +9,15 @@ module GraphqlRails
         @attributes ||= {}
       end
 
-      def name(type_name = nil)
-        @name = type_name if type_name
+      def name(graphql_name = nil)
+        @name = graphql_name if graphql_name
         @name || 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

data/lib/graphql_rails/model/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'graphql_rails/attributes'
-require 'graphql_rails/model/build_graphql_type'
+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'
@@ -32,7 +32,9 @@ module GraphqlRails
 
         attributes[key].tap do |attribute|
           attribute_options.each do |method_name, args|
-            attribute.public_send(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?
@@ -54,8 +56,11 @@ module GraphqlRails
       end
 
       def graphql_type
-        @graphql_type ||= BuildGraphqlType.call(
-          name: name, description: description, attributes: attributes
+        @graphql_type ||= FindOrBuildGraphqlType.call(
+          name: name,
+          description: description,
+          attributes: attributes,
+          type_name: type_name
         )
       end
 

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # stores information about model specific config, like attributes and types
+    class FindOrBuildGraphqlType
+      require 'graphql_rails/concerns/service'
+      require 'graphql_rails/model/find_or_build_graphql_type_class'
+      require 'graphql_rails/model/add_fields_to_graphql_type'
+
+      include ::GraphqlRails::Service
+
+      def initialize(name:, description:, attributes:, type_name:)
+        @name = name
+        @description = description
+        @attributes = attributes
+        @type_name = type_name
+      end
+
+      def call
+        klass.tap { add_fields_to_graphql_type if new_class? }
+      end
+
+      private
+
+      attr_reader :name, :description, :attributes, :type_name
+
+      delegate :klass, :new_class?, to: :type_class_finder
+
+      def type_class_finder
+        @type_class_finder ||= FindOrBuildGraphqlTypeClass.new(
+          name: name,
+          type_name: type_name,
+          description: description
+        )
+      end
+
+      def add_fields_to_graphql_type
+        AddFieldsToGraphqlType.call(klass: klass, attributes: attributes.values.select(&: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
+      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
+          )
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/model/find_or_build_graphql_type_class.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # Initializes class to define graphql type and fields.
+    class FindOrBuildGraphqlTypeClass
+      require 'graphql_rails/concerns/service'
+
+      include ::GraphqlRails::Service
+
+      def initialize(name:, type_name:, description: nil)
+        @name = name
+        @type_name = type_name
+        @description = description
+        @new_class = false
+      end
+
+      def klass
+        @klass ||= Object.const_defined?(type_name) && Object.const_get(type_name) || build_graphql_type_klass
+      end
+
+      def new_class?
+        new_class
+      end
+
+      private
+
+      attr_accessor :new_class
+      attr_reader :name, :type_name, :description
+
+      def build_graphql_type_klass
+        graphql_type_name = name
+        graphql_type_description = description
+
+        graphql_type_klass = Class.new(GraphQL::Schema::Object) do
+          graphql_name(graphql_type_name)
+          description(graphql_type_description)
+        end
+
+        self.new_class = true
+
+        Object.const_set(type_name, graphql_type_klass)
+      end
+    end
+  end
+end

data/lib/graphql_rails/router.rb

@@ -85,7 +85,7 @@ module GraphqlRails
       default_options = { module_name: module_name, group_names: group_names }
       full_options = default_options.merge(new_router_options)
 
-      self.class.new(full_options)
+      self.class.new(**full_options)
     end
 
     def add_raw_action(name, *args, &block)
@@ -93,7 +93,7 @@ module GraphqlRails
     end
 
     def build_route(route_builder, name, **options)
-      route_builder.new(name, full_route_options(options))
+      route_builder.new(name, **full_route_options(options))
     end
 
     def full_route_options(extra_options)

data/lib/graphql_rails/router/resource_routes_builder.rb

@@ -20,12 +20,12 @@ module GraphqlRails
         @routes ||= initial_routes
       end
 
-      def query(*args)
-        routes << build_query(*args)
+      def query(*args, **kwargs)
+        routes << build_query(*args, **kwargs)
       end
 
-      def mutation(*args)
-        routes << build_mutation(*args)
+      def mutation(*args, **kwargs)
+        routes << build_mutation(*args, **kwargs)
       end
 
       private
@@ -54,12 +54,12 @@ module GraphqlRails
         routes
       end
 
-      def build_mutation(*args)
-        build_route(MutationRoute, *args)
+      def build_mutation(*args, **kwargs)
+        build_route(MutationRoute, *args, **kwargs)
       end
 
-      def build_query(*args)
-        build_route(QueryRoute, *args)
+      def build_query(*args, **kwargs)
+        build_route(QueryRoute, *args, **kwargs)
       end
 
       # rubocop:disable Metrics/ParameterLists

data/lib/graphql_rails/router/route.rb

@@ -33,16 +33,12 @@ module GraphqlRails
         groups.include?(group_name&.to_sym)
       end
 
-      def field_args
-        options = {}
-
+      def field_options
         if function
-          options[:function] = function
+          { function: function }
         else
-          options[:resolver] = resolver
+          { resolver: resolver }
         end
-
-        [name, options]
       end
 
       private

data/lib/graphql_rails/router/schema_builder.rb

@@ -21,6 +21,10 @@ module GraphqlRails
         raw = raw_actions
 
         Class.new(GraphQL::Schema) do
+          connections.add(
+            GraphqlRails::Decorator::RelationDecorator,
+            GraphQL::Pagination::ActiveRecordRelationConnection
+          )
           cursor_encoder(Router::PlainCursorEncoder)
           raw.each { |action| send(action[:name], *action[:args], &action[:block]) }
 
@@ -46,7 +50,7 @@ module GraphqlRails
           graphql_name(type_name)
 
           group_routes.each do |route|
-            field(*route.field_args)
+            field(*route.name, **route.field_options)
           end
 
           def self.inspect