neo4j-core 3.0.0.alpha.15 → 3.0.0.alpha.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd5430032c2297e86a4c69da88f95f3ec4f60a54
-  data.tar.gz: cc6a1d7ac5a159b93f384df24cb87cd58cb27b7d
+  metadata.gz: 490c0c0da4aaf218af104307ca6cbef8e5413dd9
+  data.tar.gz: 5cd481b1c909dc50f4321888a5d987302f156aac
 SHA512:
-  metadata.gz: e9fad0135b249201d7775a8b71710b0fcc04f257f208e2ebd02591ece50b5ae8fc2e9ff1cc581a71af2e715275f83cd4b9a44a6cd827c092cbebdaa04a6308ef
-  data.tar.gz: cf64525b051f50d8a75b5a4a68c9a70a1910dee352195820e06d6f32246a40528e7e17cdc4785d86009a0a446e0422d7907203e5e80ce4dcc92e37e4caa0f7cb
+  metadata.gz: 798f6c1f42835082807d2ac745e5caa6126dbb44ddf2f35d06906875d5bb331c88f374c33c30919e8a271da29a141d847b3b76a7d42416893cfb449b5d2fcce8
+  data.tar.gz: 0ef2c64a880bbf72b3aa9310cc8aa84710c401381e4ce7267bc39a01d11f2c0dd8d316ce0ba74ecaa537eb314f94922c68a98426f2b8fd761110d9c8613c75cb

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.alpha.15"
+    VERSION = "3.0.0.alpha.16"
   end
 end

data/lib/neo4j-embedded/embedded_relationship.rb

@@ -32,8 +32,13 @@ module Neo4j::Embedded
           end
 
           def rel_type
+            @_rel_type ||= _rel_type
+          end
+
+          def _rel_type
             getType().name().to_sym
           end
+          tx_methods :rel_type
 
           def del
             delete

data/lib/neo4j-server/cypher_node.rb

@@ -25,7 +25,7 @@ module Neo4j::Server
     def create_rel(type, other_node, props = nil)
       q = "START a=node(#{neo_id}), b=node(#{other_node.neo_id}) CREATE (a)-[r:`#{type}` #{cypher_prop_list(props)}]->(b) RETURN ID(r)"
       id = @session._query_or_fail(q, true)
-      CypherRelationship.new(@session, id)
+      CypherRelationship.new(@session, id, type)
     end
 
     # (see Neo4j::Node#props)
@@ -140,14 +140,14 @@ module Neo4j::Server
 
     # (see Neo4j::Node#rel)
     def rel(match={})
-      result = match(CypherRelationship, "ID(r)", match)
+      result = match(CypherRelationship, "ID(r), TYPE(r)", match)
       raise "Expected to only find one relationship from node #{neo_id} matching #{match.inspect} but found #{result.count}" if result.count > 1
       result.first
     end
 
     # (see Neo4j::Node#rel?)
     def rel?(match={})
-      result = match(CypherRelationship, "ID(r)", match)
+      result = match(CypherRelationship, "ID(r), TYPE(r)", match)
       !!result.first
     end
 
@@ -159,7 +159,7 @@ module Neo4j::Server
 
     # (see Neo4j::Node#rels)
     def rels(match = {dir: :both})
-      match(CypherRelationship, "ID(r)", match)
+      match(CypherRelationship, "ID(r), TYPE(r)", match)
     end
 
     # @private
@@ -181,8 +181,8 @@ module Neo4j::Server
     def _map_result(r, clazz)
       r.data.map do |rel|
         next if r.uncommited? ? rel['row'].first.nil? : rel.first.nil?
-        id = r.uncommited? ? rel['row'].first : rel.first
-        clazz.new(@session, id).wrapper
+        row = r.uncommited? ? rel['row'] : rel
+        clazz.new(@session, *row).wrapper
       end.compact
     end
 

data/lib/neo4j-server/cypher_relationship.rb

@@ -4,9 +4,10 @@ module Neo4j::Server
     include Neo4j::Server::Resource
     include Neo4j::Core::CypherTranslator
 
-    def initialize(session, id)
+    def initialize(session, id, rel_type)
       @session = session
       @id = id
+      @rel_type = rel_type
     end
 
     def ==(o)
@@ -78,6 +79,9 @@ module Neo4j::Server
       properties
     end
 
+    def rel_type
+      @rel_type.to_sym
+    end
 
     def del
       id = neo_id

data/lib/neo4j-server/cypher_session.rb

@@ -87,9 +87,9 @@ module Neo4j::Server
     end
 
     def load_relationship(neo_id)
-      cypher_response = _query("START r=relationship(#{neo_id}) RETURN r")
+      cypher_response = _query("START r=relationship(#{neo_id}) RETURN TYPE(r)")
       if (!cypher_response.error?)
-        CypherRelationship.new(self, neo_id)
+        CypherRelationship.new(self, neo_id, cypher_response.first_data)
       elsif (cypher_response.error_msg =~ /not found/)  # Ugly that the Neo4j API gives us this error message
         return nil
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.15
+  version: 3.0.0.alpha.16
 platform: ruby
 authors:
 - Andreas Ronge