graphql 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dd6e04d78aeb4850499bfa484e9482100ec3f67c536d4d9f3b327689c1425480
-  data.tar.gz: 7ce2e0d06bd709d7ae9c7fb131656ddd5c7dca36fdf4fa2edb5727f73f213b74
+SHA1:
+  metadata.gz: a2aa5dc86bfb37cc0c46b7974618bddc91b203b0
+  data.tar.gz: 92979d239d0fbd9a010261dec5d0b1285c617c3f
 SHA512:
-  metadata.gz: 0e99115b2252b94e62536c6cad695d0a036ad7065088d5c7071aef3037aff58179aba02c199f68f18adaaec3a3cf1def9048c69946b7256170233a0fc989ee8d
-  data.tar.gz: 047d6ff12f0f9937829f77f9db0febe25e9fc70cc4810dde9700f9c5f83931b4e7de2b5e6ffa7c2a9d30407fd56fff0e0f0d38c4af9e3233d94bc4ae8090bad7
+  metadata.gz: 26ccb7f54465c14158a933a4bbc52eaba9576725ea06ce1a5425128fd39ad133013383ffa650bc6bbbdf16030bf232ab021da6a1c39ee20933d294b49d5d8d57
+  data.tar.gz: 7ec6717d6a3cf091189269e92d991cd49fdec20802d68cb7c83d60b9ab615535ad626c8163a5022e713f4c9f875bfaec1430b51098ec3e55eca5e91ff6e1a622

data/lib/generators/graphql/mutation_generator.rb

@@ -38,7 +38,7 @@ module Graphql
         sentinel = /class .*MutationType\s*<\s*[^\s]+?\n/m
         in_root do
           gsub_file "#{options[:directory]}/types/mutation_type.rb", /  \# TODO\: Add Mutations as fields\s*\n/m, ""
-          inject_into_file "#{options[:directory]}/types/mutation_type.rb", "  field :#{field_name}, mutation: Mutations::#{mutation_name}\n", after: sentinel, verbose: false, force: false
+          inject_into_file "#{options[:directory]}/types/mutation_type.rb", "    field :#{field_name}, mutation: Mutations::#{mutation_name}\n", after: sentinel, verbose: false, force: false
         end
       end
 

data/lib/generators/graphql/templates/base_enum.erb

@@ -1,2 +1,4 @@
-class Types::BaseEnum < GraphQL::Schema::Enum
+module Types
+  class BaseEnum < GraphQL::Schema::Enum
+  end
 end

data/lib/generators/graphql/templates/base_input_object.erb

@@ -1,2 +1,4 @@
-class Types::BaseInputObject < GraphQL::Schema::InputObject
+module Types
+  class BaseInputObject < GraphQL::Schema::InputObject
+  end
 end

data/lib/generators/graphql/templates/base_interface.erb

@@ -1,3 +1,5 @@
-module Types::BaseInterface
-  include GraphQL::Schema::Interface
+module Types
+  module BaseInterface
+    include GraphQL::Schema::Interface
+  end
 end

data/lib/generators/graphql/templates/base_object.erb

@@ -1,2 +1,4 @@
-class Types::BaseObject < GraphQL::Schema::Object
+module Types
+  class BaseObject < GraphQL::Schema::Object
+  end
 end

data/lib/generators/graphql/templates/base_union.erb

@@ -1,2 +1,4 @@
-class Types::BaseUnion < GraphQL::Schema::Union
+module Types
+  class BaseUnion < GraphQL::Schema::Union
+  end
 end

data/lib/generators/graphql/templates/enum.erb

@@ -1,3 +1,5 @@
-class <%= type_ruby_name %> < Types::BaseEnum
-<% prepared_values.each do |v| %>  value "<%= v[0] %>"<%= v.length > 1 ? ", value: #{v[1]}" : "" %>
-<% end %>end
+module Types
+  class <%= type_ruby_name.split('::')[-1] %> < Types::BaseEnum
+<% prepared_values.each do |v| %>    value "<%= v[0] %>"<%= v.length > 1 ? ", value: #{v[1]}" : "" %>
+<% end %>  end
+end

data/lib/generators/graphql/templates/interface.erb

@@ -1,4 +1,6 @@
-module <%= type_ruby_name %>
-  include Types::BaseInterface
-<% normalized_fields.each do |f| %>  <%= f.to_ruby %>
-<% end %>end
+module Types
+  module <%= type_ruby_name.split('::')[-1] %>
+    include Types::BaseInterface
+<% normalized_fields.each do |f| %>    <%= f.to_ruby %>
+<% end %>  end
+end

data/lib/generators/graphql/templates/loader.erb

@@ -1,15 +1,17 @@
-class Loaders::<%= class_name %> < GraphQL::Batch::Loader
-  # Define `initialize` to store grouping arguments, eg
-  #
-  #     Loaders::<%= class_name %>.for(group).load(value)
-  #
-  # def initialize()
-  # end
+module Loaders
+  class <%= class_name %> < GraphQL::Batch::Loader
+    # Define `initialize` to store grouping arguments, eg
+    #
+    #     Loaders::<%= class_name %>.for(group).load(value)
+    #
+    # def initialize()
+    # end
 
-  # `keys` contains each key from `.load(key)`.
-  # Find the corresponding values, then
-  # call `fulfill(key, value)` or `fulfill(key, nil)`
-  # for each key.
-  def perform(keys)
+    # `keys` contains each key from `.load(key)`.
+    # Find the corresponding values, then
+    # call `fulfill(key, value)` or `fulfill(key, nil)`
+    # for each key.
+    def perform(keys)
+    end
   end
 end

data/lib/generators/graphql/templates/mutation.erb

@@ -1,11 +1,14 @@
-class Mutations::<%= mutation_name %> < GraphQL::Schema::RelayClassicMutation
-  # TODO: define return fields
-  # return_field :post, Types::PostType
+module Mutations
+  class <%= mutation_name %> < GraphQL::Schema::RelayClassicMutation
+    # TODO: define return fields
+    # field :post, Types::PostType, null: false
 
-  # TODO: define arguments
-  # input_field :name, !types.String
+    # TODO: define arguments
+    # argument :name, String, required: true
 
-  def resolve(**inputs)
     # TODO: define resolve method
+    # def resolve(name:)
+    #   { post: ... }
+    # end
   end
 end

data/lib/generators/graphql/templates/mutation_type.erb

@@ -1,8 +1,10 @@
-class Types::MutationType < Types::BaseObject
-  # TODO: remove me
-  field :test_field, String, null: false,
-    description: "An example field added by the generator"
-  def test_field
-    "Hello World"
+module Types
+  class MutationType < Types::BaseObject
+    # TODO: remove me
+    field :test_field, String, null: false,
+      description: "An example field added by the generator"
+    def test_field
+      "Hello World"
+    end
   end
 end

data/lib/generators/graphql/templates/object.erb

@@ -1,4 +1,6 @@
-class <%= type_ruby_name %> < Types::BaseObject
-<% if options.node %>  implements GraphQL::Relay::Node.interface
-<% end %><% normalized_fields.each do |f| %>  <%= f.to_ruby %>
-<% end %>end
+module Types
+  class <%= type_ruby_name.split('::')[-1] %> < Types::BaseObject
+<% if options.node %>    implements GraphQL::Relay::Node.interface
+<% end %><% normalized_fields.each do |f| %>    <%= f.to_ruby %>
+<% end %>  end
+end

data/lib/generators/graphql/templates/query_type.erb

@@ -1,13 +1,15 @@
-class Types::QueryType < Types::BaseObject
-  # Add root-level fields here.
-  # They will be entry points for queries on your schema.
+module Types
+  class QueryType < Types::BaseObject
+    # Add root-level fields here.
+    # They will be entry points for queries on your schema.
 
-  # TODO: remove me
-  field :test_field, String, null: false,
-    description: "An example field added by the generator"
-  def test_field
-    "Hello World!"
-  end
+    # TODO: remove me
+    field :test_field, String, null: false,
+      description: "An example field added by the generator"
+    def test_field
+      "Hello World!"
+    end
 <% if options[:relay] %>
-  field :node, field: GraphQL::Relay::Node.field
-<% end %>end
+    field :node, field: GraphQL::Relay::Node.field
+<% end %>  end
+end

data/lib/generators/graphql/templates/union.erb

@@ -1,3 +1,5 @@
-class <%= type_ruby_name %> < Types::BaseUnion
-<% if possible_types.any? %>  possible_types [<%= normalized_possible_types.join(", ") %>]
-<% end %>end
+module Types
+  class <%= type_ruby_name.split('::')[-1] %> < Types::BaseUnion
+<% if possible_types.any? %>    possible_types [<%= normalized_possible_types.join(", ") %>]
+<% end %>  end
+end

data/lib/graphql/argument.rb

@@ -36,7 +36,8 @@ module GraphQL
   class Argument
     include GraphQL::Define::InstanceDefinable
     accepts_definitions :name, :type, :description, :default_value, :as, :prepare
-    attr_accessor :type, :description, :default_value, :name, :as
+    attr_reader :default_value
+    attr_accessor :description, :name, :as
     attr_accessor :ast_node
     alias :graphql_name :name
 
@@ -65,7 +66,7 @@ module GraphQL
         @default_value = nil
       else
         @has_default_value = true
-        @default_value = new_default_value
+        @default_value = GraphQL::Argument.deep_stringify(new_default_value)
       end
     end
 
@@ -127,5 +128,21 @@ module GraphQL
         GraphQL::Argument.define(kwargs, &block)
       end
     end
+
+    # @api private
+    def self.deep_stringify(val)
+      case val
+      when Array
+        val.map { |v| deep_stringify(v) }
+      when Hash
+        new_val = {}
+        val.each do |k, v|
+          new_val[k.to_s] = deep_stringify(v)
+        end
+        new_val
+      else
+        val
+      end
+    end
   end
 end

data/lib/graphql/base_type.rb

@@ -35,7 +35,7 @@ module GraphQL
     end
 
     # @return [String] the name of this type, must be unique within a Schema
-    attr_accessor :name
+    attr_reader :name
     # Future-compatible alias
     # @see {GraphQL::SchemaMember}
     alias :graphql_name :name

data/lib/graphql/define/instance_definable.rb

@@ -177,6 +177,7 @@ module GraphQL
         pending_methods = @pending_methods
         self.singleton_class.class_eval {
           pending_methods.each do |method|
+            undef_method(method.name) if method_defined?(method.name)
             define_method(method.name, method)
           end
         }
@@ -200,6 +201,7 @@ module GraphQL
         @pending_methods = method_names.map { |n| self.class.instance_method(n) }
         self.singleton_class.class_eval do
           method_names.each do |method_name|
+            undef_method(method_name) if method_defined?(method_name)
             define_method(method_name) { |*args, &block|
               ensure_defined
               self.send(method_name, *args, &block)

data/lib/graphql/enum_type.rb

@@ -141,6 +141,7 @@ module GraphQL
       attr_accessor :ast_node
       ensure_defined(*ATTRIBUTES)
 
+      undef name=
       def name=(new_name)
         # Validate that the name is correct
         GraphQL::NameValidator.validate!(new_name)

data/lib/graphql/execution/instrumentation.rb

@@ -51,30 +51,38 @@ module GraphQL
 
         # Call each before hook, and if they all succeed, yield.
         # If they don't all succeed, call after_ for each one that succeeded.
-        def call_hooks(instrumenters, object, before_hook_name, after_hook_name, i = 0)
-          if i >= instrumenters.length
-            # We've reached the end of the instrumenters, so start exiting the call stack.
-            # (This will eventually call the originally-passed block.)
-            yield
-          else
-            # Get the next instrumenter and call the before_hook.
-            instrumenter = instrumenters[i]
-            instrumenter.public_send(before_hook_name, object)
-            # At this point, the before_hook did _not_ raise an error.
-            # (If it did raise an error, we wouldn't reach this point.)
-            # So we should guarantee that we run the after_hook.
+        def call_hooks(instrumenters, object, before_hook_name, after_hook_name)
+          begin
+            successful = []
+            instrumenters.each do |instrumenter|
+              instrumenter.public_send(before_hook_name, object)
+              successful << instrumenter
+            end
+
+            # if any before hooks raise an exception, quit calling before hooks,
+            # but call the after hooks on anything that succeeded but also
+            # raise the exception that came from the before hook.
+          rescue => e
+            raise call_after_hooks(successful, object, after_hook_name, e)
+          end
+
+          begin
+            yield # Call the user code
+          ensure
+            ex = call_after_hooks(successful, object, after_hook_name, nil)
+            raise ex if ex
+          end
+        end
+
+        def call_after_hooks(instrumenters, object, after_hook_name, ex)
+          instrumenters.reverse.each do |instrumenter|
             begin
-              # Call the next instrumenter on the list,
-              # basically passing along the original block
-              call_hooks(instrumenters, object, before_hook_name, after_hook_name, i + 1) {
-                yield
-              }
-            ensure
-              # Regardless of how the next instrumenter in the list behaves,
-              # call the after_hook of this instrumenter
               instrumenter.public_send(after_hook_name, object)
+            rescue => e
+              ex = e
             end
           end
+          ex
         end
       end
     end

data/lib/graphql/field.rb

@@ -156,7 +156,7 @@ module GraphQL
     attr_reader :lazy_resolve_proc
 
     # @return [String] The name of this field on its {GraphQL::ObjectType} (or {GraphQL::InterfaceType})
-    attr_accessor :name
+    attr_reader :name
     alias :graphql_name :name
 
     # @return [String, nil] The client-facing description of this field
@@ -175,10 +175,10 @@ module GraphQL
     attr_accessor :complexity
 
     # @return [Symbol, nil] The method to call on `obj` to return this field (overrides {#name} if present)
-    attr_accessor :property
+    attr_reader :property
 
     # @return [Object, nil] The key to access with `obj.[]` to resolve this field (overrides {#name} if present)
-    attr_accessor :hash_key
+    attr_reader :hash_key
 
     # @return [Object, GraphQL::Function] The function used to derive this field
     attr_accessor :function

data/lib/graphql/input_object_type.rb

@@ -93,7 +93,8 @@ module GraphQL
           coerced_value = input_field_defn.type.coerce_input(field_value, ctx)
           input_values[input_key] = input_field_defn.prepare(coerced_value, ctx)
         elsif input_field_defn.default_value?
-          input_values[input_key] = input_field_defn.default_value
+          coerced_value = input_field_defn.type.coerce_input(input_field_defn.default_value, ctx)
+          input_values[input_key] = coerced_value
           defaults_used << input_key
         end
       end

data/lib/graphql/query.rb

@@ -29,7 +29,7 @@ module GraphQL
       end
     end
 
-    attr_reader :schema, :context, :warden, :provided_variables
+    attr_reader :schema, :context, :provided_variables
 
     # The value for root types
     attr_accessor :root_value
@@ -60,9 +60,6 @@ module GraphQL
     # @return [String, nil] the triggered event, if this query is a subscription update
     attr_reader :subscription_topic
 
-    # @return [String, nil]
-    attr_reader :operation_name
-
     attr_reader :tracers
 
     # Prepare query `query_string` on `schema`
@@ -220,11 +217,6 @@ module GraphQL
       @arguments_cache[irep_or_ast_node][definition]
     end
 
-    # @return [GraphQL::Language::Nodes::OperationDefinition, nil]
-    def selected_operation
-      with_prepared_ast { @selected_operation }
-    end
-
     def validation_pipeline
       with_prepared_ast { @validation_pipeline }
     end

data/lib/graphql/query/variables.rb

@@ -14,7 +14,7 @@ module GraphQL
         schema = ctx.schema
         @context = ctx
 
-        @provided_variables = deep_stringify(provided_variables)
+        @provided_variables = GraphQL::Argument.deep_stringify(provided_variables)
         @errors = []
         @storage = ast_variables.each_with_object({}) do |ast_variable, memo|
           # Find the right value for this variable:
@@ -52,23 +52,6 @@ module GraphQL
       end
 
       def_delegators :@storage, :length, :key?, :[], :fetch, :to_h
-
-      private
-
-      def deep_stringify(val)
-        case val
-        when Array
-          val.map { |v| deep_stringify(v) }
-        when Hash
-          new_val = {}
-          val.each do |k, v|
-            new_val[k.to_s] = deep_stringify(v)
-          end
-          new_val
-        else
-          val
-        end
-      end
     end
   end
 end

data/lib/graphql/relay.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'base64'
 
 require 'graphql/relay/page_info'
 require 'graphql/relay/edge'

data/lib/graphql/relay/mongo_relation_connection.rb

@@ -36,5 +36,15 @@ module GraphQL
     if defined?(Mongoid::Criteria)
       BaseConnection.register_connection_implementation(Mongoid::Criteria, MongoRelationConnection)
     end
+
+    # Mongoid 5 and 6
+    if defined?(Mongoid::Relations::Targets::Enumerable)
+      BaseConnection.register_connection_implementation(Mongoid::Relations::Targets::Enumerable, MongoRelationConnection)
+    end
+
+    # Mongoid 7
+    if defined?(Mongoid::Association::Referenced::HasMany::Targets::Enumerable)
+      BaseConnection.register_connection_implementation(Mongoid::Association::Referenced::HasMany::Targets::Enumerable, MongoRelationConnection)
+    end
   end
 end