neo4j-core 6.0.0.alpha.2 → 6.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1343fde92853fec5efe74f6e6bff1953e80d087
-  data.tar.gz: 7ba6ae057e66b0da4f47510925fab98f9d92f4ce
+  metadata.gz: da1d3afa114538d40feb6d6765112f282c13ebee
+  data.tar.gz: fe9f7472deaddd1123e62ca73a02ed3ec70431b7
 SHA512:
-  metadata.gz: eacf72160d677bd80141f8d399520adb7fca8ae5d650d5bc389dbd42b25eb2d61fc1e1f4fb9e02577e9f8a3e5000c6e93f7c80edf6cd3500618a84fed6bbdc68
-  data.tar.gz: 81f69bd7122e7d1fbf7a26a432a6c179f2ba739f1ee0be127dec3dd6b62481019f0311afbc7c752578019deec03c1730b0434ffbc8e41df6d20be12b87c2517e
+  metadata.gz: 36fa2080886b9b51eb29ec518399153474e4f113c7530ff137a55453397d7c3ec1f3407178d1d3ff3d28b4aacf85c0ea5740f47e646d1945cce524233c48946d
+  data.tar.gz: 94a3b1aadca366cdf2485de538fe0b6fc95e570f811ee8415b4826a6e4ab17d0a896b46e99f8f4d4f1ef253dba8afba65d37d64606ee5c1c6bb2405262771c9b

data/Gemfile

@@ -15,4 +15,5 @@ group 'test' do
   gem 'simplecov-html', require: false
   gem 'rspec', '~> 3.0'
   gem 'rspec-its'
+  gem 'dotenv'
 end

data/lib/neo4j-core/query.rb

@@ -232,9 +232,13 @@ module Neo4j
         cypher = to_cypher
         pretty_cypher = to_cypher(pretty: true) if self.class.pretty_cypher
 
-        @response = @session._query(cypher, merge_params, context: @options[:context], pretty_cypher: pretty_cypher)
+        @response = if @session.is_a?(::Neo4j::Core::CypherSession)
+                      @session.query(self)
+                    else
+                      @session._query(cypher, merge_params, context: @options[:context], pretty_cypher: pretty_cypher)
+                    end
 
-        (!response.respond_to?(:error?) || !response.error?) ? response : response.raise_cypher_error
+        (!@response.respond_to?(:error?) || !response.error?) ? @response : @response.raise_cypher_error
       end
 
       def match_nodes(hash, optional_match = false)

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '6.0.0.alpha.2'
+    VERSION = '6.0.0.alpha.5'
   end
 end

data/lib/neo4j-embedded/embedded_impermanent_session.rb

@@ -9,7 +9,6 @@ module Neo4j
     class EmbeddedImpermanentSession < EmbeddedSession
       def start
         fail Error, 'Embedded Neo4j db is already running' if running?
-        puts 'Start test impermanent embedded Neo4j db'
         @graph_db = Java::OrgNeo4jTest::TestGraphDatabaseFactory.new.newImpermanentDatabase
         Neo4j::Session._notify_listeners(:session_available, self)
       end

data/lib/neo4j-server/cypher_transaction.rb

@@ -73,12 +73,17 @@ module Neo4j
             cypher_response.set_data(first_result)
           else
             first_error = response.body[:errors].first
-            mark_expired if first_error[:message].match(/Unrecognized transaction id/)
+            tx_cleanup!(first_error)
             cypher_response.set_error(first_error)
           end
         end
       end
 
+      def tx_cleanup!(first_error)
+        autoclosed!
+        mark_expired if first_error[:message].match(/Unrecognized transaction id/)
+      end
+
       def empty_response
         OpenStruct.new(status: 200, body: '')
       end

data/lib/neo4j/core/cypher_session.rb

@@ -1,4 +1,3 @@
-require 'neo4j/core/cypher_session/adaptors/http'
 
 module Neo4j
   module Core
@@ -14,13 +13,19 @@ module Neo4j
       %w(
         query
         queries
+
         start_transaction
         end_transaction
+        transaction
+        transaction_started?
+
         version
-        transactions
-      ).each do |method|
-        define_method(method) do |*args|
-          @adaptor.send(method, *args)
+
+        indexes_for_label
+        uniqueness_constraints_for_label
+      ).each do |method, &_block|
+        define_method(method) do |*args, &block|
+          @adaptor.send(method, *args, &block)
         end
       end
     end

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

@@ -1,3 +1,4 @@
+require 'neo4j/core/cypher_session'
 require 'neo4j/core/instrumentable'
 
 module Neo4j
@@ -42,10 +43,8 @@ module Neo4j
             end
           end
 
-          def query(cypher, parameters = {})
-            queries do
-              append(cypher, parameters)
-            end[0]
+          def query(*args)
+            queries { append(*args) }[0]
           end
 
           def queries(&block)
@@ -68,10 +67,24 @@ module Neo4j
             fail '#end_transaction not implemented!'
           end
 
+          def transaction_started?(*_args)
+            fail '#transaction_started? not implemented!'
+          end
+
           def version(*_args)
             fail '#version not implemented!'
           end
 
+          # Schema inspection methods
+          def indexes_for_label(*_args)
+            fail '#indexes_for_label not implemented!'
+          end
+
+          def uniqueness_constraints_for_label(*_args)
+            fail '#uniqueness_constraints_for_label not implemented!'
+          end
+
+
           # Uses #start_transaction and #end_transaction to allow
           # execution of queries within a block to be part of a
           # full transaction
@@ -80,7 +93,7 @@ module Neo4j
 
             yield
           ensure
-            end_transaction
+            end_transaction if transaction_started?
           end
 
           EMPTY = ''

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

@@ -53,6 +53,10 @@ module Neo4j
             @transaction.close
           end
 
+          def transaction_started?
+            !!@transaction
+          end
+
           def version
             if defined?(::Neo4j::Community)
               ::Neo4j::Community::NEO_VERSION

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

@@ -34,7 +34,8 @@ module Neo4j
             # context option not implemented
             self.class.instrument_queries(queries)
 
-            url = full_transaction_url
+            return unless url = full_transaction_url
+
             faraday_response = self.class.instrument_request(url, request_data) do
               @connection.post(url, request_data)
             end
@@ -64,14 +65,43 @@ module Neo4j
             @transaction_state = :close_requested
             query_set([])
             @transaction_state = nil
+            @transaction_id = nil
 
             true
           end
 
+          def transaction_started?
+            !!@transaction_id
+          end
+
           def version
             @version ||= @connection.get(db_data_url).body[:neo4j_version]
           end
 
+          # Schema inspection methods
+          def indexes_for_label(label)
+            url = db_data_url + "schema/index/#{label}"
+            response = @connection.get(url)
+
+            if response.body && response.body[0]
+              response.body[0][:property_keys].map(&:to_sym)
+            else
+              []
+            end
+          end
+
+          def uniqueness_constraints_for_label(label)
+            url = db_data_url + "schema/constraint/#{label}/uniqueness"
+            response = @connection.get(url)
+
+            if response.body && response.body[0]
+              response.body[0][:property_keys].map(&:to_sym)
+            else
+              []
+            end
+          end
+
+
           instrument(:request, 'neo4j.core.http.request', %w(url body)) do |_, start, finish, _id, payload|
             ms = (finish - start) * 1000
 
@@ -89,14 +119,12 @@ module Neo4j
           end
 
           def full_transaction_url
-            path = case @transaction_state
-                   when nil then '/commit'
-                   when :open_requested then ''
-                   when :open then "/#{@transaction_id}"
-                   when :close_requested then "/#{@transaction_id}/commit"
-                   end
-
-            db_data_url + 'transaction' + path
+            path = ''
+            path << "/#{@transaction_id}" if [:open, :close_requested].include?(@transaction_state)
+            path << '/commit' if [nil, :close_requested].include?(@transaction_state)
+            path = nil if @transaction_state == :close_requested && !@transaction_id
+
+            db_data_url + 'transaction' + path if path
           end
 
           def db_data_url

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

@@ -89,8 +89,12 @@ module Neo4j
           end
 
           def validate_faraday_response!(faraday_response)
-            if error = faraday_response.body[:errors][0]
-              fail CypherError, "#{ANSI::CYAN}#{error[:code]}#{ANSI::CLEAR}: #{error[:message]}"
+            if faraday_response.body.is_a?(Hash) && error = faraday_response.body[:errors][0]
+              error = <<-ERROR
+  Request to: #{ANSI::BOLD}#{faraday_response.env.url}#{ANSI::CLEAR}
+  #{ANSI::CYAN}#{error[:code]}#{ANSI::CLEAR}: #{error[:message]}
+ERROR
+              fail CypherError, error
             end
 
             return if (200..299).include?(status = faraday_response.status)

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

@@ -11,7 +11,7 @@ module Neo4j
         def initialize(columns, rows)
           @columns = columns.map(&:to_sym)
           @rows = rows
-          @struct_class = Struct.new(*@columns)
+          @struct_class = Struct.new(:index, *@columns)
         end
 
         include Enumerable
@@ -23,8 +23,8 @@ module Neo4j
         end
 
         def structs
-          @structs ||= rows.map do |row|
-            @struct_class.new(*row)
+          @structs ||= rows.each_with_index.map do |row, index|
+            @struct_class.new(index, *row)
           end
         end
 

data/lib/neo4j/core/node.rb

@@ -8,6 +8,9 @@ module Neo4j
 
       include Wrappable
 
+      # Perhaps we should deprecate this?
+      alias_method :neo_id, :id
+
       def initialize(id, labels, properties = {})
         @id = id
         @labels = labels.map(&:to_sym) unless labels.nil?

data/lib/neo4j/transaction.rb

@@ -21,6 +21,18 @@ module Neo4j
       end
       alias_method :failure?, :failed?
 
+      def autoclosed!
+        @autoclosed = true if transient_failures_autoclose?
+      end
+
+      def transient_failures_autoclose?
+        Neo4j::Session.current.version >= '2.2.6'
+      end
+
+      def autoclosed?
+        !!@autoclosed
+      end
+
       def mark_expired
         @expired = true
       end
@@ -61,7 +73,18 @@ module Neo4j
         return if @pushed_nested >= 0
         fail "Can't commit transaction, already committed" if @pushed_nested < -1
         Neo4j::Transaction.unregister(self)
-        failed? ? delete : commit
+        post_close!
+      end
+
+      private
+
+      def post_close!
+        return if autoclosed?
+        if failed?
+          delete
+        else
+          commit
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.2
+  version: 6.0.0.alpha.5
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A basic library to work with the graph database Neo4j.