rails-graphql 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad5286d59309dafbc0ec0185c4b5c154bbccb7db15cfdb7831b78125212318c
-  data.tar.gz: 797b52a24b9f9a38167846cc08bc0e50a8728b5bc85041df5d2b81d6208f22f4
+  metadata.gz: d18315ad503f122d67555202db0417507d7b5d72ecf5c060396bf7974b7cf826
+  data.tar.gz: 3688696c6d83cd9aebe2be3024906292bbdd291f3fb4b272bb5b1841714ba10e
 SHA512:
-  metadata.gz: de92336e813d1b4e12b4399475c6ae7d7bb7eec21a59d33a8f8a7701f82a657575df19113d239e502a2ea642dce90c664433d2f7020367d4c735129eac41ab61
-  data.tar.gz: 8739f94bf779f65df7db592641c31aad9493d6ed57ac104391341271af127a90c280de366857822fa73a1025b22bd6ddc8c98b2280baaa1e7832b86f622a93cc
+  metadata.gz: 79d8b337fd5ef5caaf93a6bc8dfc4a21cc6f7f5f5633ab1b9e4076bef0c90c163792283fd2b0cd02063c3111bf2a569e4909130e04e419455a8f9c3d80dc744d
+  data.tar.gz: 58d5dbe146a65ed87987b05d5e00ba14bb3a22ded1ba300f27bb08ef2f36783bcabfe42f9c2550187f01d286341387ac17acec51d79ee00fccfc7a34783d5c5e

data/lib/rails/graphql/config.rb

@@ -2,6 +2,8 @@
 
 module Rails
   module GraphQL
+    AR710 = (ActiveRecord.gem_version >= Gem::Version.new('7.1.0'))
+
     configure do |config|
       # This helps to keep track of when things were cached and registered. Cached
       # objects with mismatching versions need to be upgraded or simply reloaded.

data/lib/rails/graphql/field/output_field.rb

@@ -41,6 +41,10 @@ module Rails
           super || field.has_argument?(name)
         end
 
+        def has_arguments?
+          super || field.has_arguments?
+        end
+
         def arguments?
           super || field.arguments?
         end

data/lib/rails/graphql/helpers/attribute_delegator.rb

@@ -5,13 +5,20 @@ module Rails
     module Helpers
       # This is an extra magic on top of the delegator class from the standard
       # lib that allows fetching a specific property of the delegated object
-      class AttributeDelegator < ActiveSupport::ProxyObject
+      class AttributeDelegator < ::BasicObject
+        undef_method :==
+        undef_method :equal?
+
         def initialize(obj = nil, attribute = nil, cache: true, &block)
           @delegate_sd_attr = attribute
           @delegate_sd_obj = block.presence || obj
           @delegate_cache = cache
         end
 
+        def raise(*args)
+          ::Object.send(:raise, *args)
+        end
+
         private
 
           def respond_to_missing?(method_name, include_private = false)

data/lib/rails/graphql/helpers/with_arguments.rb

@@ -100,6 +100,11 @@ module Rails
           defined?(@arguments) && @arguments.key?(name)
         end
 
+        # Check if any argument has been defined at all
+        def has_arguments?
+          defined?(@arguments) && !@arguments.empty?
+        end
+
         # Validate all the arguments to make sure the definition is valid
         def validate!(*)
           super if defined? super

data/lib/rails/graphql/railties/log_subscriber.rb

@@ -98,7 +98,8 @@ module Rails
           parts = ['  GraphQL', suffix.presence, event.payload[:name]]
           parts << "(#{duration}ms)" unless duration.zero?
 
-          color(parts.compact.join(' '), MAGENTA, true)
+          style = AR710 ? { bold: true } : true
+          color(parts.compact.join(' '), MAGENTA, style)
         end
 
         def debug_variables(vars)

data/lib/rails/graphql/request/backtrace.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/parameter_filter'
+
 module Rails
   module GraphQL
     class Request
@@ -130,7 +132,8 @@ module Rails
             return '{}' if value.blank?
 
             request.cache(:backtrace_arguments_filter) do
-              ActiveSupport::ParameterFilter.new(GraphQL.config.filter_parameters)
+              filters = GraphQL.config.filter_parameters || EMPTY_ARRAY
+              ActiveSupport::ParameterFilter.new(filters)
             end.filter(value)
           end
 

data/lib/rails/graphql/request/component/field.rb

@@ -16,7 +16,7 @@ module Rails
         delegate :decorate, to: :type_klass
         delegate :operation, :variables, :request, to: :parent
         delegate :method_name, :resolver, :performer, :type_klass, :leaf_type?,
-          :dynamic_resolver?, :mutation?, to: :field
+          :dynamic_resolver?, :has_arguments?, :mutation?, to: :field
 
         attr_reader :name, :alias_name, :parent, :field, :arguments, :current_object
 

data/lib/rails/graphql/request/steps/organizable.rb

@@ -118,9 +118,9 @@ module Rails
           # Helper parser for arguments that also collect necessary variables
           # Default values forces this method to run even without nodes
           def parse_arguments(nodes)
-            return @arguments = EMPTY_HASH if nodes.blank?
+            return @arguments = EMPTY_HASH if nodes.blank? && !self.has_arguments?
 
-            args = nodes.each.with_object({}) do |(name, value, var_name), hash|
+            args = nodes&.each_with_object({}) do |(name, value, var_name), hash|
               hash[name.to_s] = var_name.nil? ? value : var_name
             end
 

data/lib/rails/graphql/request/strategy.rb

@@ -131,8 +131,9 @@ module Rails
           return unless args.size.zero?
 
           if field.try(:dynamic_resolver?)
-            prepared = prepared_data_for(field)
-            args << Event.trigger(:resolve, field, self, prepared_data: prepared, &field.resolver)
+            extra = prepared_data_for(field, with_null: true)
+            extra = extra === PreparedData::NULL ? EMPTY_HASH : { prepared: extra }
+            args << Event.trigger(:resolve, field, self, **extra, &field.resolver)
           elsif field.prepared_data?
             args << prepared_data_for(field)
           else
@@ -206,11 +207,14 @@ module Rails
 
         # Get the prepared data for the given +field+, getting ready for
         # resolve, while ensuring to check prepared data on request
-        def prepared_data_for(field)
-          return @data_pool[field] unless field.prepared_data?
-
-          prepared = request.prepared_data_for(field).next
-          prepared unless prepared === PreparedData::NULL
+        def prepared_data_for(field, with_null: false)
+          if field.prepared_data?
+            request.prepared_data_for(field).next
+          elsif @data_pool.key?(field)
+            @data_pool[field]
+          elsif with_null
+            PreparedData::NULL
+          end
         end
 
         # Simply run the organize step for compilation

data/lib/rails/graphql/source/active_record_source.rb

@@ -256,6 +256,12 @@ module Rails
       # Once the records are pre-loaded due to +preload_association+, use the
       # parent value and the preloader result to get the records
       def parent_owned_records(collection_result = false)
+        # The absence of the prepared data key means we got to a point that we
+        # don't know the result of the association, so we simply call it
+        unless event.data.key?(:prepared_data)
+          return current_value.public_send(field.method_name)
+        end
+
         data = event.data[:prepared_data]
         return collection_result ? [] : nil unless data
 

data/lib/rails/graphql/source/base.rb

@@ -41,7 +41,9 @@ module Rails
           # to the +::GraphQL+ namespace with the addition of any namespace of
           # the current class
           def object
-            @object ||= create_type(superclass: object_class, gql_name: object_name)
+            @object ||= create_type(superclass: object_class, gql_name: object_name).tap do |t|
+              t.include(const_get(:ObjectMethods)) if const_defined?(:ObjectMethods, false)
+            end
           end
 
           # Return the GraphQL input type associated with the source. It will
@@ -49,7 +51,9 @@ module Rails
           # to the +::GraphQL+ namespace with the addition of any namespace of
           # the current class
           def input
-            @input ||= create_type(superclass: input_class, gql_name: input_name)
+            @input ||= create_type(superclass: input_class, gql_name: input_name).tap do |t|
+              t.include(const_get(:InputMethods)) if const_defined?(:InputMethods, false)
+            end
           end
 
           protected
@@ -77,6 +81,30 @@ module Rails
               GraphQL::Type.create!(self, name, superclass, **xargs, &block)
             end
 
+            # Allow setting methods on the source object via a proper module
+            def object_methods(&block)
+              type_extend_with_module(:object, &block)
+            end
+
+            # Allow setting methods on the source input via a proper module
+            def input_methods(&block)
+              type_extend_with_module(:input, &block)
+            end
+
+          private
+
+            # Allows adding methods to a type by properly providing a module
+            # and adding it to the type
+            def type_extend_with_module(type, &block)
+              mod_name = :"#{type.to_s.classify}Methods"
+              mod = const_get(mod_name) if const_defined?(mod_name, false)
+              mod ||= const_set(mod_name, Module.new).tap do |m|
+                instance_variable_get("@#{type}")&.include(m)
+              end
+
+              mod.module_eval(&block)
+            end
+
         end
       end
     end

data/lib/rails/graphql/uri.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri/generic'
+
 module URI
   # URI::GLQ encodes objects from a GraphQL server as an URI.
   # It has the components:

data/lib/rails/graphql/version.rb

@@ -14,7 +14,7 @@ module Rails
     module VERSION
       MAJOR = 1
       MINOR = 0
-      TINY  = 3
+      TINY  = 6
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/rails/graphql.rb

@@ -2,6 +2,7 @@
 
 require 'i18n'
 require 'zlib'
+require 'ostruct'
 require 'active_model'
 require 'active_support'
 

data/test/assets/sqlite.gql

@@ -171,6 +171,8 @@ input LiteFactionInput {
   
   basesAttributes: [LiteBaseInput!]
   
+  greeting: String
+  
   name: String
   
   shipsAttributes: [LiteShipInput!]
@@ -206,6 +208,8 @@ type LiteFaction {
   
   bases: [LiteBase!]!
   
+  greeting: String
+  
   name: String
   
   ships: [LiteShip!]!
@@ -222,6 +226,10 @@ type LiteShip {
   name: String
 }
 
+type Sample {
+  faction: LiteFaction!
+}
+
 type _Mutation {
   createLiteBase(liteBase: LiteBaseInput!): LiteBase!
   
@@ -258,6 +266,8 @@ type _Query {
   liteShip(id: ID!): LiteShip!
   
   liteShips: [LiteShip!]!
+  
+  sample: Sample!
 }
 
 """

data/test/config.rb

@@ -13,6 +13,7 @@ SimpleCov.start do
   add_group 'Source', ['/graphql/adapters', '/graphql/source']
 end
 
+require 'logger'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'active_record'

data/test/graphql/source_test.rb

@@ -129,6 +129,9 @@ class GraphQL_SourceTest < GraphQL::TestCase
   end
 
   def test_disable
+    # class_attribute changed and the stub does not work as expected
+    return skip if rails8?
+
     described_class.stub(:hook_names, Set[:start]) do
       assert_includes(described_class.hook_names, :start)
       described_class.send(:disable, 'starts')
@@ -137,6 +140,9 @@ class GraphQL_SourceTest < GraphQL::TestCase
   end
 
   def test_enable
+    # class_attribute changed and the stub does not work as expected
+    return skip if rails8?
+
     described_class.stub(:hook_names, Set[]) do
       refute_includes(described_class.hook_names, :start)
       described_class.send(:enable, 'starts')
@@ -157,4 +163,8 @@ class GraphQL_SourceTest < GraphQL::TestCase
     def source_const
       Rails::GraphQL::Source
     end
+
+    def rails8?
+      ActiveSupport.gem_version >= Gem::Version.new('8')
+    end
 end

data/test/integration/memory/star_wars_query_test.rb

@@ -132,6 +132,20 @@ class Integration_Memory_StarWarsQueryTest < GraphQL::IntegrationTestCase
     GQL
   end
 
+  def test_query_with_field_argument_and_default_value
+    argument = SCHEMA.find_type('Human')[:greeting].arguments[:name]
+    argument.stub_ivar(:@default, 'You') do
+      assert(argument.inspect, "name: String! = 'You'")
+
+      vader = { name: 'Han Solo', greeting: 'Hello You!' }
+      assert_result({ data: { human: vader } }, <<~GQL)
+        query WithFieldArgument {
+          human(id: "1002") { name greeting }
+        }
+      GQL
+    end
+  end
+
   def test_query_with_fragment
     luke = { name: 'Luke Skywalker', homePlanet: 'Tatooine' }
     leia = { name: 'Leia Organa', homePlanet: 'Alderaan' }

data/test/integration/memory/star_wars_validation_test.rb

@@ -27,8 +27,21 @@ class Integration_Memory_StarWarsValidationTest < GraphQL::IntegrationTestCase
       locations: [{ line: 2, column: 1 }],
     }]
 
-    assert_result(errors, <<~GQL, dig: 'errors')
+    assert_result(errors, <<~QUERY, dig: 'errors')
       query DroidFieldInFragment { hero { name ... on Droid { primaryFunction
+    QUERY
+  end
+
+  def test_fields_with_required_arguments
+    errors = [{
+      message: 'Invalid arguments for human field: the "id" argument can not be null.',
+      locations: [{ line: 1, column: 19 }, { line: 1, column: 33 }],
+      path: %w[HumanName human],
+      extensions: { stage: 'organize', exception: 'Rails::GraphQL::ArgumentsError' },
+    }]
+
+    assert_result(errors, <<~GQL, dig: 'errors')
+      query HumanName { human { name } }
     GQL
   end
 

data/test/integration/schemas/mysql.rb

@@ -6,7 +6,7 @@ class MySQLRecord < ActiveRecord::Base
   establish_connection(
     name: 'mysql',
     adapter: 'mysql2',
-    host: ENV.fetch('GQL_MYSQL_HOST', 'localhost'),
+    host: ENV.fetch('GQL_MYSQL_HOST', '127.0.0.1'),
     database: ENV.fetch('GQL_MYSQL_DATABASE', 'starwars'),
     username: ENV.fetch('GQL_MYSQL_USERNAME', 'root'),
     password: ENV['GQL_MYSQL_PASSWORD'],

data/test/integration/schemas/sqlite.rb

@@ -14,6 +14,7 @@ end
 SQLiteRecord.connection.instance_eval do
   create_table 'lite_factions', force: :cascade do |t|
     t.string 'name'
+    t.string 'greeting'
   end
 
   create_table 'lite_bases', force: :cascade do |t|
@@ -35,8 +36,8 @@ class LiteFaction < SQLiteRecord
   accepts_nested_attributes_for :bases
   accepts_nested_attributes_for :ships
 
-  REBELS = create!(name: 'Alliance to Restore the Republic')
-  EMPIRE = create!(name: 'Galactic Empire')
+  REBELS = create!(name: 'Alliance to Restore the Republic', greeting: 'Hello %s!')
+  EMPIRE = create!(name: 'Galactic Empire', greeting: 'Hi %s!')
 end
 
 class LiteBase < SQLiteRecord
@@ -79,6 +80,12 @@ class StartWarsSqliteSchema < GraphQL::Schema
     with_options on: 'liteFactions' do
       scoped_argument(:order) { |o| order(name: o) }
     end
+
+    object_methods do
+      def greeting
+        format(current.greeting, 'you')
+      end
+    end
   end
 
   source LiteBase do
@@ -88,4 +95,16 @@ class StartWarsSqliteSchema < GraphQL::Schema
   end
 
   source LiteShip
+
+  object 'Sample' do
+    field :faction, 'LiteFaction', null: false
+  end
+
+  query_fields do
+    field :sample, 'Sample', null: false
+  end
+
+  def sample
+    { faction: LiteFaction.last }
+  end
 end

data/test/integration/sqlite/star_wars_query_test.rb

@@ -81,4 +81,20 @@ class Integration_SQLite_StarWarsQueryTest < GraphQL::IntegrationTestCase
       query AllBases($order: String!) { liteBases(order: $order) { name } }
     GQL
   end
+
+  def test_query_methods_precedence
+    faction = { greeting: 'Hi you!' }
+    assert_result({ data: { liteFaction: faction } }, <<~GQL)
+      query EmpireFleet { liteFaction(id: "2") { greeting } }
+    GQL
+  end
+
+  def test_nested_non_prepared_source
+    bases = named_list('Death Star', 'Shield Generator', 'Headquarters')
+    sample = { sample: { faction: { name: 'Galactic Empire', bases: bases } } }
+
+    assert_result({ data: sample }, <<~GQL)
+      query SampleFaction { sample { faction { name bases { name } } } }
+    GQL
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-graphql
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Carlos Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2025-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -404,7 +404,7 @@ metadata:
   source_code_uri: https://github.com/virtualshield/rails-graphql
   bug_tracker_uri: https://github.com/virtualshield/rails-graphql/issues
   changelog_uri: https://github.com/virtualshield/rails-graphql/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - GraphQL server for Rails
@@ -421,8 +421,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: GraphQL meets RoR with the most Ruby-like DSL
 test_files: