activegraph 11.1.0.alpha.4 → 11.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314c68d13c5f37c277a4a53b84f58dd054ae5d2be176e8e575dc92a44099124f
-  data.tar.gz: 36e153d37023168ac51a7f6f1b26854c3588fa7394f796f04720fedf619d601e
+  metadata.gz: 4aade7db7557b1222b78e048550606354b0707a60c9375359a4f945b702763c2
+  data.tar.gz: a22b396cdc491118ecbaf947ac9e00d9ea088fe0df5afa51a3a38b7f085db9ff
 SHA512:
-  metadata.gz: 7487ba2280bab3230701541f00da5133af8ab6760454a58fdf06c2ff20340a14734577b026a1dffe232c75248b3cd821ebea42a9fbd4c581a3ef5e296c1a2d1f
-  data.tar.gz: 4f03ea6939f779b78c3cb0141d50553894d4b2baf98f408ecc3f3cb91098b7df64abe577fe8586283cb499de6c4fa674a8f4c756388f5df64c08887c0b9abd7f
+  metadata.gz: 663bc1323338cc7261cb2281b5ad6a86d794baed1fd2dc82a08f8d1b5eae593a151927529330425d8ffdc71adb17e8a7c70aa3872c63641cd2d77dcfe46016cc
+  data.tar.gz: c894eff95679b5982e418dccff5deb160ff41a46e661bee2f8278b230ab59fe20befc8aed83b8144dd112485df98d61c6fa1f60d226f63a1df3db6cd34b4a9a4

data/lib/active_graph/node/has_n.rb

@@ -34,8 +34,16 @@ module ActiveGraph::Node
 
       include Enumerable
 
-      def each(&block)
-        result_nodes.each(&block)
+      def each(node = true, rel = nil, &block)
+        return [] unless node || rel
+
+        if node && rel
+          result_nodes.zip(rels)
+        elsif node
+          result_nodes
+        else
+          rels
+        end.each(&block)
       end
 
       def each_rel(&block)
@@ -103,11 +111,11 @@ module ActiveGraph::Node
 
       def add_to_cache(object, rel = nil)
         (@cached_rels ||= []) << rel if rel
-        (@cached_result ||= []).tap { |results| results << object unless results.include?(object) }
+        (@cached_result ||= []).tap { |results| results << object if object && !results.include?(object) }
       end
 
       def rels
-        @cached_rels || super
+        @cached_rels || super.tap { |rels| rels.each { |rel| add_to_cache(nil, rel)  } }
       end
 
       def cache_query_proxy_result

data/lib/active_graph/node/query/query_proxy_methods.rb

@@ -48,7 +48,7 @@ module ActiveGraph
         end
 
         def propagate_context(query_proxy)
-          query_proxy.instance_variable_set(:@distinct, @distinct)
+          [:@distinct, :@rel_var].each { |var| query_proxy.instance_variable_set(var, instance_variable_get(var)) }
         end
 
         # @return [Integer] number of nodes of this class

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.1.0.alpha.4'
+  VERSION = '11.1.0.beta.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.1.0.alpha.4
+  version: 11.1.0.beta.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby