neo4j-core 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc288b3293def30d9acf103f70ca43e2d1cfebc9
-  data.tar.gz: 73225366c230a39f0dff61dd9e6497229251c478
+  metadata.gz: 377d0ecb66881b1272a0f620a00aec54f1e39cbe
+  data.tar.gz: 16d2716622c955a4409ea043810818ad05d53af1
 SHA512:
-  metadata.gz: 8a8ad456a8528cf852f3c8ca451c3853bcd264f182ddd2baf6361318ec8d04fb3a2351b5fd714cc9eba17be197cbc14119faa5021d973dfb2d18a3b7a1c5f054
-  data.tar.gz: 738ce2b663d3d5fb483ead05725c5bc1a624452bab4341cf3dd2987be0bfab131e4cd68b176c15a23cd148d6309ed253fc33dad51bc7cd22e77554bae2e549cd
+  metadata.gz: 0aee2e52eda16ec48962b66ba8e63951d7293bdf4c89e06f8b7a371837d36baa9cc2b06100a6bc827e508a03b74f34b54a47f6b22378f01db8cab95595dcf321
+  data.tar.gz: 454be77dc626df324aaa61ad272ba9e666062c0ea9c1becc30f4e0307d11898ed708912cb6fd400e89ceef7218d1f7102cc78647836568e5f38e8a29f43a69ce

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '4.0.3'
+    VERSION = '4.0.4'
   end
 end

data/lib/neo4j-server/cypher_node.rb

@@ -129,7 +129,8 @@ module Neo4j
 
       # (see Neo4j::Node#del)
       def del
-        @session._query_or_fail("#{match_start} OPTIONAL MATCH n-[r]-() DELETE n, r", false, neo_id: neo_id)
+        query = match_start_query.optional_match('n-[r]-()').delete(:n, :r)
+        @session._query_or_fail(query, false)
       end
 
       alias_method :delete, :del
@@ -216,6 +217,10 @@ module Neo4j
       def match_start(identifier = 'n')
         "MATCH (#{identifier}) WHERE ID(#{identifier}) = {neo_id}"
       end
+
+      def match_start_query(identifier = :n)
+        @session.query.match(identifier).where(identifier => {neo_id: neo_id}).with(identifier)
+      end
     end
   end
 end

data/lib/neo4j-server/cypher_session.rb

@@ -189,7 +189,13 @@ module Neo4j
         Neo4j::Transaction.current ? r : r['data']
       end
 
-      def _query_or_fail(q, single_row = false, params = nil)
+      def _query_or_fail(q, single_row = false, params = {})
+        if q.is_a?(::Neo4j::Core::Query)
+          cypher = q.to_cypher
+          params = q.send(:merge_params).merge(params)
+          q = cypher
+        end
+
         response = _query(q, params)
         response.raise_error if response.error?
         single_row ? response.first_data : response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty