neo4j-core 7.0.0.alpha.7 → 7.0.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ae20dabf10904c1f908c4112bc12a53cc5ac2a
-  data.tar.gz: 9e37cbb29aea85dd6f200c497c22bbf57779be46
+  metadata.gz: 0bc5b959f06c5ed7ac484e64fa33080efeded582
+  data.tar.gz: b755bce4d46ae8cc3325bf2f06764e05cae4bcc6
 SHA512:
-  metadata.gz: f85e410f549a2c1cd8cf01c2077749f0edd05442eb64bf179dbc319cd9dc2b549358060619b369f360827cf9484443bd3168aeea4741e335c765c4b010997f64
-  data.tar.gz: 5bd7e2eb99a8232ed89304d8244e4852559871cae0c18a6d88608d9546a6c6b077d093930e9d2a176d5d294ce63128b8fe8e6b5da1df5d2656aa7829c9f80984
+  metadata.gz: 9e36bb43eff21409124d394235c1c1209a33b4d2fa2978ff7e3d7e09c603b1b67958927cf9555c1d82d12f9962eff327251bbb46f3c467aecbd9efae74605f14
+  data.tar.gz: 82cdc684b693eb423e1c4de77871d54965bcbc3bd998158c423c1ee9fd89b9c5e094591f9aeb117d973da5039328a8a3d6f56fa7b3b02f2b569c413f3fc378fa

data/Gemfile

@@ -11,6 +11,7 @@ group 'development' do
   gem 'guard-rspec', require: false if RUBY_PLATFORM != 'java'
   if RUBY_VERSION.to_f < 2.0
     gem 'overcommit', '< 0.35.0'
+    gem 'term-ansicolor', '< 1.4'
   else
     gem 'overcommit'
   end

data/lib/neo4j/core/cypher_session/adaptors/bolt.rb

@@ -44,7 +44,8 @@ module Neo4j
 
             if @socket.ready?
               debug_remaining_buffer
-              fail 'Making query, but expected there to be no buffer remaining!'
+              fail "Making query, but expected there to be no buffer remaining!\n"\
+                   "Queries: #{queries.map(&:cypher)}"
             end
 
             send_query_jobs(queries)

data/lib/neo4j/core/cypher_session/adaptors.rb

@@ -53,14 +53,14 @@ ERROR
         class Base
           include Neo4j::Core::Instrumentable
 
-          gem, version = if defined?(::Neo4j::ActiveNode)
-                           ['neo4j', ::Neo4j::VERSION]
-                         else
-                           ['neo4j-core', ::Neo4j::Core::VERSION]
-                         end
+          gem_name, version = if defined?(::Neo4j::ActiveNode)
+                                ['neo4j', ::Neo4j::VERSION]
+                              else
+                                ['neo4j-core', ::Neo4j::Core::VERSION]
+                              end
 
 
-          USER_AGENT_STRING = "#{gem}-gem/#{version} (https://github.com/neo4jrb/#{gem})"
+          USER_AGENT_STRING = "#{gem_name}-gem/#{version} (https://github.com/neo4jrb/#{gem_name})"
 
           def connect(*_args)
             fail '#connect not implemented!'
@@ -141,11 +141,11 @@ ERROR
 
               yield tx
             rescue => e
-              tx.mark_failed
+              tx.mark_failed if tx
 
               raise e
             ensure
-              tx.close
+              tx.close if tx
             end
           end
 

data/lib/neo4j/core/cypher_session/responses/bolt.rb

@@ -52,10 +52,16 @@ module Neo4j
 
           def extract_message_groups(flush_messages_proc)
             fields_messages = flush_messages_proc.call
+
             validate_message_type!(fields_messages[0], :success)
 
             result_messages = []
-            while (messages = flush_messages_proc.call)[0].type != :success
+            messages = nil
+
+            loop do
+              messages = flush_messages_proc.call
+              next if messages.nil?
+              break if messages[0].type == :success
               result_messages.concat(messages)
             end
 
@@ -88,7 +94,7 @@ module Neo4j
             when :proc
               yield.wrap
             else
-              fail ArgumentError, "Inalid wrap_level: #{@wrap_level.inspect}"
+              fail ArgumentError, "Invalid wrap_level: #{@wrap_level.inspect}"
             end
           end
 

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '7.0.0.alpha.7'
+    VERSION = '7.0.0.alpha.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 7.0.0.alpha.7
+  version: 7.0.0.alpha.8
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -242,7 +242,6 @@ files:
 - lib/neo4j-core/query_clauses.rb
 - lib/neo4j-core/query_find_in_batches.rb
 - lib/neo4j-core/version.rb
-- lib/neo4j-core/version.rb.orig
 - lib/neo4j-embedded.rb
 - lib/neo4j-embedded/cypher_response.rb
 - lib/neo4j-embedded/embedded_database.rb
@@ -331,3 +330,4 @@ signing_key:
 specification_version: 4
 summary: A basic library to work with the graph database Neo4j.
 test_files: []
+has_rdoc: true

data/lib/neo4j-core/version.rb.orig

@@ -1,9 +0,0 @@
-module Neo4j
-  module Core
-<<<<<<< HEAD
-    VERSION = '7.0.0.alpha.6'
-=======
-    VERSION = '6.1.5'
->>>>>>> 6.1.x
-  end
-end