neo4j-core 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115195d15890a6df1bf73485c14724b873c41859
-  data.tar.gz: d13f2cf8374c12aa053d041c4f69a391321cab42
+  metadata.gz: 4f9471ddb19829732fa6557faf552c7f3f41b760
+  data.tar.gz: 4b5514acd0eb0a5128461365e4e572c141567bbc
 SHA512:
-  metadata.gz: 13a7462cf79c75caee9b06c47e78343bcd0b71f86f462712a22ed59c4f5f8737f6462c6aaf8ecda6934349c61da3a9733194c9a4950ce1d1b61075e3186d654d
-  data.tar.gz: 3d117e86ce43c6fdd07ce584de68dc1427afd2517a54b52bc4c4f2bf09bc89ef1ec75c550d8677beff491db98182b733693442e568c53385c788d498e03cd694
+  metadata.gz: ae04ef8d6ac2c5ae498e2a4e37af5c16b77d70dd13fe2acd0598cd3cfd75c67d0d1d593de0d6ad0c5fe5621986666ca80c5e0bf4da3bb6b1930e4196a63bb0f6
+  data.tar.gz: e1571ff74a3c8e3cb79b86a79f1d7a67f22e814a6507689345276fa2ee17ad5c98c7b26dfb3f15e1ba71287c71f217651b42ab20c1ccc459fcdd09bdd8b98c04

data/lib/neo4j-core/query.rb

@@ -66,8 +66,7 @@ module Neo4j
       end
 
       def initialize(options = {})
-        @session = options[:session]
-        @session = Neo4j::Session.current if !options.key?(:session)
+        @session = options.key?(:session) ? options[:session] : Neo4j::Session.current
 
         @options = options
         @clauses = []
@@ -226,13 +225,17 @@ module Neo4j
         !!@_unwrapped_obj
       end
 
+      def session_is_new_api?
+        defined?(::Neo4j::Core::CypherSession) && @session.is_a?(::Neo4j::Core::CypherSession)
+      end
+
       def response
         return @response if @response
 
         cypher = to_cypher
         pretty_cypher = to_cypher(pretty: true) if self.class.pretty_cypher
 
-        @response = if @session.is_a?(::Neo4j::Core::CypherSession)
+        @response = if session_is_new_api?
                       @session.query(self)
                     else
                       @session._query(cypher, merge_params, context: @options[:context], pretty_cypher: pretty_cypher)

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '6.0.2'
+    VERSION = '6.0.3'
   end
 end

metadata

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