graphql_rails 1.2.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f7c503110a2423bb3e0b90154f9d0c4f6daeabc3315a1c49c1a832a29366ff2
-  data.tar.gz: bfc7779f2678094724d0d1c3368edaa792665493a32d5112c5864998879fe96c
+  metadata.gz: 1d635269612ec07a541e7adebb01a9da7420f74511d8bbc4a30c60cea2eadc3f
+  data.tar.gz: 5d8e87e2d4c22bcf679645fa0de355b5c2a1765d357e28ba00560e83279462a0
 SHA512:
-  metadata.gz: 740f486bb00615a7b83a78a8d5dc6d72d7d57dc0a42385178d1cc87875e264f0370f3131ca1e327f8d510f2126b7956915ead75374b06c81e99c96f98b6d57b9
-  data.tar.gz: df08d0a84e9f505d25922d460677ddf2d34e5333258d111e9ee95090747612ccbb789d4f44d88f9cb1779a2afd4bbe4765b1ecabb1e88e2d75b777a05f94f3a4
+  metadata.gz: 4bdbac43bd69d1ace6bc7b29d6cfba07225950ff9a583f269310eed608fc5554afa934e2e34d4f2001349bdc8385fe4d94b6dc1b8844cb20f5d850276b5c9576
+  data.tar.gz: 9bdf1be49c697610f584def6bb016b5bd60455eb813c5b4884b491c39cb7df7c29d277efe56e45e79bc24089c3cf1befa9c178471396fe6eb6ca52c2ec49bffc

data/CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
 
+## [2.0.0](2021-12-03)
+
+* Added: support for generating multiple schema dumps with `rake graphql_rails:schema:dump`.
+* Added: support for using chainable syntax for input attributes.
+* Changed: changed default `predicate method type from `Boolean` to `Boolean!`
+* Changed: changed error message when trying to paginate not supported types
+* Added: support defining graphql-ruby types as strings.
+
 ## [1.2.4](2021-05-05)
 
 * Fixed: Dynamic types definition where type A references type B referencing type A.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (1.2.6)
+    graphql_rails (2.0.0)
       activesupport (>= 4)
       graphql (~> 1.12, >= 1.12.4)
 
@@ -219,4 +219,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.28

data/docs/components/model.md

@@ -27,8 +27,8 @@ Most commonly you will use `attribute` to make your model methods and attributes
 
 Some types can be determined by attribute name, so you can skip this attribute:
 
-* attributes which ends with name `*_id` has `ID` type
-* attributes which ends with `?` has `Boolean` type
+* attributes which ends with name `*_id` has `ID!` type
+* attributes which ends with `?` has `Boolean!` type
 * all other attributes without type are considered to be `String`
 
 available types are:
@@ -45,9 +45,9 @@ class User
   include GraphqlRails::Model
 
   graphql do |c|
-    c.attribute :shop_id # ID type
+    c.attribute :shop_id # ID! type
     c.attribute :full_name # String type
-    c.attribute :admin? # Boolean type
+    c.attribute :admin? # Boolean! type
     c.attribute :level, type: 'integer'
     c.attribute :money, type: 'float'
   end
@@ -72,7 +72,7 @@ end
 class User
   include GraphqlRails::Model
 
-  graphql.attribute :address, type: AddressType, required: true
+  graphql.attribute :address, type: 'AddressType!', required: true
 end
 ```
 
@@ -243,6 +243,24 @@ class User
 end
 ```
 
+### attribute.with
+
+When you want to define some options dynamically, it's quite handy to use "Attribute#with" method:
+
+```ruby
+class User
+  include GraphqlRails::Model
+
+  graphql do |c|
+    c.attribute(:shop_id).with(type: 'ID', description: 'references to shop')
+    # same as:
+    # c.attribute(:shop_id, type: 'ID', description: 'references to shop')
+    # also same as:
+    # c.attribute(:shop_id).type('ID').description('references to shop')
+  end
+end
+```
+
 ### "attribute" configuration with chainable methods
 
 If your attribute definition is complex, you can define attribute in more eye-friendly chainable way with:
@@ -361,6 +379,22 @@ class User
 end
 ```
 
+### "input.attribute" configuration with chainable methods
+
+If your input attribute definition is complex, you can define attribute in more eye-friendly chainable way with:
+
+```ruby
+class User
+  include GraphqlRails::Model
+
+  graphql.input do |c|
+    c.attribute(:friends_count)
+      .type(:integer!)
+      .description('Can not be zero or less')
+  end
+end
+```
+
 #### required type
 
 There are few ways how to mark field as required.

data/docs/other_tools/schema_dump.md

@@ -6,24 +6,24 @@ GraphqlRails includes rake task to allow creating schema snapshots easier:
 rake graphql_rails:schema:dump
 ```
 
-## Dumping non default schema
+## Dumping only selected schema groups
 
-You can have multiple graphql schemas. Read more about this in [routes section](components/routes). In order to generate schema for one of groups, provide optional `name` argument:
+You can specify which schema groups you want to dump. In order to do so, provide groups list as rake task argument and separate group names by comma:
 
 ```bash
-rake graphql_rails:schema:dump['your_group_name']
+rake graphql_rails:schema:dump['your_group_name, your_group_name2']
 ```
 
-or using env variable `SCHEMA_GROUP_NAME`:
+You can do this also by using ENV variable `SCHEMA_GROUP_NAME`:
 
 ```bash
-SCHEMA_GROUP_NAME=your_group_name rake graphql_rails:schema:dump
+SCHEMA_GROUP_NAME="your_group_name, your_group_name2" rake graphql_rails:schema:dump
 ```
 
-## Dumping schema in to non default path
+## Dumping schema in to non default folder
 
-By default schema will be dumped to `spec/fixtures/graphql_schema.graphql` path. If you want different schema path, add `GRAPHQL_SCHEMA_DUMP_PATH` env variable, like this:
+By default schema will be dumped to `spec/fixtures` directory. If you want different schema path, add `GRAPHQL_SCHEMA_DUMP_DIR` env variable, like this:
 
 ```bash
-GRAPHQL_SCHEMA_DUMP_PATH='path/to/my/schema.graphql' rake graphql_rails:schema:dump
+GRAPHQL_SCHEMA_DUMP_DIR='path/to/graphql/dumps' rake graphql_rails:schema:dump
 ```

data/lib/graphql_rails/attributes/attributable.rb

@@ -6,14 +6,14 @@ require 'graphql_rails/attributes/attribute_name_parser'
 module GraphqlRails
   module Attributes
     # contains methods which are shared between various attribute-like classes
-    # expects `initial_name` and `initial_type` to be defined
+    # expects `initial_name` and `type` to be defined
     module Attributable
       def field_name
         attribute_name_parser.field_name
       end
 
       def type_name
-        @type_name ||= initial_type.to_s
+        type.to_s
       end
 
       def name
@@ -23,17 +23,9 @@ module GraphqlRails
       def required?
         return @required unless @required.nil?
 
-        attribute_name_parser.required? || !initial_type.to_s[/!$/].nil? || initial_type.is_a?(GraphQL::Schema::NonNull)
-      end
-
-      def required
-        @required = true
-        self
-      end
-
-      def optional
-        @required = false
-        self
+        (type.nil? && attribute_name_parser.required?) ||
+          type.to_s[/!$/].present? ||
+          type.is_a?(GraphQL::Schema::NonNull)
       end
 
       def graphql_model
@@ -52,7 +44,7 @@ module GraphqlRails
 
       def type_parser
         @type_parser ||= begin
-          type_for_parser = initial_type || attribute_name_parser.graphql_type
+          type_for_parser = type || attribute_name_parser.graphql_type
           TypeParser.new(type_for_parser, paginated: paginated?)
         end
       end

data/lib/graphql_rails/attributes/attribute.rb

@@ -2,6 +2,7 @@
 
 require 'graphql'
 require 'graphql_rails/attributes/attributable'
+require 'graphql_rails/attributes/attribute_configurable'
 require 'graphql_rails/input_configurable'
 
 module GraphqlRails
@@ -9,47 +10,21 @@ module GraphqlRails
     # contains info about single graphql attribute
     class Attribute
       include Attributable
+      include AttributeConfigurable
       include InputConfigurable
 
       attr_reader :attributes
 
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(name, type = nil, description: nil, property: name, required: nil, options: {})
-        @initial_type = type
+      def initialize(name)
         @initial_name = name
-        @options = options
-        @description = description
-        @property = property.to_s
-        @required = required
+        @property = name.to_s
         @attributes ||= {}
       end
-      # rubocop:enable Metrics/ParameterLists
 
-      def type(new_type = nil)
-        return @initial_type if new_type.nil?
+      def property(new_value = NOT_SET)
+        return @property if new_value == NOT_SET
 
-        @initial_type = new_type
-        self
-      end
-
-      def description(new_description = nil)
-        return @description if new_description.nil?
-
-        @description = new_description
-        self
-      end
-
-      def property(new_property = nil)
-        return @property if new_property.nil?
-
-        @property = new_property.to_s
-        self
-      end
-
-      def options(new_options = {})
-        return @options if new_options.blank?
-
-        @options = new_options
+        @property = new_value.to_s
         self
       end
 
@@ -82,7 +57,7 @@ module GraphqlRails
 
       protected
 
-      attr_reader :initial_type, :initial_name
+      attr_reader :initial_name
 
       private
 

data/lib/graphql_rails/attributes/attribute_configurable.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'graphql_rails/attributes/type_parser'
+require 'graphql_rails/attributes/attribute_name_parser'
+require 'graphql_rails/model/build_enum_type'
+require 'graphql_rails/concerns/chainable_options'
+require 'active_support/concern'
+
+module GraphqlRails
+  module Attributes
+    # Allows to set or get various attribute parameters
+    module AttributeConfigurable
+      extend ActiveSupport::Concern
+
+      included do
+        include GraphqlRails::ChainableOptions
+
+        chainable_option :description
+        chainable_option :options, default: {}
+        chainable_option :type
+      end
+
+      def required(new_value = true) # rubocop:disable Style/OptionalBooleanParameter
+        @required = new_value
+        self
+      end
+
+      def optional(new_value = true) # rubocop:disable Style/OptionalBooleanParameter
+        required(!new_value)
+      end
+    end
+  end
+end

data/lib/graphql_rails/attributes/attribute_name_parser.rb

@@ -5,12 +5,8 @@ module GraphqlRails
     # Parses attribute name and can generates graphql scalar type,
     # grapqhl name and etc. based on that
     class AttributeNameParser
-      attr_reader :name
-
       def initialize(original_name, options: {})
-        name = original_name.to_s
-        @required = !name['!'].nil?
-        @name = name.tr('!', '')
+        @original_name = original_name.to_s
         @options = options
       end
 
@@ -36,12 +32,16 @@ module GraphqlRails
       end
 
       def required?
-        @required
+        original_name['!'].present? || original_name.end_with?('?')
+      end
+
+      def name
+        @name ||= original_name.tr('!', '')
       end
 
       private
 
-      attr_reader :options
+      attr_reader :options, :original_name
 
       def original_format?
         options[:input_format] == :original || options[:attribute_name_format] == :original

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
@@ -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

@@ -58,25 +58,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)
+
+        type_class < GraphQL::Schema::Object || type_class < GraphQL::Schema::Scalar
+      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/input_configurable.rb

@@ -42,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/configurable.rb

@@ -2,14 +2,25 @@
 
 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
-        @name = nil
         @type_name = nil
-        @description = nil
         @attributes = other.attributes.transform_values(&:dup)
       end
 
@@ -17,18 +28,21 @@ module GraphqlRails
         @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)
@@ -27,16 +27,9 @@ module GraphqlRails
       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
 
@@ -79,6 +72,10 @@ module GraphqlRails
 
       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

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -37,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/input.rb

@@ -1,14 +1,17 @@
 # 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
@@ -20,34 +23,20 @@ module GraphqlRails
         )
       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/router/route.rb

@@ -6,7 +6,7 @@ module GraphqlRails
   class Router
     # Generic class for any type graphql action. Should not be used directly
     class Route
-      attr_reader :name, :module_name, :on, :relative_path
+      attr_reader :name, :module_name, :on, :relative_path, :groups
 
       def initialize(name, to: '', on:, groups: nil, **options)
         @name = name.to_s.camelize(:lower)
@@ -43,7 +43,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :function, :groups
+      attr_reader :function
 
       def resolver
         @resolver ||= Controller::BuildControllerActionResolver.call(route: self)

data/lib/graphql_rails/tasks/dump_graphql_schema.rb

@@ -7,51 +7,37 @@ module GraphqlRails
 
     class MissingGraphqlRouterError < GraphqlRails::Error; end
 
-    attr_reader :name
-
     def self.call(**args)
       new(**args).call
     end
 
-    def initialize(name:)
-      @name = name
+    def initialize(group:, router:, dump_dir: nil)
+      @group = group
+      @router = router
+      @dump_dir = dump_dir
     end
 
     def call
-      validate
       File.write(schema_path, schema.to_definition)
     end
 
     private
 
-    def validate
-      return if router
-
-      error_message = \
-        'GraphqlRouter is missing. ' \
-        'Run `rails g graphql_rails:install` to build it'
-      raise MissingGraphqlRouterError, error_message
-    end
-
-    def router
-      @router ||= '::GraphqlRouter'.safe_constantize
-    end
+    attr_reader :router, :group
 
     def schema
-      @schema ||= ::GraphqlRouter.graphql_schema(name.presence)
+      @schema ||= router.graphql_schema(group.presence)
     end
 
     def schema_path
-      ENV['GRAPHQL_SCHEMA_DUMP_PATH'] || default_schema_path
-    end
+      FileUtils.mkdir_p(dump_dir)
+      file_name = group.present? ? "graphql_#{group}_schema.graphql" : 'graphql_schema.graphql'
 
-    def default_schema_path
-      schema_folder_path = Rails.root.join('spec', 'fixtures')
-
-      FileUtils.mkdir_p(schema_folder_path)
-      file_name = name.present? ? "graphql_#{name}_schema.graphql" : 'graphql_schema.graphql'
+      "#{dump_dir}/#{file_name}"
+    end
 
-      schema_folder_path.join(file_name)
+    def dump_dir
+      @dump_dir ||= Rails.root.join('spec/fixtures').to_s
     end
   end
 end

data/lib/graphql_rails/tasks/dump_graphql_schemas.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'graphql_rails/tasks/dump_graphql_schema'
+
+module GraphqlRails
+  # Generates graphql schema dump files
+  class DumpGraphqlSchemas
+    require 'graphql_rails/errors/error'
+
+    class MissingGraphqlRouterError < GraphqlRails::Error; end
+
+    def self.call(**args)
+      new(**args).call
+    end
+
+    def initialize(dump_dir:, groups: nil)
+      @groups = groups.presence
+      @dump_dir = dump_dir
+    end
+
+    def call
+      validate
+      return dump_default_schema if groups.empty?
+
+      groups.each { |group| dump_graphql_schema(group) }
+    end
+
+    private
+
+    attr_reader :dump_dir
+
+    def dump_default_schema
+      dump_graphql_schema('')
+    end
+
+    def dump_graphql_schema(group)
+      DumpGraphqlSchema.call(group: group, router: router, dump_dir: dump_dir)
+    end
+
+    def validate
+      return if router
+
+      error_message = \
+        'GraphqlRouter is missing. ' \
+        'Run `rails g graphql_rails:install` to build it'
+      raise MissingGraphqlRouterError, error_message
+    end
+
+    def router
+      @router ||= '::GraphqlRouter'.safe_constantize
+    end
+
+    def groups
+      @groups ||= router.routes.flat_map(&:groups).uniq
+    end
+  end
+end

data/lib/graphql_rails/tasks/schema.rake

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
-require 'graphql_rails/tasks/dump_graphql_schema'
+require 'graphql_rails/tasks/dump_graphql_schemas'
 
 namespace :graphql_rails do
   namespace :schema do
     desc 'Dump GraphQL schema'
-    task(:dump, %i[name] => :environment) do |_, args|
-      default_name = ENV.fetch('SCHEMA_GROUP_NAME', '')
-      args.with_defaults(name: default_name)
-      GraphqlRails::DumpGraphqlSchema.call(name: args.name)
+    task(dump: :environment) do |_, args|
+      groups_from_args = args.extras
+      groups_from_env = ENV['SCHEMA_GROUP_NAME'].to_s.split(',').map(&:strip)
+      groups = groups_from_args + groups_from_env
+      dump_dir = ENV.fetch('GRAPHQL_SCHEMA_DUMP_DIR') { Rails.root.join('spec/fixtures').to_s }
+
+      GraphqlRails::DumpGraphqlSchemas.call(groups: groups, dump_dir: dump_dir)
     end
   end
 end

data/lib/graphql_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlRails
-  VERSION = '1.2.6'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -174,12 +174,14 @@ files:
 - lib/graphql_rails/attributes.rb
 - lib/graphql_rails/attributes/attributable.rb
 - lib/graphql_rails/attributes/attribute.rb
+- lib/graphql_rails/attributes/attribute_configurable.rb
 - lib/graphql_rails/attributes/attribute_name_parser.rb
 - lib/graphql_rails/attributes/input_attribute.rb
 - lib/graphql_rails/attributes/input_type_parser.rb
 - lib/graphql_rails/attributes/type_name_info.rb
 - lib/graphql_rails/attributes/type_parseable.rb
 - lib/graphql_rails/attributes/type_parser.rb
+- lib/graphql_rails/concerns/chainable_options.rb
 - lib/graphql_rails/concerns/service.rb
 - lib/graphql_rails/controller.rb
 - lib/graphql_rails/controller/action.rb
@@ -226,6 +228,7 @@ files:
 - lib/graphql_rails/router/schema_builder.rb
 - lib/graphql_rails/rspec_controller_helpers.rb
 - lib/graphql_rails/tasks/dump_graphql_schema.rb
+- lib/graphql_rails/tasks/dump_graphql_schemas.rb
 - lib/graphql_rails/tasks/schema.rake
 - lib/graphql_rails/version.rb
 homepage: https://github.com/samesystem/graphql_rails