graphiti-activegraph 1.3.1 → 1.3.2

data/lib/graphiti/active_graph/sideload_resolve.rb

@@ -1,119 +1,119 @@
-module Graphiti::ActiveGraph
-  module SideloadResolve
-    PRELOAD_METHOD_PREFIX = 'preload_'.freeze
-
-    def initialize(object, resource, query, opts = {})
-      @object = object
-      @resource = resource
-      @query = query
-      @opts = opts
-      @unpaginated_object = opts[:unpaginated_query].presence || @object
-
-      return if opts[:preloaded]
-      @object = @resource.around_scoping(@object, @query.hash) { |scope|
-        apply_scoping(scope, opts)
-      }
-    end
-
-    def resolve_sideloads(parents)
-    end
-
-    def resolve
-      resolve_with_callbacks.tap { |results| preload_extra_fields(results) }
-    end
-
-    private
-
-    def resolve_with_callbacks
-      if @query.zero_results?
-        []
-      else
-        resolved = broadcast_data { |payload|
-          @object = @resource.before_resolve(@object, @query)
-          payload[:results] = @resource.resolve(@object)
-          payload[:results]
-        }
-        resolved.compact!
-        assign_serializer(resolved)
-        yield resolved if block_given?
-        @opts[:after_resolve]&.call(resolved)
-        resolve_sideloads(resolved) unless @query.sideloads.empty?
-        resolved
-      end
-    end
-
-    def preload_extra_fields(results)
-      @query.extra_fields.each do |type, extra_field_names|
-        extra_field_names.each do |name|
-          next unless preload_extra_field?(type, name)
-
-          records_for_preload = collect_records_for_preload(type, results)
-          result_map = fetch_preloaded_data(type, name, records_for_preload)
-          assign_preloaded_data(records_for_preload, name, result_map)
-        end
-      end
-    end
-
-    def fetch_preloaded_data(type, extra_field_name, results)
-      resource_for_preload(type).model.public_send(default_preload_method(extra_field_name), results.pluck(:id).uniq)
-    end
-
-    def assign_preloaded_data(results, extra_field_name, result_map)
-      results.each { |r| r.public_send("#{extra_field_name}=", result_map[r.id]) }
-    end
-
-    def preload_extra_field?(type, extra_field_name)
-      resource = resource_for_preload(type)
-      resource && resource.extra_attribute?(extra_field_name) && resource.model.respond_to?(default_preload_method(extra_field_name))
-    end
-
-    def resource_for_preload(type)
-      return @resource if type == @resource.type
-
-      find_resource_in_included_associations(type) unless @query.sideloads.empty?
-    end
-
-    def find_resource_in_included_associations(type, sideload_query = @query)
-      sideload_query.sideloads.values.each do |sideload|
-        return sideload.resource if sideload.resource.type == type
-
-        resource = find_resource_in_included_associations(type, sideload)
-        return resource if resource
-      end
-
-      nil
-    end
-
-    def default_preload_method(extra_field_name)
-      "#{PRELOAD_METHOD_PREFIX}#{extra_field_name}"
-    end
-
-    def collect_records_for_preload(type, results)
-      base_records = resource_matches_type?(@resource, type) ? Array(results) : []
-      sideloaded_records = collect_sideloaded_records(Array(results), @query, type)
-      (base_records + sideloaded_records).flatten.compact.uniq
-    end
-
-    def collect_sideloaded_records(source_records, sideload_query, type)
-      return [] if source_records.empty? || sideload_query.sideloads.empty?
-
-      sideload_query.sideloads.flat_map do |sideload_name, nested_query|
-        associated_records = collect_associated_records(source_records, sideload_name)
-        matched_records = resource_matches_type?(nested_query.resource, type) ? associated_records : []
-        matched_records + collect_sideloaded_records(associated_records, nested_query, type)
-      end
-    end
-
-    def resource_matches_type?(resource, type)
-      resource&.type == type
-    end
-
-    def collect_associated_records(source_records, sideload_name)
-      source_records.flat_map do |parent|
-        next [] unless parent.respond_to?(sideload_name)
-
-        Array(parent.public_send(sideload_name)).compact
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module SideloadResolve
+    PRELOAD_METHOD_PREFIX = 'preload_'.freeze
+
+    def initialize(object, resource, query, opts = {})
+      @object = object
+      @resource = resource
+      @query = query
+      @opts = opts
+      @unpaginated_object = opts[:unpaginated_query].presence || @object
+
+      return if opts[:preloaded]
+      @object = @resource.around_scoping(@object, @query.hash) { |scope|
+        apply_scoping(scope, opts)
+      }
+    end
+
+    def resolve_sideloads(parents)
+    end
+
+    def resolve
+      resolve_with_callbacks.tap { |results| preload_extra_fields(results) }
+    end
+
+    private
+
+    def resolve_with_callbacks
+      if @query.zero_results?
+        []
+      else
+        resolved = broadcast_data { |payload|
+          @object = @resource.before_resolve(@object, @query)
+          payload[:results] = @resource.resolve(@object)
+          payload[:results]
+        }
+        resolved.compact!
+        assign_serializer(resolved)
+        yield resolved if block_given?
+        @opts[:after_resolve]&.call(resolved)
+        resolve_sideloads(resolved) unless @query.sideloads.empty?
+        resolved
+      end
+    end
+
+    def preload_extra_fields(results)
+      @query.extra_fields.each do |type, extra_field_names|
+        extra_field_names.each do |name|
+          next unless preload_extra_field?(type, name)
+
+          records_for_preload = collect_records_for_preload(type, results)
+          result_map = fetch_preloaded_data(type, name, records_for_preload)
+          assign_preloaded_data(records_for_preload, name, result_map)
+        end
+      end
+    end
+
+    def fetch_preloaded_data(type, extra_field_name, results)
+      resource_for_preload(type).model.public_send(default_preload_method(extra_field_name), results.pluck(:id).uniq)
+    end
+
+    def assign_preloaded_data(results, extra_field_name, result_map)
+      results.each { |r| r.public_send("#{extra_field_name}=", result_map[r.id]) }
+    end
+
+    def preload_extra_field?(type, extra_field_name)
+      resource = resource_for_preload(type)
+      resource && resource.extra_attribute?(extra_field_name) && resource.model.respond_to?(default_preload_method(extra_field_name))
+    end
+
+    def resource_for_preload(type)
+      return @resource if type == @resource.type
+
+      find_resource_in_included_associations(type) unless @query.sideloads.empty?
+    end
+
+    def find_resource_in_included_associations(type, sideload_query = @query)
+      sideload_query.sideloads.values.each do |sideload|
+        return sideload.resource if sideload.resource.type == type
+
+        resource = find_resource_in_included_associations(type, sideload)
+        return resource if resource
+      end
+
+      nil
+    end
+
+    def default_preload_method(extra_field_name)
+      "#{PRELOAD_METHOD_PREFIX}#{extra_field_name}"
+    end
+
+    def collect_records_for_preload(type, results)
+      base_records = resource_matches_type?(@resource, type) ? Array(results) : []
+      sideloaded_records = collect_sideloaded_records(Array(results), @query, type)
+      (base_records + sideloaded_records).flatten.compact.uniq
+    end
+
+    def collect_sideloaded_records(source_records, sideload_query, type)
+      return [] if source_records.empty? || sideload_query.sideloads.empty?
+
+      sideload_query.sideloads.flat_map do |sideload_name, nested_query|
+        associated_records = collect_associated_records(source_records, sideload_name)
+        matched_records = resource_matches_type?(nested_query.resource, type) ? associated_records : []
+        matched_records + collect_sideloaded_records(associated_records, nested_query, type)
+      end
+    end
+
+    def resource_matches_type?(resource, type)
+      resource&.type == type
+    end
+
+    def collect_associated_records(source_records, sideload_name)
+      source_records.flat_map do |parent|
+        next [] unless parent.respond_to?(sideload_name)
+
+        Array(parent.public_send(sideload_name)).compact
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/util/parsers/rel_chain.rb

@@ -1,27 +1,27 @@
-module Graphiti::ActiveGraph
-  module Util
-    module Parsers
-      class RelChain < Parslet::Parser
-        VAR_CHAR = 'a-z_'
-
-        rule(:asterisk) { str('*') }
-        rule(:range) { str('..') }
-        rule(:dot) { str('.') }
-        rule(:none) { str('') }
-        rule(:number) { match('[\d]').repeat(1) }
-        rule(:number?) { number | none }
-        rule(:identifier) { match("[#{VAR_CHAR}]") >> match("[#{VAR_CHAR}0-9]").repeat(0) }
-        rule(:identifier?) { identifier | none }
-        rule(:rel_name) { identifier?.as(:rel_name) }
-        rule(:length) { asterisk.as(:ast) >> number?.maybe.as(:min) >> range.as(:range).maybe >> number?.maybe.as(:max) }
-        rule(:rel) { rel_name >> length.maybe }
-
-        rule(:rel_chain) { rel >> (dot >> rel).repeat(0) }
-        root(:rel_chain)
-
-        rule(:limit) { number?.as(:limit_digit) >> asterisk.as(:limit_ast) }
-        rule(:rel_param_rule) { limit.maybe.as(:limit_part) >> rel_name >> length.maybe.as(:length_part) }
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Util
+    module Parsers
+      class RelChain < Parslet::Parser
+        VAR_CHAR = 'a-z_'
+
+        rule(:asterisk) { str('*') }
+        rule(:range) { str('..') }
+        rule(:dot) { str('.') }
+        rule(:none) { str('') }
+        rule(:number) { match('[\d]').repeat(1) }
+        rule(:number?) { number | none }
+        rule(:identifier) { match("[#{VAR_CHAR}]") >> match("[#{VAR_CHAR}0-9]").repeat(0) }
+        rule(:identifier?) { identifier | none }
+        rule(:rel_name) { identifier?.as(:rel_name) }
+        rule(:length) { asterisk.as(:ast) >> number?.maybe.as(:min) >> range.as(:range).maybe >> number?.maybe.as(:max) }
+        rule(:rel) { rel_name >> length.maybe }
+
+        rule(:rel_chain) { rel >> (dot >> rel).repeat(0) }
+        root(:rel_chain)
+
+        rule(:limit) { number?.as(:limit_digit) >> asterisk.as(:limit_ast) }
+        rule(:rel_param_rule) { limit.maybe.as(:limit_part) >> rel_name >> length.maybe.as(:length_part) }
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/util/relationship_payload.rb

@@ -1,33 +1,33 @@
-module Graphiti::ActiveGraph
-  module Util
-    module RelationshipPayload
-      def payload_for(sideload, relationship_payload)
-        type = relationship_payload[:meta][:jsonapi_type]&.to_sym
-
-        # For polymorphic *sideloads*, grab the correct child sideload
-        if sideload.resource.type != type && sideload.type == :polymorphic_belongs_to
-          sideload = sideload.child_for_type!(type)
-        end
-
-        # For polymorphic *resources*, grab the correct child resource
-        resource = sideload.resource
-        if resource.type != type && resource.polymorphic?
-          resource = resource.class.resource_for_type(type).new
-        end
-
-        relationship_payload[:meta][:method] ||= :update
-
-        {
-          resource: resource,
-          sideload: sideload,
-          is_polymorphic: sideload.polymorphic_child?,
-          primary_key: sideload.primary_key,
-          foreign_key: sideload.foreign_key,
-          attributes: relationship_payload[:attributes],
-          meta: relationship_payload[:meta],
-          relationships: relationship_payload[:relationships]
-        }
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Util
+    module RelationshipPayload
+      def payload_for(sideload, relationship_payload)
+        type = relationship_payload[:meta][:jsonapi_type]&.to_sym
+
+        # For polymorphic *sideloads*, grab the correct child sideload
+        if sideload.resource.type != type && sideload.type == :polymorphic_belongs_to
+          sideload = sideload.child_for_type!(type)
+        end
+
+        # For polymorphic *resources*, grab the correct child resource
+        resource = sideload.resource
+        if resource.type != type && resource.polymorphic?
+          resource = resource.class.resource_for_type(type).new
+        end
+
+        relationship_payload[:meta][:method] ||= :update
+
+        {
+          resource: resource,
+          sideload: sideload,
+          is_polymorphic: sideload.polymorphic_child?,
+          primary_key: sideload.primary_key,
+          foreign_key: sideload.foreign_key,
+          attributes: relationship_payload[:attributes],
+          meta: relationship_payload[:meta],
+          relationships: relationship_payload[:relationships]
+        }
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/util/serializer_attribute.rb

@@ -1,17 +1,17 @@
-module Graphiti::ActiveGraph
-  module Util
-    module SerializerAttribute
-      def wrap_proc(inner)
-        typecast_ref = typecast(Graphiti::Types[@attr[:type]][:read])
-        ->(serializer_instance = nil) {
-          val = serializer_instance.instance_eval(&inner)
-          if Graphiti.config.typecast_reads && inner.nil?
-            typecast_ref.call(val)
-          else
-            val
-          end
-        }
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Util
+    module SerializerAttribute
+      def wrap_proc(inner)
+        typecast_ref = typecast(Graphiti::Types[@attr[:type]][:read])
+        ->(serializer_instance = nil) {
+          val = serializer_instance.instance_eval(&inner)
+          if Graphiti.config.typecast_reads && inner.nil?
+            typecast_ref.call(val)
+          else
+            val
+          end
+        }
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/util/serializer_relationship.rb

