graphiti 1.2.16 → 1.3.9

data/lib/graphiti/stats/payload.rb

@@ -15,10 +15,10 @@ module Graphiti
     #   }
     class Payload
       def initialize(resource, query, scope, data)
-        @resource   = resource
-        @query      = query
-        @scope      = scope
-        @data       = data
+        @resource = resource
+        @query = query
+        @scope = scope
+        @data = data
       end
 
       # Generate the payload for +{ meta: { stats: { ... } } }+
@@ -31,16 +31,19 @@ module Graphiti
             stats[name] = {}
 
             each_calculation(name, calculation) do |calc, function|
-              args = [@scope, name]
-              args << @resource.context if function.arity >= 3
-              args << @data if function.arity == 4
-
-              stats[name][calc] = function.call(*args)
+              stats[name][calc] = calculate_stat(name, function)
             end
           end
         end
       end
 
+      def calculate_stat(name, function)
+        args = [@scope, name]
+        args << @resource.context if function.arity >= 3
+        args << @data if function.arity == 4
+        function.call(*args)
+      end
+
       private
 
       def each_calculation(name, calculations)

data/lib/graphiti/types.rb

@@ -93,14 +93,14 @@ module Graphiti
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.integer"],
             kind: "scalar",
-            description: "Base Type. Query/persist as integer, render as string.",
+            description: "Base Type. Query/persist as integer, render as string."
           },
           uuid: {
             params: Dry::Types["coercible.string"],
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "Base Type. Like a normal string, but by default only eq/!eq and case-sensitive.",
+            description: "Base Type. Like a normal string, but by default only eq/!eq and case-sensitive."
           },
           string_enum: {
             canonical_name: :enum,
@@ -108,7 +108,7 @@ module Graphiti
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "String enum type. Like a normal string, but only eq/!eq and case-sensitive. Limited to only the allowed values.",
+            description: "String enum type. Like a normal string, but only eq/!eq and case-sensitive. Limited to only the allowed values."
           },
           integer_enum: {
             canonical_name: :enum,
@@ -116,71 +116,71 @@ module Graphiti
             read: Dry::Types["coercible.integer"],
             write: Dry::Types["coercible.integer"],
             kind: "scalar",
-            description: "Integer enum type. Like a normal integer, but only eq/!eq filters. Limited to only the allowed values.",
+            description: "Integer enum type. Like a normal integer, but only eq/!eq filters. Limited to only the allowed values."
           },
           string: {
             params: Dry::Types["coercible.string"],
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           integer: {
             params: PresentInteger,
             read: Integer,
             write: Integer,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           big_decimal: {
             params: ParamDecimal,
             read: Dry::Types["json.decimal"],
             write: Dry::Types["json.decimal"],
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           float: {
             params: Dry::Types["coercible.float"],
             read: Float,
             write: Float,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           boolean: {
             params: PresentBool,
             read: Bool,
             write: Bool,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           date: {
             params: PresentDate,
             read: Date,
             write: Date,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           datetime: {
             params: PresentParamsDateTime,
             read: ReadDateTime,
             write: WriteDateTime,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           hash: {
             params: PresentParamsHash,
             read: Dry::Types["strict.hash"],
             write: Dry::Types["strict.hash"],
             kind: "record",
-            description: "Base Type.",
+            description: "Base Type."
           },
           array: {
             params: Dry::Types["strict.array"],
             read: Dry::Types["strict.array"],
             write: Dry::Types["strict.array"],
             kind: "array",
-            description: "Base Type.",
-          },
+            description: "Base Type."
+          }
         }
 
         hash.each_pair do |k, v|
@@ -198,7 +198,7 @@ module Graphiti
             test: Dry::Types["strict.array"].of(map[:test]),
             write: Dry::Types["strict.array"].of(map[:write]),
             kind: "array",
-            description: "Base Type.",
+            description: "Base Type."
           }
         end
         hash.merge!(arrays)

data/lib/graphiti/util/attribute_check.rb

@@ -44,7 +44,7 @@ module Graphiti
           Graphiti::Errors::UnknownAttribute
 
         if raise_error?(opts[:exists])
-          raise error_class.new(resource, name, flag, opts)
+          raise error_class.new(resource, name, flag, **opts)
         else
           false
         end

data/lib/graphiti/util/class.rb

@@ -20,6 +20,12 @@ module Graphiti
         split = namespace.split("::")
         split[0, split.length - 1].join("::")
       end
+
+      def self.graphql_type_name(name)
+        name.gsub("Resource", "")
+          .gsub("::", "") # remove modules
+          .gsub(".", "__") # remove remote resource .
+      end
     end
   end
 end

data/lib/graphiti/util/link.rb

@@ -60,10 +60,14 @@ module Graphiti
       def params
         @params ||= {}.tap do |params|
           if @sideload.type != :belongs_to || @sideload.remote?
-            params[:filter] = @sideload.base_filter([@model])
+            params[:filter] = @sideload.link_filter([@model])
           end
 
-          @sideload.params_proc&.call(params, [@model])
+          if (extra_fields = @sideload.link_extra_fields)
+            params[:extra_fields] ||= extra_fields
+          end
+
+          @sideload.params_proc&.call(params, [@model], context)
         end
       end
 
@@ -75,6 +79,10 @@ module Graphiti
         end
         path
       end
+
+      def context
+        Graphiti.context[:object]
+      end
     end
   end
 end

data/lib/graphiti/util/persistence.rb

@@ -8,12 +8,13 @@ class Graphiti::Util::Persistence
   # @param [Model] caller_model The persisted parent object in the request graph
   # @param [Symbol] foreign_key Attribute assigned by parent object in graph
   def initialize(resource, meta, attributes, relationships, caller_model, foreign_key = nil)
-    @resource      = resource
-    @meta          = meta
-    @attributes    = attributes
+    @resource = resource
+    @meta = meta
+    @attributes = attributes
     @relationships = relationships
-    @caller_model  = caller_model
-    @foreign_key   = foreign_key
+    @caller_model = caller_model
+    @foreign_key = foreign_key
+    @adapter = @resource.adapter
 
     # Find the correct child resource for a given jsonapi type
     if (meta_type = @meta[:type].try(:to_sym))
@@ -43,18 +44,16 @@ class Graphiti::Util::Persistence
   #
   # @return a model instance
   def run
-    parents = process_belongs_to(@relationships)
-    update_foreign_key_for_parents(parents)
+    attributes = @adapter.persistence_attributes(self, @attributes)
 
-    persisted = persist_object(@meta[:method], @attributes)
+    parents = @adapter.process_belongs_to(self, attributes)
+    persisted = persist_object(@meta[:method], attributes)
     @resource.decorate_record(persisted)
     assign_temp_id(persisted, @meta[:temp_id])
 
     associate_parents(persisted, parents)
 
-    children = process_has_many(@relationships, persisted) { |x|
-      update_foreign_key(persisted, x[:attributes], x)
-    }
+    children = @adapter.process_has_many(self, persisted)
 
     associate_children(persisted, children) unless @meta[:method] == :destroy
 
@@ -69,43 +68,21 @@ class Graphiti::Util::Persistence
     persisted
   end
 
-  private
-
-  def add_hook(prc, lifecycle_event)
-    ::Graphiti::Util::TransactionHooksRecorder.add(prc, lifecycle_event)
-  end
-
-  # The child's attributes should be modified to nil-out the
-  # foreign_key when the parent is being destroyed or disassociated
-  #
-  # This is not the case for HABTM, whose "foreign key" is a join table
-  def update_foreign_key(parent_object, attrs, x)
-    return if x[:sideload].type == :many_to_many
+  def iterate(only: [], except: [])
+    opts = {
+      resource: @resource,
+      relationships: @relationships
+    }.merge(only: only, except: except)
 
-    if [:destroy, :disassociate].include?(x[:meta][:method])
-      if x[:sideload].polymorphic_has_one? || x[:sideload].polymorphic_has_many?
-        attrs[:"#{x[:sideload].polymorphic_as}_type"] = nil
-      end
-      attrs[x[:foreign_key]] = nil
-      update_foreign_type(attrs, x, null: true) if x[:is_polymorphic]
-    else
-      if x[:sideload].polymorphic_has_one? || x[:sideload].polymorphic_has_many?
-        attrs[:"#{x[:sideload].polymorphic_as}_type"] = parent_object.class.name
-      end
-      attrs[x[:foreign_key]] = parent_object.send(x[:primary_key])
-      update_foreign_type(attrs, x) if x[:is_polymorphic]
+    Graphiti::Util::RelationshipPayload.iterate(**opts) do |x|
+      yield x
     end
   end
 
-  def update_foreign_type(attrs, x, null: false)
-    grouping_field = x[:sideload].parent.grouper.field_name
-    attrs[grouping_field] = null ? nil : x[:sideload].group_name
-  end
+  private
 
-  def update_foreign_key_for_parents(parents)
-    parents.each do |x|
-      update_foreign_key(x[:object], @attributes, x)
-    end
+  def add_hook(prc, lifecycle_event)
+    ::Graphiti::Util::TransactionHooksRecorder.add(prc, lifecycle_event)
   end
 
   def associate_parents(object, parents)
@@ -161,29 +138,6 @@ class Graphiti::Util::Persistence
     end
   end
 
-  def process_has_many(relationships, caller_model)
-    [].tap do |processed|
-      iterate(except: [:polymorphic_belongs_to, :belongs_to]) do |x|
-        yield x
-
-        x[:object] = x[:resource]
-          .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model, x[:foreign_key])
-
-        processed << x
-      end
-    end
-  end
-
-  def process_belongs_to(relationships)
-    [].tap do |processed|
-      iterate(only: [:polymorphic_belongs_to, :belongs_to]) do |x|
-        x[:object] = x[:resource]
-          .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
-        processed << x
-      end
-    end
-  end
-
   def post_process(caller_model, processed)
     groups = processed.group_by { |x| x[:meta][:method] }
     groups.each_pair do |method, group|
@@ -199,24 +153,13 @@ class Graphiti::Util::Persistence
     object.instance_variable_set(:@_jsonapi_temp_id, temp_id)
   end
 
-  def iterate(only: [], except: [])
-    opts = {
-      resource: @resource,
-      relationships: @relationships,
-    }.merge(only: only, except: except)
-
-    Graphiti::Util::RelationshipPayload.iterate(opts) do |x|
-      yield x
-    end
-  end
-
   def metadata
     {
       method: @meta[:method],
       temp_id: @meta[:temp_id],
       caller_model: @caller_model,
       attributes: @attributes,
-      relationships: @relationships,
+      relationships: @relationships
     }
   end
 

data/lib/graphiti/util/relationship_payload.rb

@@ -14,9 +14,9 @@ module Graphiti
 
       def initialize(resource, payload, only: [], except: [])
         @resource = resource
-        @payload  = payload
-        @only     = only
-        @except   = except
+        @payload = payload
+        @only = only
+        @except = except
       end
 
       def iterate
@@ -67,7 +67,7 @@ module Graphiti
           foreign_key: sideload.foreign_key,
           attributes: relationship_payload[:attributes],
           meta: relationship_payload[:meta],
-          relationships: relationship_payload[:relationships],
+          relationships: relationship_payload[:relationships]
         }
       end
     end

data/lib/graphiti/util/remote_params.rb

@@ -2,13 +2,14 @@
 module Graphiti
   module Util
     class RemoteParams
-      def self.generate(resource, query)
-        new(resource, query).generate
+      def self.generate(resource, query, foreign_key)
+        new(resource, query, foreign_key).generate
       end
 
-      def initialize(resource, query)
+      def initialize(resource, query, foreign_key)
         @resource = resource
         @query = query
+        @foreign_key = foreign_key
         @sorts = []
         @filters = {}
         @fields = {}
@@ -97,7 +98,11 @@ module Graphiti
         return unless fields
 
         fields.each_pair do |type, attrs|
-          @fields[type] = attrs.join(",")
+          all_attrs = attrs
+          if @foreign_key
+            all_attrs |= [@foreign_key]
+          end
+          @fields[type] = all_attrs.join(",")
         end
       end
 

data/lib/graphiti/util/remote_serializer.rb

@@ -44,6 +44,7 @@ module Graphiti
           model.delete_field(:_relationships)
           # If this isn't set, Array(resources) will return []
           # This is important, because jsonapi-serializable makes this call
+          # To see the test failure, remote resource position > department
           model.instance_variable_set(:@__graphiti_resource, 1)
           model.instance_variable_set(:@__graphiti_serializer, serializer)
         end

data/lib/graphiti/util/serializer_attributes.rb

@@ -12,26 +12,48 @@ module Graphiti
       def apply
         return unless readable?
 
+        remove_guard if previously_guarded?
+
         if @name == :id
           @serializer.id(&proc)
-        elsif @attr[:proc]
-          @serializer.send(_method, @name, serializer_options, &proc)
-        elsif @serializer.attribute_blocks[@name].nil?
+        elsif @attr[:proc] ||
+            !previously_applied? ||
+            previously_applied_via_resource?
           @serializer.send(_method, @name, serializer_options, &proc)
-        else
-          unless @serializer.send(applied_method).include?(@name)
-            inner = @serializer.attribute_blocks.delete(@name)
-            wrapped = wrap_proc(inner)
-            @serializer.send(_method, @name, serializer_options, &wrapped)
-          end
+        else # Previously applied via explicit serializer, so wrap it
+          inner = @serializer.attribute_blocks.delete(@name)
+          wrapped = wrap_proc(inner)
+          @serializer.send(_method, @name, serializer_options, &wrapped)
         end
 
         existing = @serializer.send(applied_method)
         @serializer.send(:"#{applied_method}=", [@name] | existing)
+
+        @serializer.meta do
+          if !!@resource.try(:cursor_paginatable?) && !Graphiti.context[:graphql]
+            {cursor: cursor}
+          end
+        end
       end
 
       private
 
+      def previously_applied?
+        @serializer.attribute_blocks[@name].present?
+      end
+
+      def previously_applied_via_resource?
+        @serializer.send(applied_method).include?(@name)
+      end
+
+      def previously_guarded?
+        @serializer.field_condition_blocks[@name]
+      end
+
+      def remove_guard
+        @serializer.field_condition_blocks.delete(@name)
+      end
+
       def applied_method
         if extra?
           :extra_attributes_applied_via_resource
@@ -55,14 +77,22 @@ module Graphiti
       def guard
         method_name = @attr[:readable]
         instance = @resource.new
+        attribute = @name.to_s
+        resource_class = @resource
 
         -> {
           method = instance.method(method_name)
-          if method.arity.zero?
+          result = if method.arity.zero?
             instance.instance_eval(&method_name)
-          else
+          elsif method.arity == 1
             instance.instance_exec(@object, &method)
+          else
+            instance.instance_exec(@object, attribute, &method)
+          end
+          if Graphiti.context[:graphql] && !result
+            raise ::Graphiti::Errors::UnreadableAttribute.new(resource_class, attribute)
           end
+          result
         }
       end
 

data/lib/graphiti/util/simple_errors.rb

@@ -33,7 +33,7 @@ module Graphiti
       def size
         values.flatten.size
       end
-      alias count size
+      alias_method :count, :size
 
       def values
         messages.values.reject(&:empty?)
@@ -48,12 +48,12 @@ module Graphiti
       def empty?
         size.zero?
       end
-      alias blank? empty?
+      alias_method :blank?, :empty?
 
       def add(attribute, code, message: nil)
         message ||= "is #{code.to_s.humanize.downcase}"
 
-        details[attribute.to_sym]  << {error: code}
+        details[attribute.to_sym] << {error: code}
         messages[attribute.to_sym] << message
       end
 
@@ -64,7 +64,7 @@ module Graphiti
       def full_messages
         map { |attribute, message| full_message(attribute, message) }
       end
-      alias to_a full_messages
+      alias_method :to_a, :full_messages
 
       def full_messages_for(attribute)
         attribute = attribute.to_sym

data/lib/graphiti/util/transaction_hooks_recorder.rb

@@ -65,7 +65,7 @@ module Graphiti
           Thread.current[:_graphiti_hooks] = {
             after_graph_persist: [],
             before_commit: [],
-            after_commit: [],
+            after_commit: []
           }
         end
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.16"
+  VERSION = "1.3.9"
 end

data/lib/graphiti.rb

@@ -6,6 +6,7 @@ require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/conversions" # to_xml
 require "active_support/concern"
 require "active_support/time"
+require "active_support/deprecation"
 
 require "dry-types"
 require "graphiti_errors"
@@ -13,7 +14,7 @@ require "graphiti_errors"
 require "jsonapi/serializable"
 
 module Graphiti
-  DEPRECATOR = ActiveSupport::Deprecation.new('2.0', 'Graphiti')
+  DEPRECATOR = ActiveSupport::Deprecation.new("2.0", "Graphiti")
 
   # @api private
   def self.context
@@ -33,9 +34,9 @@ module Graphiti
   ensure
     self.context = prior
 
-    resources.each { |resource_class|
+    resources.each do |resource_class|
       resource_class.sideloads.values.each(&:clear_resources)
-    }
+    end
   end
 
   def self.config
@@ -141,6 +142,7 @@ require "graphiti/scoping/sort"
 require "graphiti/scoping/paginate"
 require "graphiti/scoping/extra_attributes"
 require "graphiti/scoping/filterable"
+require "graphiti/scoping/filter_group_validator"
 require "graphiti/scoping/default_filter"
 require "graphiti/scoping/filter"
 require "graphiti/stats/dsl"
@@ -206,6 +208,7 @@ module InstanceVariableOverride
     values
   end
 end
+
 class Object
   prepend InstanceVariableOverride
 end