activegraph-extensions 0.0.3-java → 0.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb2be9a5d8f1afc55b3888e1afc33940a2eb709de5afae7144f25992d2d0873
-  data.tar.gz: 23a259b8d2dffd7e6f73e552275fe0d9b9849bfcb80bc437be21c6e32944d5fe
+  metadata.gz: 822c83b14e7ebc57f5b13232de171a80a1b954d1c1777853e73299950ddf94b8
+  data.tar.gz: 5dd31ca0ddf3cec93e366cab32fc026565045ce8d24680ff2aff10f4df24b4cb
 SHA512:
-  metadata.gz: 55a7e0e10065e825acef207348a9277162af5d6ec81b158b957b266e37ba0fa98c6aa620cca84a31b253a58574880742a13d7f7f7cda576fd1f7dab3e60eda15
-  data.tar.gz: 679aa1b9d1ad94633506b1938cb3d50ea3bd2af2bd9392f352370f5d4410476cabf1a327bae1d6cafdbd18f5b62650b94584c826ea65cb4bb61be1a035eaa57a
+  metadata.gz: 58f75afdac57dfe835551242707ba89d248de6f073052e0fb08edb4010e30f24d9f383613ff3c1aa46117a5b35448b5663914971e89cf2b3bb24b2763c3669b2
+  data.tar.gz: 9062f2a9c43e2da8b42178c36c6dba95a0b3946a94afbdc56908cd49673548864024e7885becffa6d8686a8798d2333a7d7d3ef858e179291335f35a80502533

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading/association_limiting.rb

@@ -6,25 +6,28 @@ module ActiveGraphExtensions
       module QueryProxyEagerLoading
         module AssociationLimiting
           def self.included(base)
-            base.attr_reader(:default_assoc_limit)
+            base.attr_reader(:max_page_size)
+            base.attr_reader(:paginate)
           end
 
           private
 
           def rel_collection_str(path)
-            limit = association_limit(path)
             collection_name = "[#{relationship_name(path)}, #{escape(path_name(path))}] "
-            collection = limit.present? ? "apoc.agg.slice(#{collection_name}, 0, #{limit})" : "collect(#{collection_name})"
+            collection = apply_limit?(path) ? "apoc.agg.slice(#{collection_name}, 0, #{association_limit(path)})" : "collect(#{collection_name})"
             "#{collection} AS #{escape("#{path_name(path)}_collection")}"
           end
 
-          def relationship_name(path)
-          if path.last.rel_length
-            "last(relationships(#{escape("#{path_name(path)}_path")}))"
-          else
-            escape("#{path_name(path)}_rel")
+          def apply_limit?(path)
+            !multipath?(path) && (path.last&.association_limit || paginate)
           end
 
+          def relationship_name(path)
+            if path.last.rel_length
+              "last(relationships(#{escape("#{path_name(path)}_path")}))"
+            else
+              escape("#{path_name(path)}_rel")
+            end
           end
 
           def convert_to_list(collection_name, limit)
@@ -32,10 +35,8 @@ module ActiveGraphExtensions
           end
 
           def association_limit(path)
-            return if multipath?(path)
-
             limit = path.last&.association_limit
-            limit.blank? || limit.to_i > default_assoc_limit ? default_assoc_limit : limit
+            limit.blank? || limit.to_i > max_page_size ? max_page_size : limit
           end
 
           def with_association_query_part(base_query, path, previous_with_vars)

data/lib/active_graph_extensions/node/query/query_proxy_eager_loading.rb

@@ -12,7 +12,8 @@ module ActiveGraphExtensions
         end
 
         def with_ordered_associations(spec, order, opts = {})
-          @default_assoc_limit = opts[:default_assoc_limit]
+          @max_page_size = opts[:max_page_size]
+          @paginate = opts[:paginate]
           @with_vars = opts[:with_vars]
           @order_spec = order.with_indifferent_access unless spec.empty?
           @opts = opts

data/lib/active_graph_extensions/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraphExtensions
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: java
 authors:
 - Amit Suryavanshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: parslet
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: activegraph
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: guard
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: guard-rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: guard-rubocop
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,8 +87,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
   name: neo4j-rake_tasks
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,8 +101,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: os
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,8 +115,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: pry
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,8 +129,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
   name: railties
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,8 +143,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,8 +157,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.56.0
   name: rubocop
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,8 +171,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: yard
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,8 +185,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: dryspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,8 +199,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.10'
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Additional features to activegraph