activegraph-extensions 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28feac8e1598634606281d5dd8b70f019ac3038682abc635a5ef1d92c0e8b1e
-  data.tar.gz: 1c021a54e63267817077da6942f9fa4f0c61437e112de2677f54db7f440f653e
+  metadata.gz: a2e80d374894f84875bb6c22ac207e14a15b617006b0ea83501ed24bda396b67
+  data.tar.gz: 39b1d0336158575caa6541aae2b134252d6ee13b4b1e096e24dea347be9e8568
 SHA512:
-  metadata.gz: e6094af1c1c28ea6af47650e7b8399703e6c356addc72ac454b5c862c92fea563e284a5b80a96435cb41c9646a5f32f711cb0e314aea7a01c838d9476fe3d64b
-  data.tar.gz: 7e56b8b83defdf3d9b21887dbecad56eb21927ff5c72a742b4f477bc2ad422aa24ebc135ff054a8398e18ebae6fe83642cb31f9cd526adbce3b2ddd38ab2bddc
+  metadata.gz: 25e8d8883488b355195d4bbbb38437b4d00a9c71913808c37862eabbc6e3a3cbeb58fc982f24515097dc264e6b29347377fd799aa022bf3b05980fbff0841df6
+  data.tar.gz: 6e8ca396f59cbb0b74b0e5bb53ab83d7ec7f67240788e39f82f7a2b15bdf5e4f54a3194a1553eda19f264d0b91a7f58bb32bd802c812a087fe90895ecf705958

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

@@ -41,10 +41,11 @@ module ActiveGraphExtensions
 
         def query_from_association_tree
           previous_with_vars = defalut_previous_with_vars
-          with_associations_tree.paths.inject(query_as(identity).with(base_query_with_vars)) do |query, path|
-            with_association_query_part(query, path, previous_with_vars).tap do
-              previous_with_vars << var_fix(path_name(path), :collection)
-            end
+
+          sorted_association_paths.inject(query_as(identity).with(base_query_with_vars)) do |query, path|
+            result = with_association_query_part(query, path, previous_with_vars)
+            previous_with_vars << var_fix(path_name(path), :collection)
+            path_name(path) == @early_pagination_path ? apply_early_order_skip_limit(result) : result
           end
         end
 
@@ -52,6 +53,40 @@ module ActiveGraphExtensions
           @with_vars&.dup || []
         end
 
+        def sorted_association_paths
+          return with_associations_tree.paths if skip_order?
+
+          priority, remaining = sort_paths
+          @early_pagination_path = find_early_pagination_path(priority)
+          priority + remaining
+        end
+
+        def sort_paths
+          ordered_names = path_names.select { |name| order_clause_for_query(name).present? }
+
+          with_associations_tree.paths.partition do |path|
+            name = path_name(path)
+            ordered_names.any? { |ordered_name| ordered_name == name || ordered_name.start_with?("#{name}.") }
+          end
+        end
+
+        def find_early_pagination_path(priority_paths)
+          return nil if skip_order? || priority_paths.blank?
+
+          path_name(priority_paths.last)
+        end
+
+        def apply_early_order_skip_limit(query)
+          @pagination_applied = true
+          query_from_chain(@postponed_chain, apply_order_from_spec(query), identity).break
+        end
+
+        def apply_order_from_spec(query)
+          query.order(
+            (@order_spec || []).flat_map { |key, order_specs| order_specs.map(&method(:order_clause).curry.call(key)) }
+          )
+        end
+
         def base_query_with_vars
           [ensure_distinct(identity)] + (@with_vars || [])
         end
@@ -93,11 +128,11 @@ module ActiveGraphExtensions
         end
 
         def before_pluck(query)
-          return query if skip_order? && !include_with_path_length?
-          base_query = query.order(
-            (@order_spec || []).flat_map { |key, order_specs| order_specs.map(&method(:order_clause).curry.call(key)) }
-          )
-          query_from_chain(@postponed_chain, base_query, identity)
+          return query if (skip_order? || @pagination_applied) && !include_with_path_length?
+
+          base_query = apply_order_from_spec(query)
+          remaining_chain = @pagination_applied ? @postponed_chain.select { |link| link.clause == :order } : @postponed_chain
+          query_from_chain(remaining_chain, base_query, identity)
         end
 
         def node_aliase_for_collection(key, order_spec)
@@ -119,7 +154,7 @@ module ActiveGraphExtensions
         CLAUSES_TO_POSTPONE = %i[limit order skip].freeze
 
         def include_with_path_length?(path = @with_associations_tree)
-          path.present? && (path.rel_length.present? || path.any? { |_, val| include_with_path_length?(val) })
+          !path.nil? && (path.rel_length.present? || path.any? { |_, val| include_with_path_length?(val) })
         end
 
         def chain

data/lib/active_graph_extensions/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraphExtensions
-  VERSION = '0.1.0'
-end
+  VERSION = '0.2.0'
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Amit Suryavanshi
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -232,6 +233,7 @@ homepage: https://github.com/neo4jrb/activegraph-extensions/
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--title"
@@ -253,7 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Additional features to activegraph
 test_files: []