@@ -1,28 +1,28 @@
-module Graphiti::ActiveGraph
-  module Util
-    module SerializerRelationship
-      def data_proc
-        sideload_ref = @sideload
-        ->(_) {
-          # use custom assigned sideload if it is specified via "assign_each_proc"
-          # otherwise retrieve sideload using normal getter on parent object
-          records = if custom_proc = sideload_ref.assign_each_proc
-                      custom_proc.call(@object)
-                    else
-                      @object.public_send(sideload_ref.association_name)
-                    end
-
-          if records
-            if records.respond_to?(:to_ary)
-              records.each { |r| sideload_ref.resource.decorate_record(r) }
-            else
-              sideload_ref.resource.decorate_record(records)
-            end
-
-            records
-          end
-        }
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Util
+    module SerializerRelationship
+      def data_proc
+        sideload_ref = @sideload
+        ->(_) {
+          # use custom assigned sideload if it is specified via "assign_each_proc"
+          # otherwise retrieve sideload using normal getter on parent object
+          records = if custom_proc = sideload_ref.assign_each_proc
+                      custom_proc.call(@object)
+                    else
+                      @object.public_send(sideload_ref.association_name)
+                    end
+
+          if records
+            if records.respond_to?(:to_ary)
+              records.each { |r| sideload_ref.resource.decorate_record(r) }
+            else
+              sideload_ref.resource.decorate_record(records)
+            end
+
+            records
+          end
+        }
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/util/transformers/relation_param.rb

@@ -1,56 +1,56 @@
-module Graphiti::ActiveGraph
-  module Util
-    module Transformers
-      class RelationParam
-        attr_reader :map
-
-        def initialize(relation_param_str)
-          @map = Graphiti::ActiveGraph::Util::Parsers::RelChain.new.rel_param_rule.parse(relation_param_str.to_s)
-        end
-
-        def split_rel_length(retain_rel_limit)
-          rel_name_part = if retain_rel_limit
-                            (rel_limit || '') + rel_name
-                          else
-                            rel_name_sym
-                          end
-          [rel_name_part.to_sym, rel_length_number]
-        end
-
-        def rel_name_n_length
-          "#{rel_name}#{rel_length}"
-        end
-
-        def rel_limit(limit_part = nil)
-          join(limit_part || map[:limit_part])
-        end
-
-        def rel_limit_number
-          rel_limit(map[:limit_part]&.except(:limit_ast))
-        end
-
-        def rel_name
-          map[:rel_name].to_s
-        end
-
-        def rel_name_sym
-          rel_name.to_sym
-        end
-
-        def rel_length(length_part = nil)
-          join(length_part || map[:length_part])
-        end
-
-        def rel_length_number
-          rel_length(map[:length_part]&.except(:ast))
-        end
-
-        private
-
-        def join(hash)
-          hash&.values&.map(&:to_s)&.join
-        end
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Util
+    module Transformers
+      class RelationParam
+        attr_reader :map
+
+        def initialize(relation_param_str)
+          @map = Graphiti::ActiveGraph::Util::Parsers::RelChain.new.rel_param_rule.parse(relation_param_str.to_s)
+        end
+
+        def split_rel_length(retain_rel_limit)
+          rel_name_part = if retain_rel_limit
+                            (rel_limit || '') + rel_name
+                          else
+                            rel_name_sym
+                          end
+          [rel_name_part.to_sym, rel_length_number]
+        end
+
+        def rel_name_n_length
+          "#{rel_name}#{rel_length}"
+        end
+
+        def rel_limit(limit_part = nil)
+          join(limit_part || map[:limit_part])
+        end
+
+        def rel_limit_number
+          rel_limit(map[:limit_part]&.except(:limit_ast))
+        end
+
+        def rel_name
+          map[:rel_name].to_s
+        end
+
+        def rel_name_sym
+          rel_name.to_sym
+        end
+
+        def rel_length(length_part = nil)
+          join(length_part || map[:length_part])
+        end
+
+        def rel_length_number
+          rel_length(map[:length_part]&.except(:ast))
+        end
+
+        private
+
+        def join(hash)
+          hash&.values&.map(&:to_s)&.join
+        end
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
-module Graphiti
-  module ActiveGraph
-    VERSION = '1.3.1'
-  end
-end
+module Graphiti
+  module ActiveGraph
+    VERSION = '1.3.2'
+  end
+end

data/lib/graphiti/sidepost_configuration.rb

@@ -1,9 +1,9 @@
-module Graphiti
-  module SidepostConfiguration
-    extend ActiveSupport::Concern
-
-    included do
-      attr_accessor :allow_sidepost
-    end
-  end
-end
+module Graphiti
+  module SidepostConfiguration
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :allow_sidepost
+    end
+  end
+end