neo4j-core 8.0.2 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142e47b6ab439fe4e7fe6e585519079447372aa1
-  data.tar.gz: 5890bb51cfc02f3d5ebd5d5bbdc7d3a0fcba0e72
+  metadata.gz: 1d8cb5d66d31e972455f6cf54023c7e0c3fb56fc
+  data.tar.gz: 78103a5004ca85ed66109d543b796709702da442
 SHA512:
-  metadata.gz: da7ed02562dd7d7fcd8a77a5f96a51eb01b93dbb7de0880fb62be0b4b2011ca66343333c4c50e808b0f375912656282f9e39c968b399fa09b89152646dd6fdb8
-  data.tar.gz: 76b67f4a4ef8a1032ad86ec85e5ee185d88989148c5918f3fe58ea90f4191dc9e43aa3ff3ad143a28a882b37e4cdf08492dd641d5eb6ea21ace3a3aedbb203b2
+  metadata.gz: 02e99a87d11fb62b138b74781d19fa0806808c093514f2219dc247ba9e4879d47029d34faece54af400c0ec217016599e8e5b74a3ba282a61436182e76a650a1
+  data.tar.gz: 1f4af28e7273ce88e881764ac0fc81d81c884fe056b5d10f70c9512900356c693dec483ecec931f0effa3fe6e4ea93b0d4f7098d26bc7b77649c2a73c6031740

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '8.0.2'
+    VERSION = '8.0.3'
   end
 end

data/lib/neo4j/core/cypher_session.rb

@@ -15,20 +15,14 @@ module Neo4j
         Neo4j::Core::CypherSession::Transactions::Base
       end
 
-      %w[
-        version
-      ].each do |method, &_block|
-        define_method(method) do |*args, &block|
-          @adaptor.send(method, *args, &block)
-        end
-      end
-
       %w[
         query
         queries
 
         transaction
 
+        version
+
         indexes
         constraints
       ].each do |method, &_block|

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

@@ -175,7 +175,7 @@ ERROR
           instrument(:query, 'neo4j.core.cypher_query', %w[query]) do |_, _start, _finish, _id, payload|
             query = payload[:query]
             params_string = (query.parameters && !query.parameters.empty? ? "| #{query.parameters.inspect}" : EMPTY)
-            cypher = query.pretty_cypher ? NEWLINE_W_SPACES + query.pretty_cypher.gsub(/\n/, NEWLINE_W_SPACES) : query.cypher
+            cypher = query.pretty_cypher ? (NEWLINE_W_SPACES if query.pretty_cypher.include?("\n")).to_s + query.pretty_cypher.gsub(/\n/, NEWLINE_W_SPACES) : query.cypher
 
             " #{ANSI::CYAN}#{query.context || 'CYPHER'}#{ANSI::CLEAR} #{cypher} #{params_string}"
           end

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

@@ -48,13 +48,18 @@ module Neo4j
                    "Queries: #{queries.map(&:cypher)}"
             end
 
-            send_query_jobs(queries)
+            self.class.instrument_request do
+              send_query_jobs(queries)
 
-            build_response(queries, options[:wrap_level] || @options[:wrap_level])
+              build_response(queries, options[:wrap_level] || @options[:wrap_level])
+            end
           end
 
-          def version
-            fail 'should be implemented!'
+          def version(session)
+            result = query(session, 'CALL dbms.components()', {}, skip_instrumentation: true)
+
+            # BTW: community / enterprise could be retrieved via `result.first.edition`
+            result.first.versions[0]
           end
 
           def connected?

data/neo4j-core.gemspec

@@ -24,26 +24,26 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   s.extra_rdoc_files = %w[README.md]
   s.rdoc_options = ['--quiet', '--title', 'Neo4j::Core', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
 
+  s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('faraday', '>= 0.9.0')
-  s.add_dependency('typhoeus', '>= 1.1.2')
-  s.add_dependency('httpclient')
   s.add_dependency('faraday_middleware', '~> 0.10.0')
+  s.add_dependency('faraday_middleware-multi_json')
+  s.add_dependency('httpclient')
   s.add_dependency('json')
-  s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('multi_json')
-  s.add_dependency('faraday_middleware-multi_json')
+  s.add_dependency('typhoeus', '>= 1.1.2')
 
+  s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
   s.add_development_dependency('pry')
-  s.add_development_dependency('yard')
   s.add_development_dependency('simplecov')
-  s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
+  s.add_development_dependency('yard')
 
   if RUBY_PLATFORM == 'java'
     s.add_dependency('neo4j-community', '>= 2.1.1')
     s.add_development_dependency 'ruby-debug'
   else
-    s.add_development_dependency('rubocop', '~> 0.49.1')
     s.add_development_dependency('guard')
     s.add_development_dependency('guard-rubocop')
+    s.add_development_dependency('rubocop', '~> 0.49.1')
   end
 end

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.0.3
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -109,35 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware-multi_json
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,35 +165,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 description: 'Neo4j-core provides classes and methods to work with the graph database
   Neo4j.