neo4j 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f494789056a2cf7cdf67ad93320d087aec27ef9
-  data.tar.gz: d20cf2ef3016d84ecf8ddc85a68b3224518a424e
+  metadata.gz: a74b7d45b24d73d7a6b74a9fd422ac3868812a1e
+  data.tar.gz: af35506b1d68f73313ab0dea22328c5cb9233186
 SHA512:
-  metadata.gz: 059712836b2762ba02ea73fa4c0581a24cea4d9c10e87da127c0be60a8288c0a4e4b376f7b87836e8277ff78f6be1b44b8bff7832db96a320d738ac5ddde976d
-  data.tar.gz: 34a29e62bee5492358d3ab93ac3b18c06455480d4c3cd3d54b0fa5f78875c792d2aaee0f6b73c9cdba8254c6d8a31276960b3078213f9db14ebed915b4595300
+  metadata.gz: 2b49582690880a513369153e59db263e513dd437baa090406f051b0e05059a67026761f84b46a42b31fdb4afb1de4ecc35aea7a19e5ff3e273e7aa9aea5617a5
+  data.tar.gz: 9f74ec13fee9f81dadd6aacaf59fd1845623fb939be6ff90742f761f46b5ab8348b72efa47765c23dbff89f5bbc7f0ae12b67cf8bc6e1de4654bd5bac1604b46

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+### Changed
+- `ActiveNode#destroyed?` and `ActiveRel#destroyed?` now only consider the in-memory state of if an object is destroyed without checking the database
+- Moved `#with_associations` method from `AssociationProxy` to `QueryProxy` so that all `QueryProxy` chains can benefit from it.
+
 ## [5.0.2] - 2015-06-30
 
 ### Fixed

data/lib/neo4j/active_node/has_n/association.rb

@@ -6,7 +6,8 @@ module Neo4j
       class Association
         include Neo4j::Shared::RelTypeConverters
         include Neo4j::ActiveNode::Dependent::AssociationMethods
-        attr_reader :type, :name, :relationship, :direction, :dependent
+
+        attr_reader :type, :name, :relationship, :direction, :dependent, :model_class
 
         def initialize(type, direction, name, options = {type: nil})
           validate_init_arguments(type, direction, name, options)
@@ -58,10 +59,22 @@ module Neo4j
                                   end
         end
 
+        def target_classes
+          target_class_names.map(&:constantize)
+        end
+
         def target_classes_or_nil
           @target_classes_or_nil ||= discovered_model if target_class_names
         end
 
+        def target_where_clause
+          return if model_class == false
+
+          Array.new(target_classes).map do |target_class|
+            "#{name}:#{target_class.mapped_label_name}"
+          end.join(' OR ')
+        end
+
         def discovered_model
           target_class_names.map(&:constantize).select do |constant|
             constant.ancestors.include?(::Neo4j::ActiveNode)
@@ -87,12 +100,9 @@ module Neo4j
 
         def relationship_type(create = false)
           case
-          when relationship_class
-            relationship_class_type
-          when @relationship_type
-            @relationship_type
-          when @origin
-            origin_type
+          when relationship_class then relationship_class_type
+          when @relationship_type then @relationship_type
+          when @origin then origin_type
           else
             (create || exceptional_target_class?) && decorated_rel_type(@name)
           end
@@ -130,12 +140,9 @@ module Neo4j
 
         def direction_cypher(relationship_cypher, create, reverse = false)
           case get_direction(create, reverse)
-          when :out
-            "-#{relationship_cypher}->"
-          when :in
-            "<-#{relationship_cypher}-"
-          when :both
-            "-#{relationship_cypher}-"
+          when :out then "-#{relationship_cypher}->"
+          when :in then "<-#{relationship_cypher}-"
+          when :both then "-#{relationship_cypher}-"
           end
         end
 

data/lib/neo4j/active_node/has_n.rb

@@ -84,26 +84,8 @@ module Neo4j::ActiveNode
         target.public_send(method_name, *args, &block)
       end
 
