neo4j 5.2.13 → 5.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf8d81e7dc5232e07dda9796367061233e4716e
-  data.tar.gz: b7e00df2c8d8a10ef2fb1a148d53b17c36990879
+  metadata.gz: f213593268bdbcf3ca457f605bf2df1f86b7dc01
+  data.tar.gz: 3daa420d673284f5ceba6b259725713271925783
 SHA512:
-  metadata.gz: 5278a649bb303704ed2205671dd68712a688082290791e82a65a8bf6143ad0c1d7883078f003825944bf426cc0ba4e4b826d7fce602421fae105f34f69acfdfd
-  data.tar.gz: a44d10311b87b63ff3a85ddcdc8faa4fee4a9a815580140cfdcff2db8bb47777e9867ae664fa09cd24ca911f5cc8c31fe49aa5e3b62a904f8645570aef2d8106
+  metadata.gz: 5206d87f81b88acde44706e8e292cc0c80fdfba49f3cc1b2ebe1d2041f1a57f8b7e96b3125dcbbbe8acdf81a855c055d4b4a8545c372e7266050022b80ad81df
+  data.tar.gz: 30555f314d1f1aaabd691dc841853ffa04e9d65e337dc7930e1b20ff00aaa37afa7431a3a4c1e07e3a488c13c57db3bd986899a4096e21a475e8e5306fc26f6a

data/lib/neo4j/active_node/persistence.rb

@@ -130,9 +130,8 @@ module Neo4j::ActiveNode
 
       def find_or_create(find_attributes, set_attributes = {})
         on_create_attributes = set_attributes.merge(on_create_props(find_attributes))
-        on_match_attributes =  set_attributes.merge(on_match_props)
         neo4j_session.query.merge(n: {self.mapped_label_names => find_attributes})
-          .on_create_set(n: on_create_attributes).on_match_set(n: on_match_attributes)
+          .on_create_set(n: on_create_attributes)
           .pluck(:n).first
       end
 

data/lib/neo4j/active_rel.rb

@@ -27,16 +27,13 @@ module Neo4j
       attribute_descriptions = attribute_pairs.join(', ')
       separator = ' ' unless attribute_descriptions.empty?
 
-      cypher_representation = "#{node_cypher_representation(from_node)}-[:#{type}]->#{node_cypher_representation(to_node)}"
+      cypher_representation = "#{node_cypher_representation(:from)}-[:#{type}]->#{node_cypher_representation(:to)}"
       "#<#{self.class.name} #{cypher_representation}#{separator}#{attribute_descriptions}>"
     end
 
-    def node_cypher_representation(node)
-      node_class = node.class
-      id_name = node_class.id_property_name
-      labels = ':' + node_class.mapped_label_names.join(':')
-
-      "(#{labels} {#{id_name}: #{node.id.inspect}})"
+    def node_cypher_representation(direction)
+      node = send(:"#{direction}_node")
+      node.cypher_representation(self.class.send(:"#{direction}_class"))
     end
 
     def neo4j_obj

data/lib/neo4j/active_rel/related_node.rb

@@ -4,6 +4,7 @@ module Neo4j::ActiveRel
   # will result in a query to load the node if the node is not already loaded.
   class RelatedNode
     class InvalidParameterError < StandardError; end
+    class UnsetRelatedNodeError < StandardError; end
 
     # ActiveRel's related nodes can be initialized with nothing, an integer, or a fully wrapped node.
     #
@@ -30,20 +31,41 @@ module Neo4j::ActiveRel
 
     # Loads a node from the database or returns the node if already laoded
     def loaded
+      fail NilRelatedNodeError, 'Node not set, cannot load' if @node.nil?
       @node = @node.respond_to?(:neo_id) ? @node : Neo4j::Node.load(@node)
     end
 
+    # @param [String, Symbol, Array] clazz An alternate label to use in the event the node is not present or loaded
+    def cypher_representation(clazz)
+      case
+      when !set?
+        "(#{formatted_label_list(clazz)})"
+      when set? && !loaded?
+        "(Node with neo_id #{@node})"
+      else
+        node_class = self.class
+        id_name = node_class.id_property_name
+        labels = ':' + node_class.mapped_label_names.join(':')
+
+        "(#{labels} {#{id_name}: #{@node.id.inspect}})"
+      end
+    end
+
     # @return [Boolean] indicates whether a node has or has not been fully loaded from the database
     def loaded?
       @node.respond_to?(:neo_id)
     end
 
+    def set?
+      !@node.nil?
+    end
+
     def method_missing(*args, &block)
       loaded.send(*args, &block)
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      loaded if @node.is_a?(Integer)
+      loaded if @node.is_a?(Numeric)
       @node.respond_to?(method_name) ? true : super
     end
 
@@ -53,6 +75,10 @@ module Neo4j::ActiveRel
 
     private
 
+    def formatted_label_list(list)
+      list.is_a?(Array) ? list.join(' || ') : list
+    end
+
     def valid_node_param?(node)
       node.nil? || node.is_a?(Integer) || node.respond_to?(:neo_id)
     end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.2.13'
+  VERSION = '5.2.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.2.13
+  version: 5.2.14
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter