graphql_rails 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f06459a3c8c16e40dffd181d7c08128558e2bdca598845b9e94f51852681e61
-  data.tar.gz: 1a4ddc9e11a4c5ef22240f7e36b3070bcf89b712c561cad12e41ede1dc18fbc3
+  metadata.gz: 9ef0115ce3d9107ee48ec4e7a725baff242ce81133be4a955d0a81619b106192
+  data.tar.gz: dcb027f23eb5f6cd71b3144e2794822ee899796a5e40f7b240ea3cd59ef586b9
 SHA512:
-  metadata.gz: 23e0d160c19e3c56c00a474cb77eff10c6a86c3ce1c63f3cdb87f4c374f3c10da79b5f2529a14a026f81e6f3b2c32e9b2fecd671bd7b38066e07d020c65fa93a
-  data.tar.gz: a0ade6d1ce611baf97ab0a631770273c98953b04eb3991e3234c12a12f21e893962b62a1785ba5da48de7193c366129d29732c7121fbe6c4404d5e1f05cedda2
+  metadata.gz: 8282983f1215feffb37e0541680abd91a44799a95d687cb3adb5cfcb91a1adbf8a07d585fffcd4e477579eebdd9f4a09f0efbc6dfb0b264b0a1a288aa0ac9688
+  data.tar.gz: f7cafd9924e8e26abc9a6e5783938ebedbea7a0dd68fc69a5980186affab6593f8af4a25c8205e20fbfb45534bec96aa4b5b36bc558084994200a73f8eca31d7

data/.github/workflows/ruby.yml

@@ -3,14 +3,15 @@ on: [push, pull_request]
 jobs:
   specs:
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
 
     runs-on: ubuntu-latest
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}

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.4.0](2023-27-25)
+
+* Added: `hidden_in_groups` for attributes to be able to skip attribute from certain groups
+* Added: `extras` for attributes to be able to include graphql-ruby extensions
+* Added: `lookahead` as a controller request object field
+* Changed: `subscription` definition to `event` definition in router configuration page
+* Fixed: avoid "Found two visible definitions for X" issues for input types
+
 ## [2.3.0](2022-11-25)
 
 * Added support for Ruby 3.1.2, keyword arguments for decorators support included

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    graphql_rails (2.3.0)
+    graphql_rails (2.4.0)
       activesupport (>= 4)
-      graphql (~> 1.12, >= 1.12.4)
+      graphql (= 2.0.21)
 
 GEM
   remote: https://rubygems.org/
@@ -74,17 +74,17 @@ GEM
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
     docile (1.4.0)
     erubi (1.10.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
-    graphql (1.13.17)
-    i18n (1.8.11)
+    graphql (2.0.21)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -92,8 +92,8 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     mongo (2.17.0)
       bson (>= 4.8.2, < 5.0.0)
     mongoid (7.3.3)
@@ -101,7 +101,7 @@ GEM
       mongo (>= 2.10.5, < 3.0.0)
       ruby2_keywords (~> 0.0.5)
     nio4r (2.5.8)
-    nokogiri (1.13.9)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.21.0)
@@ -113,8 +113,8 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.6.2)
+    rack (2.2.6.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.1.4.4)
@@ -135,8 +135,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (6.1.4.4)
       actionpack (= 6.1.4.4)
       activesupport (= 6.1.4.4)
@@ -193,13 +193,13 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.3)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/docs/README.md

@@ -92,7 +92,7 @@ class Graphql::UsersController < GraphqlApplicationController
 end
 ```
 
-See [Controller docs](components/controlle.md) for more info.
+See [Controller docs](components/controller.md) for more info.
 
 ## Testing your GraphqlRails::Controller in RSpec
 

data/docs/components/model.md

@@ -101,7 +101,7 @@ Check [graphql-ruby documentation](https://graphql-ruby.org) for more details ab
 
 ### attribute.property
 
-By default graphql attribute names are expected to be same as model methods/attributes, but if you want to use different name on grapqhl side, you can use `property` option:
+By default graphql attribute names are expected to be same as model methods/attributes, but if you want to use different name on graphql side, you can use `property` option:
 
 ```ruby
 class User
@@ -185,6 +185,24 @@ class User
 end
 ```
 
+### attribute.hidden_in_groups
+
+Opposite for Attribute#groups. It hides attribute in given groups
+
+```ruby
+class User
+  include GraphqlRails::Model
+
+  graphql do |c|
+    # visible in all schemas (default):
+    c.attribute(:email)
+
+    # visible in all schemas except "external":
+    c.attribute(:nickname).hidden_in_groups(:external)
+  end
+end
+```
+
 ### attribute.options
 
 Allows passing options to attribute definition. Available options:
@@ -200,6 +218,21 @@ class User
     c.attribute :first_name, options: { attribute_name_format: :original } # will be accessible as first_name from client side
   end
 end
+```
+
+### attribute.extras
+
+Allows passing extras to enable [graphql-ruby field extensions](https://graphql-ruby.org/type_definitions/field_extensions.html#using-extras)
+
+```ruby
+class User
+  include GraphqlRails::Model
+
+  graphql do |c|
+    c.attribute(:items).extras([:lookahead])
+  end
+end
+```
 
 ### attribute.permit
 
@@ -303,7 +336,7 @@ You can mark collection method as `paginated`. In this case method will return r
 class User
   include GraphqlRails::Model
 
-  graphql.attribute :items, type: '[Item]', paginatted: true
+  graphql.attribute :items, type: '[Item]', paginated: true
 
   def items
     Item.all
@@ -388,7 +421,7 @@ end
 
 ## name
 
-By default grapqhl type name will be same as model name, but you can change it via `name` method
+By default graphql type name will be same as model name, but you can change it via `name` method
 
 ```ruby
 class User
@@ -402,7 +435,7 @@ end
 
 ## description
 
-To improve grapqhl documentation, you can description for your graphql type:
+To improve graphql documentation, you can description for your graphql type:
 
 ```ruby
 class User
@@ -419,7 +452,7 @@ end
 Sometimes it's handy to get raw graphql type. To do so you can call:
 
 ```ruby
-YourModel.graphql.grapqhl_type
+YourModel.graphql.graphql_type
 ```
 
 ## input

data/docs/components/routes.md

@@ -21,10 +21,10 @@ MyGraphqlSchema = GraphqlRails::Router.draw do
 
   # you can use namespaced controllers too:
   scope module: 'admin' do
-    # `updateTranslations` route will be handeled by `Admin::TranslationsController`
+    # `updateTranslations` route will be handled by `Admin::TranslationsController`
     mutation :updateTranslations, to: 'translations#update'
 
-    # all :groups routes will be handeled by `Admin::GroupsController`
+    # all :groups routes will be handled by `Admin::GroupsController`
     resources :groups
   end
 end
@@ -40,9 +40,9 @@ If you want to exclude some actions you can use `only` or `except` options.
 
 ```ruby
 MyGraphqlSchema = GraphqlRails::Router.draw do
-  resouces :users
-  resouces :friends, only: :index
-  resouces :posts, except: [:destroy, :index]
+  resources :users
+  resources :friends, only: :index
+  resources :posts, except: [:destroy, :index]
 end
 ```
 
@@ -52,7 +52,7 @@ Sometimes it's handy so have non-CRUD actions in your controller. To define such
 
 ```ruby
 MyGraphqlSchema = GraphqlRails::Router.draw do
-  resouces :users do
+  resources :users do
     mutation :changePassword, on: :member
     query :active, on: :collection
   end
@@ -65,7 +65,7 @@ Sometimes, especially when working with member queries, it sounds better when ac
 
 ```ruby
 MyGraphqlSchema = GraphqlRails::Router.draw do
-  resouces :users do
+  resources :users do
     query :details, on: :member, suffix: true
   end
 end
@@ -73,15 +73,25 @@ end
 
 This will generate `userDetails` field on GraphQL side.
 
-## _query_ and _mutation_ & _subscription_
+## _query_ and _mutation_ & _event_
+
+In case you want to have non-CRUD controller with custom actions you can define your own `query`/`mutation` actions like this:
+
+```ruby
+MyGraphqlSchema = GraphqlRails::Router.draw do
+  mutation :logIn, to: 'sessions#login'
+  query :me, to: 'users#current_user'
+end
 
-in case you want to have non-CRUD controller with custom actions you can define your own `query`/`mutation`/`subscription` actions like this:
+Subscriptions are not really controller actions with a single response type, thus, they're defined differently. In GraphQL you subscribe to event, for example `userCreated`. To do this in graphql_rails you would define `event :user_created` in router definition.
 
 ```ruby
 MyGraphqlSchema = GraphqlRails::Router.draw do
   mutation :logIn, to: 'sessions#login'
   query :me, to: 'users#current_user'
-  subscribtion :new_message, to: 'messages#created'
+
+  event :user_created # expects Subscriptions::UserCreatedSubscription class to be present
+  event :user_deleted, subscription_class: 'Subscriptions::UserDeletedSubscription'
 end
 ```
 

data/graphql_rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'graphql', '~> 1.12', '>= 1.12.4'
+  spec.add_dependency 'graphql', '2.0.21'
   spec.add_dependency 'activesupport', '>= 4'
 
   spec.add_development_dependency 'bundler', '~> 2'

data/lib/generators/graphql_rails/templates/graphql_controller.erb

@@ -12,7 +12,7 @@ class GraphqlController < ApplicationController
 
   private
 
-  # data defined here will be accessible via `grapqhl_request.context`
+  # data defined here will be accessible via `graphql_request.context`
   # in GraphqlRails::Controller instances
   def graphql_context
     {}

data/lib/graphql_rails/attributes/attribute.rb

@@ -42,7 +42,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 +54,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

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

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,6 +31,7 @@ module GraphqlRails
           description: description,
           camelize: false,
           groups: groups,
+          hidden_in_groups: hidden_in_groups,
           **default_value_option,
           **deprecation_reason_params
         }
@@ -79,7 +80,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

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/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 Configuration
       class InvalidActionConfiguration < GraphqlRails::Error; end
 

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/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/find_or_build_graphql_input_type.rb

@@ -0,0 +1,28 @@
+# 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
+    end
+  end
+end

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -19,7 +19,7 @@ module GraphqlRails
       end
 
       def call
-        klass.tap { add_fields_to_graphql_type if new_class? || force_define_attributes }
+        klass.tap { add_attributes if new_class? || force_define_attributes }
       end
 
       private
@@ -28,20 +28,29 @@ module GraphqlRails
 
       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,
+          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 find_or_build_dynamic_type(attribute)

data/lib/graphql_rails/model/find_or_build_graphql_type_class.rb

@@ -9,11 +9,12 @@ module GraphqlRails
 
       include ::GraphqlRails::Service
 
-      def initialize(name:, type_name:, description: nil)
+      def initialize(name:, type_name:, parent_class:, description: nil)
         @name = name
         @type_name = type_name
         @description = description
         @new_class = false
+        @parent_class = parent_class
       end
 
       def klass
@@ -27,13 +28,13 @@ module GraphqlRails
       private
 
       attr_accessor :new_class
-      attr_reader :name, :type_name, :description
+      attr_reader :name, :type_name, :description, :parent_class
 
       def build_graphql_type_klass
         graphql_type_name = name
         graphql_type_description = description
 
-        graphql_type_klass = Class.new(GraphqlRails::Types::ObjectType) do
+        graphql_type_klass = Class.new(parent_class) do
           graphql_name(graphql_type_name)
           description(graphql_type_description)
         end

data/lib/graphql_rails/model/input.rb

@@ -6,7 +6,7 @@ module GraphqlRails
     class Input
       require 'graphql_rails/concerns/chainable_options'
       require 'graphql_rails/model/configurable'
-      require 'graphql_rails/model/build_graphql_input_type'
+      require 'graphql_rails/model/find_or_build_graphql_input_type'
 
       include Configurable
 
@@ -18,8 +18,8 @@ module GraphqlRails
       end
 
       def graphql_input_type
-        @graphql_input_type ||= BuildGraphqlInputType.call(
-          name: name, description: description, attributes: attributes
+        @graphql_input_type ||= FindOrBuildGraphqlInputType.call(
+          name: name, description: description, attributes: attributes, type_name: type_name
         )
       end
 

data/lib/graphql_rails/router/event_route.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative 'route'
+
+module GraphqlRails
+  class Router
+    # stores subscription type graphql action info
+    class EventRoute
+      attr_reader :name, :module_name, :subscription_class, :groups, :scope_names
+
+      def initialize(name, subscription_class: nil, groups: nil, scope_names: [], **options)
+        @name = name.to_s.camelize(:lower)
+        @module_name = options[:module].to_s
+        @groups = groups
+        @subscription_class = subscription_class
+        @scope_names = scope_names
+      end
+
+      def show_in_group?(group_name)
+        return true if groups.nil? || groups.empty?
+
+        groups.include?(group_name&.to_sym)
+      end
+
+      def field_options
+        { subscription: subscription }
+      end
+
+      def subscription
+        if subscription_class.present?
+          subscription_class.is_a?(String) ? Object.const_get(subscription_class) : subscription_class
+        else
+          klass_name = ['subscriptions/', name.underscore, 'subscription'].join('_').camelize
+
+          Object.const_get(klass_name)
+        end
+      end
+
+      def mutation?
+        false
+      end
+
+      def query?
+        false
+      end
+
+      def event?
+        true
+      end
+    end
+  end
+end

data/lib/graphql_rails/router/mutation_route.rb

@@ -14,7 +14,7 @@ module GraphqlRails
         true
       end
 
-      def subscription?
+      def event?
         false
       end
     end

data/lib/graphql_rails/router/query_route.rb

@@ -14,7 +14,7 @@ module GraphqlRails
         false
       end
 
-      def subscription?
+      def event?
         false
       end
     end

data/lib/graphql_rails/router/resource_routes_builder.rb

@@ -28,10 +28,6 @@ module GraphqlRails
         routes << build_mutation(*args, **kwargs)
       end
 
-      def subscription(*args, **kwargs)
-        routes << build_subscription(*args, **kwargs)
-      end
-
       private
 
       attr_reader :autogenerated_action_names, :name, :options
@@ -66,10 +62,6 @@ module GraphqlRails
         build_route(QueryRoute, *args, **kwargs)
       end
 
-      def build_subscription(*args, **kwargs)
-        build_route(SubscriptionRoute, *args, **kwargs)
-      end
-
       # rubocop:disable Metrics/ParameterLists
       def build_route(builder, action, prefix: action, suffix: false, on: :member, **custom_options)
         if suffix == true

data/lib/graphql_rails/router/route.rb

@@ -38,7 +38,7 @@ module GraphqlRails
         if function
           { function: function }
         else
-          { resolver: resolver }
+          { resolver: resolver, extras: [:lookahead] }
         end
       end
 

data/lib/graphql_rails/router/schema_builder.rb

@@ -7,12 +7,12 @@ module GraphqlRails
       require_relative './plain_cursor_encoder'
       require_relative './build_schema_action_type'
 
-      attr_reader :queries, :mutations, :subscriptions, :raw_actions
+      attr_reader :queries, :mutations, :events, :raw_actions
 
-      def initialize(queries:, mutations:, subscriptions:, raw_actions:, group: nil)
+      def initialize(queries:, mutations:, events:, raw_actions:, group: nil)
         @queries = queries
         @mutations = mutations
-        @subscriptions = subscriptions
+        @events = events
         @raw_actions = raw_actions
         @group = group
       end
@@ -20,26 +20,31 @@ module GraphqlRails
       def call
         query_type = build_group_type('Query', queries)
         mutation_type = build_group_type('Mutation', mutations)
-        subscription_type = build_group_type('Subscription', subscriptions)
-        raw = raw_actions
+        subscription_type = build_group_type('Subscription', events)
 
+        define_schema_class(query_type, mutation_type, subscription_type, raw_actions)
+      end
+
+      private
+
+      attr_reader :group
+
+      # rubocop:disable Metrics/MethodLength
+      def define_schema_class(query_type, mutation_type, subscription_type, raw)
         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]) }
+          raw.each { |action| send(action[:name], *action[:args], **action[:kwargs], &action[:block]) }
 
           query(query_type) if query_type
           mutation(mutation_type) if mutation_type
           subscription(subscription_type) if subscription_type
         end
       end
-
-      private
-
-      attr_reader :group
+      # rubocop:enable Metrics/MethodLength
 
       def build_group_type(type_name, routes)
         group_name = group

data/lib/graphql_rails/router.rb

@@ -5,7 +5,7 @@ require 'active_support/core_ext/string/inflections'
 require 'graphql_rails/router/schema_builder'
 require 'graphql_rails/router/mutation_route'
 require 'graphql_rails/router/query_route'
-require 'graphql_rails/router/subscription_route'
+require 'graphql_rails/router/event_route'
 require 'graphql_rails/router/resource_routes_builder'
 
 module GraphqlRails
@@ -63,13 +63,13 @@ module GraphqlRails
       routes << build_route(MutationRoute, name, **options)
     end
 
-    def subscription(name, **options)
-      routes << build_route(SubscriptionRoute, name, **options)
+    def event(name, **options)
+      routes << build_route(EventRoute, name, **options)
     end
 
     RAW_ACTION_NAMES.each do |action_name|
-      define_method(action_name) do |*args, &block|
-        add_raw_action(action_name, *args, &block)
+      define_method(action_name) do |*args, **kwargs, &block|
+        add_raw_action(action_name, *args, **kwargs, &block)
       end
     end
 
@@ -77,7 +77,7 @@ module GraphqlRails
       @graphql_schema[group&.to_sym] ||= SchemaBuilder.new(
         queries: routes.select(&:query?),
         mutations: routes.select(&:mutation?),
-        subscriptions: routes.select(&:subscription?),
+        events: routes.select(&:event?),
         raw_actions: raw_graphql_actions,
         group: group
       ).call
@@ -110,8 +110,8 @@ module GraphqlRails
       { module_name: module_name, group_names: group_names, scope_names: scope_names }
     end
 
-    def add_raw_action(name, *args, &block)
-      raw_graphql_actions << { name: name, args: args, block: block }
+    def add_raw_action(name, *args, **kwargs, &block)
+      raw_graphql_actions << { name: name, args: args, kwargs: kwargs, block: block }
     end
 
     def build_route(route_builder, name, **options)

data/lib/graphql_rails/rspec_controller_helpers.rb

@@ -95,7 +95,9 @@ module GraphqlRails
     # controller request object more suitable for testing
     class Request < GraphqlRails::Controller::Request
       def initialize(params, context)
-        super(nil, params, context)
+        inputs = params || {}
+        inputs = inputs.merge(lookahead: ::GraphQL::Execution::Lookahead::NullLookahead.new)
+        super(nil, inputs, context)
       end
     end
 

data/lib/graphql_rails/types/hidable_by_group.rb

@@ -6,10 +6,11 @@ module GraphqlRails
   module Types
     # Add visibility option based on groups
     module HidableByGroup
-      def initialize(*args, groups: [], **kwargs, &block)
+      def initialize(*args, groups: [], hidden_in_groups: [], **kwargs, &block)
         super(*args, **kwargs, &block)
 
-        @groups = groups.map(&:to_s)
+        @hidden_in_groups = hidden_in_groups.map(&:to_s)
+        @groups = groups.map(&:to_s) - @hidden_in_groups
       end
 
       def visible?(context)
@@ -22,10 +23,29 @@ module GraphqlRails
         @groups
       end
 
+      def hidden_in_groups
+        @hidden_in_groups
+      end
+
       def visible_in_context_group?(context)
+        group = context_graphql_group(context)
+
+        return true if no_visibility_configuration?(group)
+        return groups.include?(group) unless groups.empty?
+
+        !hidden_in_groups.include?(group)
+      end
+
+      def no_visibility_configuration?(group)
+        return true if group.nil?
+
+        groups.empty? && hidden_in_groups.empty?
+      end
+
+      def context_graphql_group(context)
         group = context[:graphql_group] || context['graphql_group']
 
-        group.nil? || groups.empty? || groups.include?(group.to_s)
+        group.nil? ? nil : group.to_s
       end
     end
   end

data/lib/graphql_rails/types/input_object_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'graphql_rails/types/argument_type'
+
+module GraphqlRails
+  module Types
+    # Base graphql type class for all GraphqlRails models
+    class InputObjectType < GraphQL::Schema::InputObject
+      argument_class(GraphqlRails::Types::ArgumentType)
+
+      def self.inspect
+        "#{GraphQL::Schema::InputObject}(#{graphql_name})"
+      end
+    end
+  end
+end

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.4
+        version: 2.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.4
+        version: 2.0.21
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -209,10 +203,10 @@ files:
 - lib/graphql_rails/model/build_connection_type.rb
 - lib/graphql_rails/model/build_connection_type/count_items.rb
 - lib/graphql_rails/model/build_enum_type.rb
-- lib/graphql_rails/model/build_graphql_input_type.rb
 - lib/graphql_rails/model/call_graphql_model_method.rb
 - lib/graphql_rails/model/configurable.rb
 - lib/graphql_rails/model/configuration.rb
+- lib/graphql_rails/model/find_or_build_graphql_input_type.rb
 - lib/graphql_rails/model/find_or_build_graphql_type.rb
 - lib/graphql_rails/model/find_or_build_graphql_type_class.rb
 - lib/graphql_rails/model/input.rb
@@ -220,13 +214,13 @@ files:
 - lib/graphql_rails/railtie.rb
 - lib/graphql_rails/router.rb
 - lib/graphql_rails/router/build_schema_action_type.rb
+- lib/graphql_rails/router/event_route.rb
 - lib/graphql_rails/router/mutation_route.rb
 - lib/graphql_rails/router/plain_cursor_encoder.rb
 - lib/graphql_rails/router/query_route.rb
 - lib/graphql_rails/router/resource_routes_builder.rb
 - lib/graphql_rails/router/route.rb
 - lib/graphql_rails/router/schema_builder.rb
-- lib/graphql_rails/router/subscription_route.rb
 - lib/graphql_rails/rspec_controller_helpers.rb
 - lib/graphql_rails/tasks/dump_graphql_schema.rb
 - lib/graphql_rails/tasks/dump_graphql_schemas.rb
@@ -234,6 +228,7 @@ files:
 - lib/graphql_rails/types/argument_type.rb
 - lib/graphql_rails/types/field_type.rb
 - lib/graphql_rails/types/hidable_by_group.rb
+- lib/graphql_rails/types/input_object_type.rb
 - lib/graphql_rails/types/object_type.rb
 - lib/graphql_rails/version.rb
 homepage: https://github.com/samesystem/graphql_rails

data/lib/graphql_rails/model/build_graphql_input_type.rb

@@ -1,43 +0,0 @@
-# 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
-      include ::GraphqlRails::Service
-
-      def initialize(name:, description: nil, attributes:)
-        @name = name
-        @attributes = attributes
-        @description = description
-      end
-
-      def call
-        type_name = name
-        type_description = description
-        type_attributes = attributes
-
-        Class.new(GraphQL::Schema::InputObject) do
-          argument_class(GraphqlRails::Types::ArgumentType)
-          graphql_name(type_name)
-          description(type_description)
-
-          type_attributes.each_value do |type_attribute|
-            argument(*type_attribute.input_argument_args, **type_attribute.input_argument_options)
-          end
-
-          def self.inspect
-            "#{GraphQL::Schema::InputObject}(#{graphql_name})"
-          end
-        end
-      end
-
-      private
-
-      attr_reader :model_configuration, :attributes, :name, :description
-    end
-  end
-end

data/lib/graphql_rails/router/subscription_route.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'route'
-
-module GraphqlRails
-  class Router
-    # stores subscription type graphql action info
-    class SubscriptionRoute < Route
-      def query?
-        false
-      end
-
-      def mutation?
-        false
-      end
-
-      def subscription?
-        true
-      end
-    end
-  end
-end