graphiti-activegraph 0.1.23 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88ca37172c5b507a37ae3744f0a2ac86485b47f5494f0e080f6dbe7e7137738
-  data.tar.gz: b78b22b43bc9913ded8262a5d5d16fa2a6d6d5dbc0d8f4b0cfa094231289f858
+  metadata.gz: 91f9eb76f0b56c276cf1ec4fbef4d535e768c85dbee0d503c3bf9e47c492b509
+  data.tar.gz: 9ead092210d92a237fed63c396cf302730fffe601d1fcb0a00a1265563cc0c66
 SHA512:
-  metadata.gz: 663ff44a72d8f833f5156e3dd0d3a960c3c77220a0b9191b20afc15104013d267f92c9ff1ed22927f405199c3bc074fa92bbed4d5f57063150a778f7efe5dcc9
-  data.tar.gz: 9f19e81f5b2c7fd70585a3ef493a83c06080df69593ae23bd56fd723950ef87a2ecd4c05a6c475c87e1efc627a256aad4597a0c8b77fc731ad7a04b380030892
+  metadata.gz: 48334374bd34917e110d55156847d8cc3ba389e45dc76bb7d3db1df2ca8cc59cda5a46ff23c79aff298e0700201d743d3ca04d53b0bb4ae843a3db037c13bff9
+  data.tar.gz: cb3ee1de2754dcd3ddfcccc84970aaffc21fa8c2c05e6518299c6bd55c7a4f52830462a9a092152eeb93ece42e3476532094d41bf41d57683eb43d34cf9b1f64

data/.gitignore

@@ -45,7 +45,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+/Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

data/CHANGELOG.md

@@ -44,12 +44,24 @@ Fixes:
 
 - when rendering preloaded resources, we were not applying scoping. Now we are skipping around_scoping callback too.
 
-## 0.1.22 (29-04-2024)
+## 0.1.23 (29-04-2024)
 
 Features:
 
 - Added support for UUID
 
+## 0.1.24 (18-06-2024)
+
+Features:
+
+- Added preliminary support for Sideload backed by function instead of model association
+
+## 0.1.25 (04-12-2024)
+
+Features:
+
+- Added support to preload extra_fields for the main resource, replacing N+1 queries with a single query. This does not apply to sideloaded resources.
+
 <!-- ### [version (DD-MM-YYYY)] -->
 <!-- Breaking changes:-->
 <!-- Features:-->

data/graphiti-activegraph.gemspec

@@ -25,6 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "faraday", "~> 0.15"
   spec.add_development_dependency "kaminari", "~> 0.17"
   spec.add_development_dependency "bundler"
+  # dependency conflict introduced during runtime
+  # jar-dependencies is a default gem in JRuby and also a dependency in neo4j-ruby-driver
+  spec.add_development_dependency "jar-dependencies", "~> 0.4.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
   spec.add_development_dependency "standard"

data/lib/graphiti/active_graph/adapters/active_graph/function_sideload.rb

@@ -0,0 +1,15 @@
+class Graphiti::ActiveGraph::Adapters::ActiveGraph::FunctionSideload < Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload
+  class_attribute :function_proc, :param_proc
+
+  def association?
+    false
+  end
+
+  def self.function_proc(&blk)
+    self.function_proc = blk
+  end
+
+  def self.param_proc(&blk)
+    self.param_proc = blk
+  end
+end

data/lib/graphiti/active_graph/query.rb

@@ -45,10 +45,5 @@ module Graphiti::ActiveGraph
     def sort_criteria(sort)
       sort.split(',').map(&method(:sort_hash)).map(&method(:parse_sort_criteria_hash))
     end
-
-    def update_include_hash(authorized_include_param)
-      @include_hash = authorized_include_param
-      @sideloads = nil
-    end
   end
 end

data/lib/graphiti/active_graph/resource.rb

@@ -23,6 +23,10 @@ module Graphiti
 
       def guard_nil_id!(params)
       end
+
+      def extra_attribute?(name)
+        extra_attributes.has_key?(name)
+      end
     end
 
     module ResourceInstanceMethods
@@ -30,6 +34,10 @@ module Graphiti
         self.class.relation_resource?
       end
 
+      def extra_attribute?(name)
+        self.class.extra_attribute?(name)
+      end
+
       def sideload_name_arr(query)
         query.sideloads.keys.map(&:to_sym)
       end

data/lib/graphiti/active_graph/sideload_resolve.rb

@@ -1,5 +1,7 @@
 module Graphiti::ActiveGraph
   module SideloadResolve
+    PRELOAD_METHOD_PREFIX = 'preload_'.freeze
+
     def initialize(object, resource, query, opts = {})
       @object = object
       @resource = resource
@@ -15,5 +17,40 @@ module Graphiti::ActiveGraph
 
     def resolve_sideloads(parents)
     end
+
+    def resolve
+      super.tap { |results| preload_extra_fields(results) }
+    end
+
+    private
+
+    def preload_extra_fields(results)
+      requested_extra_fields.each do |extra_field_name|
+        next unless preload_extra_field?(extra_field_name)
+
+        result_map = fetch_preloaded_data(extra_field_name, results)
+        assign_preloaded_data(results, extra_field_name, result_map)
+      end
+    end
+
+    def requested_extra_fields
+      @query.extra_fields[@resource.type] || []
+    end
+
+    def fetch_preloaded_data(extra_field_name, results)
+      @resource.model.public_send(default_preload_method(extra_field_name), results.pluck(:id))
+    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?(extra_field_name)
+      @resource.extra_attribute?(extra_field_name) && @resource.model.respond_to?(default_preload_method(extra_field_name))
+    end
+
+    def default_preload_method(extra_field_name)
+      "#{PRELOAD_METHOD_PREFIX}#{extra_field_name}"
+    end
   end
 end

data/lib/graphiti/active_graph/version.rb

@@ -1,5 +1,5 @@
 module Graphiti
   module ActiveGraph
-    VERSION = '0.1.23'
+    VERSION = '0.1.25'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-activegraph
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.25
 platform: ruby
 authors:
 - Hardik Joshi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  name: jar-dependencies
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -194,6 +208,7 @@ files:
 - graphiti-activegraph.gemspec
 - lib/graphiti-activegraph.rb
 - lib/graphiti/active_graph/adapters/active_graph.rb
+- lib/graphiti/active_graph/adapters/active_graph/function_sideload.rb
 - lib/graphiti/active_graph/adapters/active_graph/has_many_sideload.rb
 - lib/graphiti/active_graph/adapters/active_graph/has_one_sideload.rb
 - lib/graphiti/active_graph/adapters/active_graph/polymorphic_belongs_to.rb