graphql_rails 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c75badc8873658f461e2bc0f6de0ca35f2c13c7ded2ed66b23b20ee91fc60e
-  data.tar.gz: 551a92383fad945d6fb8c03f190793431b485a8a98256a64e26f892c1e48fc2f
+  metadata.gz: f8680cd313b14bca588ff49b88021fbe2b2473b982ed58bbc7630aa8c47631ff
+  data.tar.gz: c8cc53c1e9b2ad49b494a2760c98743ce156a7c83597e1ddb261fe170851db41
 SHA512:
-  metadata.gz: 0e852e9c89ee080ca786abfaabea1162d8ed1eadb4086bf7d2f9908c454e56dc8c839ab05f6a3967859188f3c36f32eae1907b45e41476e24fb81f5fb5db8e29
-  data.tar.gz: 0d970a75c022b4635e6c925db92f8d7d22cc67b8e8e41ed8c961c98b2a8aa2c3b4726a29fc736af5151ea935c899b21d454e9af703e9beb6ea9fab378d5fecbf
+  metadata.gz: 59ea863201a837dca103a4dc3329e66ae2c7f6fb29e779bca46cebcc016e8c38f6daedc93ebfd10ac9cf344290f4932cb43e3ee94f0726513e7659ae48414fa2
+  data.tar.gz: 4239e644a647bc8e0af11d144804f684ec6cd7aa1312a467916cdb83e9ed799d53e468db4ca62f4a415c23b5dbbb570cb4a1ca3552e86ea133f66efb72838f13

data/.github/workflows/ruby.yml

@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ["3.1", "3.2", "3.3"]
 
     runs-on: ubuntu-latest
     env:

data/CHANGELOG.md

@@ -9,6 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
 
+## [3.1.1](2026-10-20)
+
+* Changed: do not throw "Cannot return null for non-nullable" error when errors are manually rendered
+* Added: allow to specify type error hooks in router
+* Added: `response.context` in RSpec controller helpers
+* Added: `dig` on the RSpec controller helpers test context, as on `GraphQL::Query::Context`
+
+## [3.1.0](2025-05-26)
+
+* Added: Allow passing custom decorator build strategy
+* Added: Tracer support to router
+* Fixed: Better handle render in controller hooks
+* Fixed: Reduce memory allocations when defining attributes
+* Updated: GraphQL and gems version dependencies
+* Updated: Bump rexml from 3.2.8 to 3.3.9
+
 ## [3.0.0](2024-05-31)
 
 * Added: `input.attribute.property` method which allows aliasing input parameter keys

data/Gemfile.lock

@@ -1,167 +1,188 @@
 PATH
   remote: .
   specs:
-    graphql_rails (3.0.0)
+    graphql_rails (3.1.1)
       activesupport (>= 4)
-      graphql (= 2.1.7)
+      graphql (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actioncable (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailbox (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailer (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.1)
-      actionview (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionpack (6.1.7.10)
+      actionview (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actiontext (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionview (6.1.7.10)
+      activesupport (= 6.1.7.10)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activejob (6.1.7.10)
+      activesupport (= 6.1.7.10)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.1)
-      activesupport (= 6.1.7.1)
-    activerecord (6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
-    activestorage (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activemodel (6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activerecord (6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
+    activestorage (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.2)
-    bson (4.14.0)
-    builder (3.2.4)
+    ast (2.4.3)
+    base64 (0.2.0)
+    bson (5.0.2)
+    builder (3.3.0)
     byebug (11.1.3)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.5)
     crass (1.0.6)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    erubi (1.10.0)
-    globalid (1.0.1)
-      activesupport (>= 5.0)
-    graphql (2.1.7)
-      racc (~> 1.4)
-    i18n (1.14.5)
+    date (3.4.1)
+    diff-lcs (1.6.1)
+    docile (1.4.1)
+    erubi (1.13.1)
+    fiber-storage (1.0.1)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    graphql (2.5.11)
+      base64
+      fiber-storage
+      logger
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    loofah (2.19.1)
+    logger (1.7.0)
+    loofah (2.24.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.6)
-    minitest (5.23.1)
-    mongo (2.17.0)
-      bson (>= 4.8.2, < 5.0.0)
-    mongoid (7.3.3)
-      activemodel (>= 5.1, < 6.2)
-      mongo (>= 2.10.5, < 3.0.0)
-      ruby2_keywords (~> 0.0.5)
-    nio4r (2.5.8)
-    nokogiri (1.16.5)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    mongo (2.21.0)
+      bson (>= 4.14.1, < 6.0.0)
+    mongoid (9.0.6)
+      activemodel (>= 5.1, < 8.1, != 7.0.0)
+      concurrent-ruby (>= 1.0.5, < 2.0)
+      mongo (>= 2.18.0, < 3.0.0)
+    net-imap (0.5.7)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.26.3)
+    parser (3.3.7.3)
       ast (~> 2.4.1)
-    pry (0.13.1)
+      racc
+    prism (1.4.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    racc (1.8.0)
-    rack (2.2.9)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.7.1)
-      actioncable (= 6.1.7.1)
-      actionmailbox (= 6.1.7.1)
-      actionmailer (= 6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actiontext (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+      pry (>= 0.13, < 0.15)
+    racc (1.8.1)
+    rack (2.2.20)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rails (6.1.7.10)
+      actioncable (= 6.1.7.10)
+      actionmailbox (= 6.1.7.10)
+      actionmailer (= 6.1.7.10)
+      actionpack (= 6.1.7.10)
+      actiontext (= 6.1.7.10)
+      actionview (= 6.1.7.10)
+      activejob (= 6.1.7.10)
+      activemodel (= 6.1.7.10)
+      activerecord (= 6.1.7.10)
+      activestorage (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.1)
+      railties (= 6.1.7.10)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (6.1.7.10)
+      actionpack (= 6.1.7.10)
+      activesupport (= 6.1.7.10)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.2.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     rubocop (1.5.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -171,38 +192,39 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-performance (1.10.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
+    ruby-progressbar (1.13.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sprockets (4.0.2)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    strscan (3.1.0)
-    thor (1.2.1)
+    thor (1.3.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby

data/docs/components/decorator.md

@@ -25,7 +25,7 @@ class CommentDecorator < SimpleDelegator
 end
 ```
 
-In order to decorate object with exra arguments, simply pass them to `.decorate` method. Like this:
+In order to decorate object with extra arguments, simply pass them to `.decorate` method. Like this:
 
 ```ruby
 CommentDecorator.decorate(comment, current_user)
@@ -67,3 +67,33 @@ class UsersController < GraphqlRails::Controller
   end
 end
 ```
+
+## Decorating with custom method
+
+Sometimes building decorator instance is not that straight-forward and you need to use custom build strategy. In such cases you can pass `build_with: :DESIRED_CLASS_METHOD` option:
+
+```ruby
+class UserDecorator < SimpleDelegator
+  include GraphqlRails::Model
+  include GraphqlRails::Decorator
+  # ...
+
+  def self.custom_build(user)
+    user.admin? ? new(user, admin: true) : new(user)
+  end
+
+  def initialize(user, admin: false)
+    @user = user
+    @admin = admin
+  end
+end
+
+class UsersController < GraphqlRails::Controller
+  action(:index).paginated.returns('[UserDecorator!]!')
+
+  def index
+    users = User.where(active: true)
+    UserDecorator.decorate(user, build_with: :custom_build)
+  end
+end
+```

data/docs/components/routes.md

@@ -174,3 +174,29 @@ end
 ```
 
 If you want to access raw graphql schema, you can call `GraphqlRouter.graphql_schema(:mobile)`
+
+## _before_type_error_
+
+Sometimes it's handy to log or perform other actions when a GraphQL type error occurs. To do so, specify the Router.before_type_error hook:
+
+```ruby
+GraphqlRails::Router.draw do
+  before_type_error do |type_error, context|
+    MyCustomExceptionLogger.call(type_error)
+  end
+end
+```
+
+Note: This might log `GraphQL::InvalidNullError` errors that are not visible to the end user. If you do not want that, use Router.after_type_error.
+
+## _after_type_error_
+
+Sometimes it's handy to perform logging or other actions after a GraphQL type error occurs. To do so, specify the Router.after_type_error hook:
+
+```ruby
+GraphqlRails::Router.draw do
+  after_type_error do |type_error, context|
+    MyCustomExceptionLogger.call(type_error)
+  end
+end
+```

data/docs/testing/testing.md

@@ -22,7 +22,7 @@ There are 3 helper methods:
 
 * `mutation(:your_controller_action_name, params: {}, context: {})`. `params` and `context` are optional
 * `query(:your_controller_action_name, params: {}, context: {})`. `params` and `context` are optional
-* `response`. Response is set only after you call `mutation` or `query`
+* `response`. Response is set only after you call `mutation` or `query`. It exposes, among others, `result`, `errors`, `success?`, `controller`, `action_name` and `context`: the hash-like test context the action ran with (it supports `[]`, `fetch`, `key?`, `dig` and `to_h`), not a `GraphQL::Query::Context`
 
 ### Test examples
 

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', '2.1.7'
+  spec.add_dependency 'graphql', '~> 2'
   spec.add_dependency 'activesupport', '>= 4'
 
   spec.add_development_dependency 'bundler', '~> 2'

data/lib/graphql_rails/concerns/service.rb

@@ -8,11 +8,7 @@ module GraphqlRails
 
     class_methods do
       def call(*args, **kwargs, &block)
-        if kwargs.present?
-          new(*args, **kwargs).call(&block)
-        else
-          new(*args).call(&block)
-        end
+        new(*args, **kwargs).call(&block)
       end
     end
   end

data/lib/graphql_rails/controller/action_hooks_runner.rb

@@ -4,9 +4,10 @@ module GraphqlRails
   class Controller
     # runs {before/around/after}_action controller hooks
     class ActionHooksRunner
-      def initialize(action_name:, controller:)
+      def initialize(action_name:, controller:, graphql_request:)
         @action_name = action_name
         @controller = controller
+        @graphql_request = graphql_request
       end
 
       def call(&block)
@@ -19,7 +20,7 @@ module GraphqlRails
 
       private
 
-      attr_reader :action_name, :controller
+      attr_reader :action_name, :controller, :graphql_request
 
       def all_around_hooks
         controller_configuration.action_hooks_for(:around, action_name)
@@ -30,6 +31,8 @@ module GraphqlRails
       end
 
       def run_around_action_hooks(around_hooks = all_around_hooks, &block)
+        return if graphql_request.errors.any?
+
         pending_around_hooks = around_hooks.clone
         action_hook = pending_around_hooks.shift
 
@@ -41,6 +44,8 @@ module GraphqlRails
       end
 
       def execute_hook(action_hook, &block)
+        return if graphql_request.errors.any?
+
         if action_hook.anonymous?
           controller.instance_exec(controller, *block, &action_hook.action_proc)
         else

data/lib/graphql_rails/controller/handle_controller_error.rb

@@ -4,6 +4,10 @@ module GraphqlRails
   class Controller
     # runs {before/around/after}_action controller hooks
     class HandleControllerError
+      def self.call(error:, controller:)
+        new(error: error, controller: controller).call
+      end
+
       def initialize(error:, controller:)
         @error = error
         @controller = controller
@@ -20,11 +24,15 @@ module GraphqlRails
       attr_reader :error, :controller
 
       def render_unhandled_error(error)
-        return render(error: error) if error.is_a?(GraphQL::ExecutionError)
+        return handle_graphql_execution_error(error) if error.is_a?(GraphQL::ExecutionError)
 
         render(error: SystemError.new(error))
       end
 
+      def handle_graphql_execution_error(error)
+        raise error
+      end
+
       def custom_handle_error
         return unless custom_handler
 

data/lib/graphql_rails/controller/request.rb

@@ -14,6 +14,7 @@ module GraphqlRails
         @inputs = inputs.except(:lookahead)
         @lookahead = inputs[:lookahead]
         @context = context
+        @errors = []
       end
 
       def errors=(new_errors)

data/lib/graphql_rails/controller.rb

@@ -13,6 +13,8 @@ module GraphqlRails
   # base class for all graphql_rails controllers
   class Controller
     class << self
+      attr_accessor :error_handler
+
       def inherited(subclass)
         super
         new_config = controller_configuration.dup_with(controller: subclass)
@@ -79,6 +81,7 @@ module GraphqlRails
       object = errors.empty? ? object_or_errors : nil
 
       graphql_request.errors = errors
+      graphql_request.context[:rendered_errors] = true unless errors.empty?
       graphql_request.object_to_return = object
     end
 
@@ -89,12 +92,13 @@ module GraphqlRails
     private
 
     def call_with_rendering
-      hooks_runner = ActionHooksRunner.new(action_name: action_name, controller: self)
+      hooks_runner = ActionHooksRunner.new(action_name: action_name, controller: self, graphql_request: graphql_request)
       response = hooks_runner.call { public_send(action_name) }
 
       render response if graphql_request.no_object_to_return?
     rescue StandardError => e
-      HandleControllerError.new(error: e, controller: self).call
+      error_handler = self.class.error_handler || HandleControllerError
+      error_handler.call(error: e, controller: self)
     end
 
     def graphql_errors_from_render_params(rendering_params)

data/lib/graphql_rails/decorator/relation_decorator.rb

@@ -12,11 +12,12 @@ module GraphqlRails
           defined?(Mongoid) && object.is_a?(Mongoid::Criteria)
       end
 
-      def initialize(decorator:, relation:, decorator_args: [], decorator_kwargs: {})
+      def initialize(decorator:, relation:, decorator_args: [], decorator_kwargs: {}, build_with: :new)
         @relation = relation
         @decorator = decorator
         @decorator_args = decorator_args
         @decorator_kwargs = decorator_kwargs
+        @build_with = build_with
       end
 
       %i[where limit order group offset from select having all unscope].each do |method_name|
@@ -38,12 +39,12 @@ module GraphqlRails
       end
 
       def to_a
-        @to_a ||= relation.to_a.map { |it| decorator.new(it, *decorator_args, **decorator_kwargs) }
+        @to_a ||= relation.to_a.map { |it| build_decorator(it, *decorator_args, **decorator_kwargs) }
       end
 
       private
 
-      attr_reader :relation, :decorator, :decorator_args, :decorator_kwargs
+      attr_reader :relation, :decorator, :decorator_args, :decorator_kwargs, :build_with
 
       def decoratable_object_method(method_name, *args, **kwargs, &block)
         object = relation.public_send(method_name, *args, **kwargs, &block)
@@ -54,12 +55,16 @@ module GraphqlRails
         return object_or_list if object_or_list.blank?
 
         if object_or_list.is_a?(Array)
-          object_or_list.map { |it| decorator.new(it, *decorator_args, **decorator_kwargs) }
+          object_or_list.map { |it| build_decorator(it, *decorator_args, **decorator_kwargs) }
         else
-          decorator.new(object_or_list, *decorator_args, **decorator_kwargs)
+          build_decorator(object_or_list, *decorator_args, **decorator_kwargs)
         end
       end
 
+      def build_decorator(*args, **kwargs, &block)
+        decorator.public_send(build_with, *args, **kwargs, &block)
+      end
+
       def decoratable_block_method(method_name, *args, **kwargs)
         relation.public_send(method_name, *args, **kwargs) do |object, *other_args|
           decorated_object = decorate(object)
@@ -71,7 +76,8 @@ module GraphqlRails
         new_relation = relation.public_send(method_name, *args, **kwargs, &block)
         self.class.new(
           decorator: decorator, relation: new_relation,
-          decorator_args: decorator_args, decorator_kwargs: decorator_kwargs
+          decorator_args: decorator_args, decorator_kwargs: decorator_kwargs,
+          build_with: build_with
         )
       end
     end

data/lib/graphql_rails/decorator.rb

@@ -25,23 +25,27 @@ module GraphqlRails
     extend ActiveSupport::Concern
 
     class_methods do
-      def decorate(object, *args, **kwargs)
+      def decorate(object, *args, build_with: :new, **kwargs)
         if Decorator::RelationDecorator.decorates?(object)
-          decorate_with_relation_decorator(object, args, kwargs)
+          decorate_with_relation_decorator(object, args, kwargs, build_with: build_with)
         elsif object.nil?
           nil
         elsif object.is_a?(Array)
-          object.map { |item| new(item, *args, **kwargs) }
+          object.map { |item| public_send(build_with, item, *args, **kwargs) }
         else
-          new(object, *args, **kwargs)
+          public_send(build_with, object, *args, **kwargs)
         end
       end
 
       private
 
-      def decorate_with_relation_decorator(object, args, kwargs)
+      def decorate_with_relation_decorator(object, args, kwargs, build_with:)
         Decorator::RelationDecorator.new(
-          relation: object, decorator: self, decorator_args: args, decorator_kwargs: kwargs
+          relation: object,
+          decorator: self,
+          decorator_args: args,
+          decorator_kwargs: kwargs,
+          build_with: build_with
         )
       end
     end

data/lib/graphql_rails/model/add_fields_to_graphql_type.rb

@@ -6,6 +6,7 @@ module GraphqlRails
     class AddFieldsToGraphqlType
       require 'graphql_rails/concerns/service'
       require 'graphql_rails/model/call_graphql_model_method'
+      require 'graphql_rails/model/direct_field_resolver'
 
       include ::GraphqlRails::Service
 
@@ -31,7 +32,7 @@ module GraphqlRails
           end
 
           define_method(attribute.field_name) do |**kwargs|
-            CallGraphqlModelMethod.call(
+            DirectFieldResolver.call(
               model: object,
               attribute_config: attribute,
               method_keyword_arguments: kwargs,

data/lib/graphql_rails/model/call_graphql_model_method.rb

@@ -10,14 +10,24 @@ module GraphqlRails
 
       PAGINATION_KEYS = %i[before after first last].freeze
 
-      def initialize(model:, method_keyword_arguments:, graphql_context:, attribute_config:)
+      @instance_cache = {}
+
+      class << self
+        attr_reader :instance_cache
+
+        def call(*_args, **kwargs)
+          cache_key = kwargs[:attribute_config].object_id
+          @instance_cache[cache_key] ||= new
+          @instance_cache[cache_key].call_with_args(**kwargs)
+        end
+      end
+
+      def call_with_args(model:, method_keyword_arguments:, graphql_context:, attribute_config:)
         @model = model
         @method_keyword_arguments = method_keyword_arguments
         @graphql_context = graphql_context
         @attribute_config = attribute_config
-      end
 
-      def call
         with_graphql_context do
           run_method
         end
@@ -59,7 +69,9 @@ module GraphqlRails
       def custom_keyword_arguments
         return method_keyword_arguments unless paginated?
 
-        method_keyword_arguments.except(*PAGINATION_KEYS)
+        method_keyword_arguments.each_with_object({}) do |(key, value), result|
+          result[key] = value unless PAGINATION_KEYS.include?(key)
+        end
       end
 
       def with_graphql_context

data/lib/graphql_rails/model/direct_field_resolver.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # Takes shortcuts for simple cases to minimize allocations
+    class DirectFieldResolver
+      class << self
+        def call(model:, attribute_config:, method_keyword_arguments:, graphql_context:)
+          property = attribute_config.property
+
+          if method_keyword_arguments.empty? && !attribute_config.paginated?
+            return simple_resolver(model: model, graphql_context: graphql_context, property: property)
+          end
+
+          CallGraphqlModelMethod.call(
+            model: model,
+            attribute_config: attribute_config,
+            method_keyword_arguments: method_keyword_arguments,
+            graphql_context: graphql_context
+          )
+        end
+
+        def simple_resolver(model:, graphql_context:, property:)
+          return model.send(property) unless model.respond_to?(:with_graphql_context)
+
+          model.with_graphql_context(graphql_context) { model.send(property) }
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/router/schema.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'graphql/pagination/active_record_relation_connection'
+require 'graphql_rails/decorator/relation_decorator'
+require 'graphql_rails/router/plain_cursor_encoder'
+
+module GraphqlRails
+  class Router
+    # Builds GraphQL::Schema based on previously defined GraphQL data.
+    # Also handles type error hooks (before_type_error, after_type_error)
+    # and implements logic for skipping null errors.
+    class Schema < ::GraphQL::Schema
+      use GraphQL::Schema::Visibility
+
+      connections.add(
+        GraphqlRails::Decorator::RelationDecorator,
+        GraphQL::Pagination::ActiveRecordRelationConnection
+      )
+
+      cursor_encoder(Router::PlainCursorEncoder)
+
+      def self.before_type_error(&block)
+        @before_type_error = block if block_given?
+        @before_type_error
+      end
+
+      def self.after_type_error(&block)
+        @after_type_error = block if block_given?
+        @after_type_error
+      end
+
+      def self.type_error(type_error, context)
+        before_type_error&.call(type_error, context)
+
+        return nil if type_error.is_a?(GraphQL::InvalidNullError) && context[:rendered_errors]
+
+        super.tap do
+          after_type_error&.call(type_error, context)
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/router/schema_builder.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'graphql_rails/router/schema'
+
 module GraphqlRails
   class Router
     # builds GraphQL::Schema based on previously defined grahiti data
@@ -31,12 +33,7 @@ module GraphqlRails
 
       # 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)
+        Class.new(GraphqlRails::Router::Schema) do
           raw.each { |action| send(action[:name], *action[:args], **action[:kwargs], &action[:block]) }
 
           query(query_type) if query_type

data/lib/graphql_rails/router.rb

@@ -12,7 +12,8 @@ module GraphqlRails
   # graphql router that mimics Rails.application.routes
   class Router
     RAW_ACTION_NAMES = %i[
-      use rescue_from query_analyzer instrument cursor_encoder default_max_page_size
+      use rescue_from query_analyzer instrument cursor_encoder default_max_page_size tracer trace_with
+      before_type_error after_type_error
     ].freeze
 
     def self.draw(&block)

data/lib/graphql_rails/rspec_controller_helpers.rb

@@ -54,6 +54,10 @@ module GraphqlRails
         request.action_name
       end
 
+      def context
+        request.context
+      end
+
       private
 
       attr_reader :request
@@ -65,7 +69,7 @@ module GraphqlRails
 
       attr_reader :schema
 
-      def_delegators :@provided_values, :[], :[]=, :to_h, :key?, :fetch
+      def_delegators :@provided_values, :[], :[]=, :to_h, :key?, :fetch, :dig
 
       def initialize(values:, schema:)
         @errors = []
@@ -78,6 +82,15 @@ module GraphqlRails
       end
     end
 
+    # Custom error handler to avoid raising errors in controller tests
+    class TestControllerErrorHandler < GraphqlRails::Controller::HandleControllerError
+      private
+
+      def handle_graphql_execution_error(error)
+        render(error: error)
+      end
+    end
+
     class SingleControllerSchemaBuilder
       attr_reader :controller
 
@@ -117,7 +130,11 @@ module GraphqlRails
       schema_builder = SingleControllerSchemaBuilder.new(described_class)
       context_object = FakeContext.new(values: context, schema: schema_builder.call)
       request = Request.new(params, context_object, controller: described_class, action_name: query_name)
+      original_error_handler = described_class.error_handler
+
+      described_class.error_handler = TestControllerErrorHandler
       described_class.new(request).call(query_name)
+      described_class.error_handler = original_error_handler
 
       @response = Response.new(request)
       @response

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Povilas Jurčys
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2026-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
-description: 
+description:
 email:
 - po.jurcys@gmail.com
 executables: []
@@ -207,6 +207,7 @@ files:
 - 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/direct_field_resolver.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
@@ -221,6 +222,7 @@ files:
 - 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.rb
 - lib/graphql_rails/router/schema_builder.rb
 - lib/graphql_rails/rspec_controller_helpers.rb
 - lib/graphql_rails/tasks/dump_graphql_schema.rb
@@ -236,7 +238,7 @@ homepage: https://github.com/samesystem/graphql_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Rails style structure for GraphQL API.
 test_files: []