neo4j 5.0.9 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08e5617a201f316c50638b7c32b36d9eaa2f9715
-  data.tar.gz: bef33cd2fe6fe71d2a961901faab8144da2780a8
+  metadata.gz: 70f94d10009b5997fd9e16e1c54d3d8aba81e014
+  data.tar.gz: 9b6e7e245073f7f297c412c974a2593c9814dad2
 SHA512:
-  metadata.gz: 1d649c9ddcf97089ac43a4c2f716ed0b753dd4a223ef47979d61d3ea5ae02f36c4bca6ed493722b4be44f086899a1165e85458e7ca309f5f974865055becfabc
-  data.tar.gz: 4acfd71a5ea387a1a2e3f5ed712c435fecbf96d33fd598708429bf359552141cae0c565d415773dd1078c1fee8e244f2d6828236a9fff1af3c2d176dbc382aa6
+  metadata.gz: 118af5e336d8da2859e2e784df7af9dc7fdf4d1bd4c30cc2e33e7df1a76ad32defae44313d5fc03dfa10884079a5fbc0bd20932df6ae68c122eb2e0a4af4a10e
+  data.tar.gz: 28311d4abb96271ee9abdf5a7a3c6df7ec2e36c4c1481ecd21464b71fa784e3822d5d9d7ff4651dcbc6e70d60e05138caf74cb249acac74c935fa05854aec8fe

data/lib/neo4j/active_node/has_n.rb

@@ -54,9 +54,6 @@ module Neo4j::ActiveNode
 
       def cache_query_proxy_result
         @query_proxy.to_a.tap do |result|
-          result.each do |object|
-            object.instance_variable_set('@association_proxy', self)
-          end
           cache_result(result)
         end
       end
@@ -128,10 +125,10 @@ module Neo4j::ActiveNode
       name = name.to_sym
       hash = [name, options.values_at(:node, :rel, :labels)].hash
       association_proxy_cache_fetch(hash) do
-        if previous_association_proxy = self.instance_variable_get('@association_proxy')
-          result_by_previous_id = previous_association_proxy_results_by_previous_id(previous_association_proxy, name)
+        if result_cache = self.instance_variable_get('@source_query_proxy_result_cache')
+          result_by_previous_id = previous_proxy_results_by_previous_id(result_cache, name)
 
-          previous_association_proxy.result.inject(nil) do |proxy_to_return, object|
+          result_cache.inject(nil) do |proxy_to_return, object|
             proxy = fresh_association_proxy(name, options, result_by_previous_id[object.neo_id])
 
             object.association_proxy_cache[hash] = proxy
@@ -150,9 +147,9 @@ module Neo4j::ActiveNode
       AssociationProxy.new(association_query_proxy(name, options), cached_result)
     end
 
-    def previous_association_proxy_results_by_previous_id(association_proxy, association_name)
-      query_proxy = self.class.as(:previous).where(neo_id: association_proxy.result.map(&:neo_id))
-      query_proxy = self.class.send(:association_query_proxy, association_name, previous_query_proxy: query_proxy, node: :next)
+    def previous_proxy_results_by_previous_id(result_cache, association_name)
+      query_proxy = self.class.as(:previous).where(neo_id: result_cache.map(&:neo_id))
+      query_proxy = self.class.send(:association_query_proxy, association_name, previous_query_proxy: query_proxy, node: :next, optional: true)
 
       Hash[*query_proxy.pluck('ID(previous)', 'collect(next)').flatten(1)]
     end
@@ -345,7 +342,7 @@ module Neo4j::ActiveNode
 
       def association_query_proxy(name, options = {})
         previous_query_proxy = options[:previous_query_proxy] || current_scope
-        query_proxy = previous_query_proxy || default_association_query_proxy(name)
+        query_proxy = previous_query_proxy || default_association_query_proxy
         Neo4j::ActiveNode::Query::QueryProxy.new(association_target_class(name),
                                                  associations[name],
                                                  {session: neo4j_session,
@@ -380,7 +377,7 @@ module Neo4j::ActiveNode
         target_classes_or_nil
       end
 
-      def default_association_query_proxy(name)
+      def default_association_query_proxy
         Neo4j::ActiveNode::Query::QueryProxy.new("::#{self.name}".constantize,
                                                  nil,
                                                  session: neo4j_session,

data/lib/neo4j/active_node/query/query_proxy_eager_loading.rb

@@ -2,38 +2,37 @@ module Neo4j
   module ActiveNode
     module Query
       module QueryProxyEagerLoading
-        def initialize(model, association = nil, options = {})
-          @associations_spec = []
-
-          super
-        end
-
         def each(node = true, rel = nil, &block)
-          if @associations_spec.size > 0
-            return_object_clause = '[' + @associations_spec.map { |n| "collect(#{n})" }.join(',') + ']'
-            query_from_association_spec.pluck(identity, return_object_clause).map do |record, eager_data|
-              eager_data.each_with_index do |eager_records, index|
-                record.association_proxy(@associations_spec[index]).cache_result(eager_records)
-              end
-
-              block.call(record)
+          return super if with_associations_spec.size.zero?
+
+          query_from_association_spec.pluck(identity, with_associations_return_clause).map do |record, eager_data|
+            eager_data.each_with_index do |eager_records, index|
+              record.association_proxy(with_associations_spec[index]).cache_result(eager_records)
             end
-          else
-            super
+
+            block.call(record)
           end
         end
 
+        def with_associations_spec
+          @with_associations_spec ||= []
+        end
+
+        def with_associations_return_clause
+          '[' + with_associations_spec.map { |n| "collect(#{n})" }.join(',') + ']'
+        end
+
         def with_associations(*spec)
           new_link.tap do |new_query_proxy|
-            new_spec = new_query_proxy.instance_variable_get('@associations_spec') + spec
-            new_query_proxy.instance_variable_set('@associations_spec', new_spec)
+            new_spec = new_query_proxy.with_associations_spec + spec
+            new_query_proxy.with_associations_spec.replace(new_spec)
           end
         end
 
         private
 
         def query_from_association_spec
-          @associations_spec.inject(query_as(identity).return(identity)) do |query, association_name|
+          with_associations_spec.inject(query_as(identity).return(identity)) do |query, association_name|
             association = model.associations[association_name]
 
             query.optional_match("#{identity}#{association.arrow_cypher}#{association_name}")

data/lib/neo4j/active_node/query/query_proxy_enumerable.rb

@@ -10,11 +10,29 @@ module Neo4j
         # using `your_node.each(true, true)` instead of `your_node.each_with_rel`.
         # @return [Enumerable] An enumerable containing some combination of nodes and rels.
         def each(node = true, rel = nil, &block)
+          result(node, rel).each(&block)
+        end
+
+        def result(node = true, rel = true)
+          @result_cache ||= {}
+          return @result_cache[[node, rel]] if @result_cache[[node, rel]]
+
           pluck_vars = []
           pluck_vars << identity if node
           pluck_vars << @rel_var if rel
 
-          pluck(*pluck_vars).each(&block)
+          result = pluck(*pluck_vars)
+
+          result.each do |object|
+            object.instance_variable_set('@source_query_proxy', self)
+            object.instance_variable_set('@source_query_proxy_result_cache', result)
+          end
+
+          @result_cache[[node, rel]] ||= result
+        end
+
+        def fetch_result_cache
+          @result_cache ||= yield
         end
 
         # When called at the end of a QueryProxy chain, it will return the resultant relationship objects intead of nodes.

data/lib/neo4j/shared/persistence.rb

@@ -84,7 +84,7 @@ module Neo4j::Shared
     # These two methods should be removed in 6.0.0
     def _destroyed_double_check?
       if _active_record_destroyed_behavior?
-        true
+        false
       else
         (!new_record? && !exist?)
       end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.9'
+  VERSION = '5.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.0.9
+  version: 5.0.10
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter