graphiti-activegraph 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c387f138fe40ab7a304c5d587a0281258e2bf4e8304d7e0f0967295adeeef6d7
-  data.tar.gz: 6154b76796fef327e488b722d1075b05f448be9fd499e4b8525e58b3544399d0
+  metadata.gz: 96124388fd7da0f681746c33d199a96431291363f8ec3acd1a1ef2533fba7e3b
+  data.tar.gz: ba13ae0e3229a1e31a3e575d8d7b1e8c502a58d6d774ab3326b1936138e09d5c
 SHA512:
-  metadata.gz: 16cf1d53448e132be9dd3c45dc755f933f434114dc13d7414b3670becaf97c4696ba0c57e3f10075f984b60516d1286d3ccee01bad8baa4bc2bad1143ea1d1f4
-  data.tar.gz: 69a336f08b80474be83a0d0111e74a7cfbed451e5dc3ca2dba41318e3212c0e10565f799be327fdc9a26eed111b7ef1a7a46d90f24e85151a4f0d1e719b909d9
+  metadata.gz: 9985ef640559045360fc73f8dc41daf8ce09b43d92010cddff64bec9967e031cea3d806683865793c0dcca9f3e3092539cee81501b9bcc06e0a6f1bf4b0f1104
+  data.tar.gz: 711c568f287e85dc68d39fcf09b87425c7e8f1c61e20ce656578d1eee12bee57a2c62258a30f9df4e20380d9cebebb020c1951e557ff61d1eb82944dd0eeae64

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.0] - 2025-05-20
+
+### Added
+
+- **Graphiti Compatibility**: Added support for Graphiti versions up to 1.8.x, fixing previously broken sideloading behavior.
+
+### Fixed
+
+- **Serializer**: Resolved an issue where polymorphic resources were not functioning correctly in serializers.
+
 ## [1.1.0] - 2025-05-2
 
 ### Added

data/graphiti-activegraph.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'graphiti', '>= 1.6.4'
+  spec.add_dependency 'graphiti', '>= 1.6.4', '<= 1.8.1'
   spec.add_dependency 'activegraph', '>= 12.0.0.beta.5'
   spec.add_dependency 'parslet', '>= 2.0.0'
   spec.add_dependency 'activegraph-extensions', '>= 0.1.0'

data/lib/graphiti/active_graph/resource.rb

@@ -84,6 +84,10 @@ module Graphiti
         {}
       end
 
+      def all_models
+        polymorphic? ? self.class.children.map(&:model) : [model]
+      end
+
       private
 
       def scoping_class

data/lib/graphiti/active_graph/scoping/internal/sorting_aliases.rb

@@ -5,7 +5,7 @@ module Graphiti::ActiveGraph
       module SortingAliases
         def with_vars_for_sort
           [] unless add_extra_vars_to_query?
-          (deep_sort_keys + sort_keys) & resource.extra_attributes.keys
+          (deep_sort_keys + sort_keys) & resource.extra_attributes.keys - graphiti_query_vars.map(&:to_sym)
         end
 
         def add_extra_vars_to_query?
@@ -19,6 +19,16 @@ module Graphiti::ActiveGraph
         def sort_keys
           query.sorts.collect(&:keys).flatten
         end
+
+        def query
+          @opts[:query_obj]
+        end
+
+        private
+
+        def graphiti_query_vars
+          Graphiti.context.fetch(:with_vars, [])
+        end
       end
     end
   end

data/lib/graphiti/active_graph/serializer.rb

@@ -0,0 +1,15 @@
+module Graphiti::ActiveGraph
+  module Serializer
+    def jsonapi_resource_class
+      if polymorphic?
+        "#{jsonapi_type.to_s.singularize.camelize}Resource".constantize
+      else
+        @resource.class
+      end
+    end
+
+    def resource_class_name
+      @_type.to_s.singularize.camelize
+    end
+  end
+end

data/lib/graphiti/active_graph/sideload_resolve.rb

@@ -19,11 +19,29 @@ module Graphiti::ActiveGraph
     end
 
     def resolve
-      super.tap { |results| preload_extra_fields(results) }
+      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)
       requested_extra_fields.each do |extra_field_name|
         next unless preload_extra_field?(extra_field_name)

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/graphiti-activegraph.rb

@@ -24,6 +24,7 @@ Graphiti::Resource::Persistence.prepend Graphiti::ActiveGraph::Resources::Persis
 Graphiti::Resource::Interface::ClassMethods.prepend Graphiti::ActiveGraph::Resources::Interface::ClassMethods
 require 'graphiti'
 Graphiti::Scoping::Filter.prepend Graphiti::ActiveGraph::Scoping::Filter
+Graphiti::Serializer.prepend Graphiti::ActiveGraph::Serializer
 Graphiti::Util::SerializerRelationship.prepend Graphiti::ActiveGraph::Util::SerializerRelationship
 Graphiti::Util::SerializerAttribute.prepend Graphiti::ActiveGraph::Util::SerializerAttribute
 Graphiti::Util::RelationshipPayload.prepend Graphiti::ActiveGraph::Util::RelationshipPayload

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Hardik Joshi
 bindir: exe
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: activegraph
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +219,7 @@ files:
 - lib/graphiti/active_graph/scoping/internal/sort_normalizer.rb
 - lib/graphiti/active_graph/scoping/internal/sorting_aliases.rb
 - lib/graphiti/active_graph/scoping/internal/sparse_fields_eagerloading.rb
+- lib/graphiti/active_graph/serializer.rb
 - lib/graphiti/active_graph/sideload_resolve.rb
 - lib/graphiti/active_graph/util/parsers/rel_chain.rb
 - lib/graphiti/active_graph/util/relationship_payload.rb