-      def with_associations(*spec)
-        return_object_clause = '[' + spec.map { |n| "collect(#{n})" }.join(',') + ']'
-        query_from_association_spec(spec).pluck(:previous, return_object_clause).map do |record, eager_data|
-          eager_data.each_with_index do |eager_records, index|
-            record.send(spec[index]).cache_result(eager_records)
-          end
-
-          record
-        end
-      end
-
       private
 
-      def query_from_association_spec(spec)
-        spec.inject(@query_proxy.query_as(:previous).return(:previous)) do |query, association_name|
-          association = @query_proxy.model.associations[association_name]
-          query.optional_match("previous#{association.arrow_cypher}#{association_name}")
-        end
-      end
-
       def target_for_missing_method(method_name)
         case method_name
         when *QUERY_PROXY_METHODS

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

@@ -5,6 +5,7 @@ module Neo4j
         include Neo4j::ActiveNode::Query::QueryProxyEnumerable
         include Neo4j::ActiveNode::Query::QueryProxyMethods
         include Neo4j::ActiveNode::Query::QueryProxyFindInBatches
+        include Neo4j::ActiveNode::Query::QueryProxyEagerLoading
         include Neo4j::ActiveNode::Dependent::QueryProxyMethods
 
         # The most recent node to start a QueryProxy chain.
@@ -37,6 +38,7 @@ module Neo4j
           @association = association
           @context = options.delete(:context)
           @options = options
+          @associations_spec = []
 
           instance_vars_from_options!(options)
 
@@ -317,8 +319,8 @@ module Neo4j
         end
 
         def build_deeper_query_proxy(method, args)
-          new_link.tap do |new_query|
-            Link.for_args(@model, method, args).each { |link| new_query._add_links(link) }
+          new_link.tap do |new_query_proxy|
+            Link.for_args(@model, method, args).each { |link| new_query_proxy._add_links(link) }
           end
         end
       end

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

@@ -0,0 +1,46 @@
+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)
+            end
+          else
+            super
+          end
+        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)
+          end
+        end
+
+        private
+
+        def query_from_association_spec
+          @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}")
+              .where(association.target_where_clause)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/shared/persistence.rb

@@ -78,9 +78,25 @@ module Neo4j::Shared
 
     # Returns +true+ if the object was destroyed.
     def destroyed?
-      @_deleted || (!new_record? && !exist?)
+      @_deleted || _destroyed_double_check?
     end
 
+    # These two methods should be removed in 6.0.0
+    def _destroyed_double_check?
+      if _active_record_destroyed_behavior?
+        true
+      else
+        (!new_record? && !exist?)
+      end
+    end
+
+    def _active_record_destroyed_behavior?
+      fail 'Remove this workaround in 6.0.0' if Neo4j::VERSION >= '6.0.0'
+
+      !!Neo4j::Config[:_active_record_destroyed_behavior]
+    end
+    # End of two methods which should be removed in 6.0.0
+
 
     # @return [Hash] all defined and none nil properties
     def props

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

data/lib/neo4j.rb

@@ -55,6 +55,7 @@ require 'neo4j/active_node/query_methods'
 require 'neo4j/active_node/query/query_proxy_methods'
 require 'neo4j/active_node/query/query_proxy_enumerable'
 require 'neo4j/active_node/query/query_proxy_find_in_batches'
+require 'neo4j/active_node/query/query_proxy_eager_loading'
 require 'neo4j/active_node/query/query_proxy_link'
 require 'neo4j/active_node/labels'
 require 'neo4j/active_node/id_property'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -240,6 +240,7 @@ files:
 - lib/neo4j/active_node/property.rb
 - lib/neo4j/active_node/query.rb
 - lib/neo4j/active_node/query/query_proxy.rb
+- lib/neo4j/active_node/query/query_proxy_eager_loading.rb
 - lib/neo4j/active_node/query/query_proxy_enumerable.rb
 - lib/neo4j/active_node/query/query_proxy_find_in_batches.rb
 - lib/neo4j/active_node/query/query_proxy_link.rb