graphql-activerecord 0.12.6 → 0.13.0

data/bin/rspec

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/bin/rubocop

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/bin/ruby-parse

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/bin/ruby-rewrite

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/graphql-activerecord.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'graphql/models/version'
 
@@ -20,14 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", ">= 4.2", '< 6'
   spec.add_runtime_dependency "activerecord", ">= 4.2", '< 6'
-  spec.add_runtime_dependency "graphql", ">= 1.5.10", '< 2'
+  spec.add_runtime_dependency "activesupport", ">= 4.2", '< 6'
+  spec.add_runtime_dependency "graphql", ">= 1.7.5", '< 2'
   spec.add_runtime_dependency "graphql-batch", ">= 0.2.4"
 
   spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rubocop", '~> 0.47.1'
+  spec.add_development_dependency "rubocop"
 end

data/lib/graphql/activerecord.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support'
 require 'active_record'
 require 'graphql'
@@ -39,6 +40,7 @@ module GraphQL
   module Models
     class << self
       attr_accessor :model_from_id, :authorize, :id_for_model, :model_to_graphql_type, :unknown_scalar
+      attr_accessor :legacy_nulls
     end
 
     # Returns a promise that will traverse the associations and resolve to the model at the end of the path.
@@ -72,11 +74,13 @@ module GraphQL
       authorize.call(context, model, action)
     end
 
-    def self.define_mutator(definer, model_type, null_behavior:, &block)
+    def self.define_mutator(definer, model_type, null_behavior: :leave_unchanged, legacy_nulls: GraphQL::Models.legacy_nulls, &block)
+      legacy_nulls ||= false
+
       # HACK: To get the name of the mutation, to avoid possible collisions with other type names
       prefix = definer.instance_variable_get(:@target).name
 
-      mutator_definition = MutatorDefinition.new(model_type, null_behavior: null_behavior)
+      mutator_definition = MutatorDefinition.new(model_type, null_behavior: null_behavior, legacy_nulls: legacy_nulls)
       mutator_definition.field_map.instance_exec(&block)
       MutationHelpers.print_input_fields(mutator_definition.field_map, definer, "#{prefix}Input")
       mutator_definition

data/lib/graphql/models/active_record_extension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     module ActiveRecordExtension
@@ -24,7 +25,7 @@ module GraphQL
       extend ::ActiveSupport::Concern
       class_methods do
         def graphql_enum_types
-          @_graphql_enum_types ||= EnumTypeHash.new
+          @graphql_enum_types ||= EnumTypeHash.new
         end
 
         # Defines a GraphQL enum type on the model

data/lib/graphql/models/association_load_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     class AssociationLoadRequest

data/lib/graphql/models/attribute_loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   # Simplified loader that can take a hash of attributes to match, combine them into a single query, and then fulfill
   # then individually. It can also ask the database to order them correctly.

data/lib/graphql/models/backed_by_model.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     class BackedByModel

data/lib/graphql/models/database_types.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     module DatabaseTypes

data/lib/graphql/models/definer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This is a helper class. It lets you build simple DSL's. Methods called against the class are
 # converted into attributes in a hash.
 module GraphQL

data/lib/graphql/models/definition_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ostruct'
 
 module GraphQL
@@ -66,7 +67,7 @@ module GraphQL
         return false unless context
 
         reflection = association.reflection
-        return false unless [:has_one, :belongs_to].include?(reflection.macro)
+        return false unless %i[has_one belongs_to].include?(reflection.macro)
 
         if reflection.macro == :belongs_to
           target_id = model.send(reflection.foreign_key)
@@ -123,7 +124,7 @@ module GraphQL
         field_name = field_name.to_s
 
         field_meta = graph_type.instance_variable_get(:@field_metadata)
-        field_meta = graph_type.instance_variable_set(:@field_metadata, {}) unless field_meta
+        field_meta ||= graph_type.instance_variable_set(:@field_metadata, {})
         field_meta[field_name] = OpenStruct.new(metadata).freeze
       end
     end

data/lib/graphql/models/definition_helpers/associations.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     module DefinitionHelpers
@@ -6,7 +7,7 @@ module GraphQL
         reflection = model_type.reflect_on_association(association)
         raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
         raise ArgumentError, "Cannot proxy to polymorphic association #{association} on model #{model_type.name}" if reflection.polymorphic?
-        raise ArgumentError, "Cannot proxy to #{reflection.macro} association #{association} on model #{model_type.name}" unless [:has_one, :belongs_to].include?(reflection.macro)
+        raise ArgumentError, "Cannot proxy to #{reflection.macro} association #{association} on model #{model_type.name}" unless %i[has_one belongs_to].include?(reflection.macro)
 
         return unless block_given?
 
@@ -56,7 +57,7 @@ module GraphQL
         reflection = model_type.reflect_on_association(association)
 
         raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
-        raise ArgumentError, "Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_one" unless [:has_one, :belongs_to].include?(reflection.macro)
+        raise ArgumentError, "Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_one" unless %i[has_one belongs_to].include?(reflection.macro)
 
         # Define the field for the association itself
 

data/lib/graphql/models/definition_helpers/attributes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Models
     module DefinitionHelpers

data/lib/graphql/models/hash_combiner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models::HashCombiner
   class << self
     # Takes a set of hashes that represent conditions, and combines them into the smallest number of hashes

data/lib/graphql/models/helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   module Helpers
     def self.orders_to_sql(orders)

data/lib/graphql/models/instrumentation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class GraphQL::Models::Instrumentation
   # @param skip_nil_models If true, field resolvers (in proxy_to or backed_by_model blocks) will not be invoked if the model is nil.
   def initialize(skip_nil_models = true)
@@ -12,10 +13,11 @@ class GraphQL::Models::Instrumentation
     old_resolver = field.resolve_proc
 
     new_resolver = -> (object, args, ctx) {
-      base_model = field_info.object_to_base_model.call(object)
-      GraphQL::Models.load_association(base_model, field_info.path, ctx).then do |model|
-        next nil if model.nil? && @skip_nil_models
-        old_resolver.call(model, args, ctx)
+      Promise.resolve(field_info.object_to_base_model.call(object)).then do |base_model|
+        GraphQL::Models.load_association(base_model, field_info.path, ctx).then do |model|
+          next nil if model.nil? && @skip_nil_models
+          old_resolver.call(model, args, ctx)
+        end
       end
     }
 

data/lib/graphql/models/monkey_patches/graphql_query_context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class GraphQL::Query::Context
   def cached_models
     @cached_models ||= Set.new

data/lib/graphql/models/mutation_field_map.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   class MutationFieldMap
-    attr_accessor :model_type, :find_by, :null_behavior, :fields, :nested_maps
+    attr_accessor :model_type, :find_by, :null_behavior, :fields, :nested_maps, :legacy_nulls
 
     # These are used when this is a proxy_to or a nested field map
     attr_accessor :name, :association, :has_many, :required, :path
 
-    def initialize(model_type, find_by:, null_behavior:)
+    def initialize(model_type, find_by:, null_behavior:, legacy_nulls:)
       raise ArgumentError, "model_type must be a model" if model_type && !(model_type <= ActiveRecord::Base)
-      raise ArgumentError, "null_behavior must be :set_null or :leave_unchanged" unless [:set_null, :leave_unchanged].include?(null_behavior)
+      raise ArgumentError, "null_behavior must be :set_null or :leave_unchanged" unless %i[set_null leave_unchanged].include?(null_behavior)
 
       @fields = []
       @nested_maps = []
@@ -16,6 +17,7 @@ module GraphQL::Models
       @model_type = model_type
       @find_by = Array.wrap(find_by)
       @null_behavior = null_behavior
+      @legacy_nulls = legacy_nulls
 
       @find_by.each { |f| attr(f) }
     end
@@ -65,7 +67,7 @@ module GraphQL::Models
       reflection = model_type&.reflect_on_association(association)
 
       if reflection
-        unless [:belongs_to, :has_one].include?(reflection.macro)
+        unless %i[belongs_to has_one].include?(reflection.macro)
           raise ArgumentError, "Cannot proxy to #{reflection.macro} association #{association} from #{model_type.name}"
         end
 
@@ -74,7 +76,7 @@ module GraphQL::Models
         klass = nil
       end
 
-      proxy = MutationFieldMap.new(klass, find_by: nil, null_behavior: null_behavior)
+      proxy = MutationFieldMap.new(klass, find_by: nil, null_behavior: null_behavior, legacy_nulls: legacy_nulls)
       proxy.association = association
       proxy.instance_exec(&block)
 
@@ -97,7 +99,7 @@ module GraphQL::Models
       end
     end
 
-    def nested(association, find_by: nil, null_behavior:, name: nil, has_many: false, &block)
+    def nested(association, find_by: nil, null_behavior:, name: nil, &block)
       unless model_type
         raise ArgumentError, "Cannot use `nested` unless the model type is known at build time."
       end
@@ -116,7 +118,7 @@ module GraphQL::Models
       has_many = reflection.macro == :has_many
       required = Reflection.is_required(model_type, association)
 
-      map = MutationFieldMap.new(reflection.klass, find_by: find_by, null_behavior: null_behavior)
+      map = MutationFieldMap.new(reflection.klass, find_by: find_by, null_behavior: null_behavior, legacy_nulls: legacy_nulls)
       map.name = name || association.to_s.camelize(:lower)
       map.association = association.to_s
       map.has_many = has_many

data/lib/graphql/models/mutation_helpers/apply_changes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   module MutationHelpers
     def self.apply_changes(field_map, model, inputs, context)
@@ -7,7 +8,13 @@ module GraphQL::Models
 
       # Values will now contain the list of inputs that we should actually act on. Any null values should actually
       # be set to null, and missing fields should be skipped.
-      values = field_map.leave_null_unchanged? ? prep_leave_unchanged(inputs) : prep_set_null(field_map, inputs)
+      values = if field_map.leave_null_unchanged? && field_map.legacy_nulls
+        prep_legacy_leave_unchanged(inputs)
+      elsif field_map.leave_null_unchanged?
+        prep_leave_unchanged(inputs)
+      else
+        prep_set_null(field_map, inputs)
+      end
 
       values.each do |name, value|
         field_def = field_map.fields.detect { |f| f[:name] == name }
@@ -232,10 +239,10 @@ module GraphQL::Models
       end
     end
 
-    # If the field map has the option leave_null_unchanged, there's an `unsetFields` string array that contains the
-    # name of inputs that should be treated as if they are null. We handle that by removing null inputs, and then
-    # adding back any unsetFields with null values.
-    def self.prep_leave_unchanged(inputs)
+    # If the field map has the option leave_null_unchanged, and legacy_nulls is true, then there's an `unsetFields` string
+    # array that contains the name of inputs that should be treated as if they are null. We handle that by removing null
+    # inputs, and then adding back any unsetFields with null values.
+    def self.prep_legacy_leave_unchanged(inputs)
       # String key hash
       values = inputs.to_h.compact
 
@@ -249,6 +256,10 @@ module GraphQL::Models
       values
     end
 
+    def self.prep_leave_unchanged(inputs)
+      inputs.to_h
+    end
+
     # Field map has the option to set_null. Any field that has the value null, or is missing, will be set to null.
     def self.prep_set_null(field_map, inputs)
       values = inputs.to_h.compact

data/lib/graphql/models/mutation_helpers/authorization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   module MutationHelpers
     def self.authorize_changes(context, all_changes)

data/lib/graphql/models/mutation_helpers/print_input_fields.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   module MutationHelpers
     def self.print_input_fields(field_map, definer, map_name_prefix)
@@ -7,14 +8,14 @@ module GraphQL::Models
           field_type = f[:type]
 
           if f[:required] && !field_map.leave_null_unchanged?
-            field_type = field_type.to_non_null_type
+            field_type = field_type.to_non_null_type unless field_type.non_null?
           end
 
           input_field(f[:name], field_type)
         end
 
-        if field_map.leave_null_unchanged?
-          field_names = field_map.fields.select { |f| !f[:required] }.map { |f| f[:name].to_s }
+        if field_map.leave_null_unchanged? && field_map.legacy_nulls
+          field_names = field_map.fields.reject { |f| f[:required] }.map { |f| f[:name].to_s }
           field_names += field_map.nested_maps.reject(&:required).map { |fld| fld.name.to_s }
           field_names = field_names.sort
 

data/lib/graphql/models/mutation_helpers/validation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL::Models
   module MutationHelpers
     def self.validate_changes(inputs, field_map, root_model, context, all_changes)