neo4j-core 4.0.7 → 5.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72260cb19c0dbb17236bda1cfb681a6923c0f554
-  data.tar.gz: 38f122d33a93040f6f438ebc973825f6defd7798
+  metadata.gz: 152633cd32f2477416b17fd287b5b9d849eb8f7b
+  data.tar.gz: 40739815340641373bb5be6879845e93c380868e
 SHA512:
-  metadata.gz: ca2066f8fb868ddd5f521f2930535f5164e26d37f6dadb9ede54cb413ef965e9dc5eab2dd1003f25a8052f74af72a0d77420e823f6573f80578ca4a5116f041a
-  data.tar.gz: ce86a44f21c7d5b3a1b971dfe4f472262f7ecee13c262cc86a3c607d6bac7f92beb175e165c6aacc27caec251cb3390f55c987058e4b06ef2db39bfe4d8014e5
+  metadata.gz: 2c8ae0e5f165c5c670a4ee932effe58e79cbb9fc5001b5819cd8ea1c6c38243b575252a02e29883cbfecee9fccb844763cf7fbd3736ff0251540175b074bb9bd
+  data.tar.gz: 2b22683eaf14a64bf2a6a37f5da9f4f067a4d43f00e3e94b667df7a5383a44ccf5ac41030e3d3448d62113891fbde15bc8b866d1daa80f3e6b33384906a5f97e

data/lib/ext/kernel.rb

@@ -0,0 +1,9 @@
+module Kernel
+  def ergo(&b)
+    if block_given?
+      b.arity == 1 ? yield(self) : instance_eval(&b)
+    else
+      self
+    end
+  end
+end

data/lib/neo4j/label.rb

@@ -61,6 +61,8 @@ module Neo4j
 
     class << self
       include Neo4j::Core::CypherTranslator
+      INDEX_PATH = '/db/data/schema/index/'
+      CONSTRAINT_PATH = '/db/data/schema/constraint/'
 
       # Returns a label of given name that can be used to specifying constraints
       # @param [Symbol,String] name the name of the label
@@ -68,7 +70,6 @@ module Neo4j
         session.create_label(name)
       end
 
-
       # @return [Enumerable<Neo4j::Node>] all nodes having given label. Nodes can be wrapped in your own model ruby classes.
       def find_all_nodes(label_name, session = Neo4j::Session.current)
         session.find_all_nodes(label_name)

data/lib/neo4j/node.rb

@@ -118,16 +118,11 @@ module Neo4j
       fail 'not implemented'
     end
 
-    # @return true if the node exists in the database
+    # @return [Boolean] true if the node exists in the database
     def exist?
       fail 'not implemented'
     end
 
-    # @return all the Neo4j labels for this node
-    def labels
-      fail 'not implemented'
-    end
-
     # Returns the only node of a given type and direction that is attached to this node, or nil.
     # This is a convenience method that is used in the commonly occuring situation where a node has exactly zero or one relationships of a given type and direction to another node.
     # Typically this invariant is maintained by the rest of the code: if at any time more than one such relationships exist, it is a fatal error that should generate an exception.
@@ -160,11 +155,6 @@ module Neo4j
       fail 'not implemented'
     end
 
-    # @return [Boolean] true if the node exists
-    def exist?
-      fail 'not implemented'
-    end
-
     # Works like #rels method but instead returns the nodes.
     # It does try to load a Ruby wrapper around each node
     # @abstract
@@ -198,6 +188,13 @@ module Neo4j
       def find_nodes(label, value = nil, session = Neo4j::Session.current!)
         session.find_nodes(label, value)
       end
+
+      def validate_match!(match)
+        invalid_match_keys = match.keys - [:type, :dir, :between]
+        fail "Invalid match keys: #{invalid_match_keys.inspect}" if !invalid_match_keys.empty?
+
+        fail "Invalid dir: #{match[:dir]}" if ![nil, :incoming, :outgoing, :both].include?(match[:dir])
+      end
     end
 
     def initialize

data/lib/neo4j/property_container.rb

@@ -7,16 +7,11 @@ module Neo4j
       get_property(key)
     end
 
-
     # Sets the neo4j property
     def []=(key, value)
-      validate_property(value)
+      validate_property!(value)
 
-      if value.nil?
-        remove_property(key)
-      else
-        set_property(key, value)
-      end
+      set_property(key, value)
     end
   end
 end

data/lib/neo4j/property_validator.rb

@@ -13,7 +13,7 @@ module Neo4j
       VALID_PROPERTY_VALUE_CLASSES.include?(value.class)
     end
 
-    def validate_property(value)
+    def validate_property!(value)
       return if valid_property?(value)
 
       fail Neo4j::PropertyValidator::InvalidPropertyException, "Not valid Neo4j Property value #{value.class}, valid: #{Neo4j::Node::VALID_PROPERTY_VALUE_CLASSES.to_a.join(', ')}"

data/lib/neo4j/session.rb

@@ -50,6 +50,7 @@ module Neo4j
       end
     end
 
+    class InitializationError < RuntimeError; end
 
     # Performs a cypher query.  See {Neo4j::Core::Query} for more details, but basic usage looks like:
     #
@@ -94,21 +95,29 @@ module Neo4j
       #
       # @see also Neo4j::Server::CypherSession#open for :server_db params
       # @param db_type the type of database, e.g. :embedded_db, or :server_db
-      def open(db_type = :server_db, *params)
-        register(create_session(db_type, params))
+      # @param [String] endpoint_url The path to the server, either a URL or path to embedded DB
+      # @param [Hash] params Additional configuration options
+      def open(db_type = :server_db, endpoint_url = nil, params = {})
+        validate_session_num!(db_type)
+        name = params[:name]
+        default = params[:default]
+        [:name, :default].each { |k| params.delete(k) }
+        register(create_session(db_type, endpoint_url, params), name, default)
       end
 
-      def open_named(db_type, name, default = nil, *params)
-        fail 'Multiple sessions is currently only supported for Neo4j Server connections.' unless db_type == :server_db
-        register(create_session(db_type, params), name, default)
+      # @private
+      def validate_session_num!(db_type)
+        return unless current && db_type == :embedded_db
+        fail InitializationError, 'Multiple sessions are not supported by Neo4j Embedded.'
       end
+      private :validate_session_num!
 
       # @private
-      def create_session(db_type, params = {})
+      def create_session(db_type, endpoint_url, params = {})
         unless @@factories[db_type]
-          fail "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
+          fail InitializationError, "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
         end
-        @@factories[db_type].call(*params)
+        @@factories[db_type].call(endpoint_url, params)
       end
 
       # @return [Neo4j::Session] the current session
@@ -140,11 +149,11 @@ module Neo4j
 
       # Registers a callback which will be called immediately if session is already available,
       # or called when it later becomes available.
-      def on_session_available(&callback)
-        callback.call(Neo4j::Session.current) if Neo4j::Session.current
+      def on_session_available
+        yield Neo4j::Session.current if Neo4j::Session.current
 
         add_listener do |event, data|
-          callback.call(data) if event == :session_available
+          yield data if event == :session_available
         end
       end
 
@@ -159,6 +168,10 @@ module Neo4j
         "#{gem}-gem/#{version} (https://github.com/neo4jrb/#{gem})"
       end
 
+      def clear_listeners
+        @@listeners = []
+      end
+
       # @private
       def add_listener(&listener)
         _listeners << listener

data/lib/neo4j/tasks/config_server.rb

@@ -13,7 +13,10 @@ module Neo4j
       # Toggles the status of Neo4j 2.2's basic auth
       def toggle_auth(status, source_text)
         status_string = status == :enable ? 'true' : 'false'
-        set_property(source_text, 'dbms.security.authorization_enabled', status_string)
+        %w(dbms.security.authorization_enabled dbms.security.auth_enabled).each do |key|
+          source_text = set_property(source_text, key, status_string)
+        end
+        source_text
       end
 
       # POSTs to an endpoint with the form required to change a Neo4j password

data/lib/neo4j/tasks/neo4j_server.rake

@@ -7,48 +7,36 @@ require 'httparty'
 require File.expand_path('../config_server', __FILE__)
 
 namespace :neo4j do
-  def download_neo4j(file)
-    file_name, download_url = if OS::Underlying.windows?
-                                ['neo4j.zip', "http://dist.neo4j.org/neo4j-#{file}-windows.zip"]
-                              else
-                                ['neo4j-unix.tar.gz', "http://dist.neo4j.org/neo4j-#{file}-unix.tar.gz"]
-                              end
-
-    unless File.exist?(file_name)
-      # check if file is available
-      status = HTTParty.head(download_url).code
-      fail "#{file} is not available to download, try a different version" if status < 200 || status >= 300
-      df = File.open(file_name, 'wb')
-      success = false
-      begin
-        df << HTTParty.get(download_url)
-        success = true
-      ensure
-        df.close
-        File.delete(file_name) unless success
-      end
-    end
+  def file_name
+    OS::Underlying.windows? ? 'neo4j.zip' : 'neo4j-unix.tar.gz'
+  end
+
+  def download_url(edition)
+    "http://dist.neo4j.org/neo4j-#{edition}-#{OS::Underlying.windows? ? 'windows.zip' : 'unix.tar.gz'}"
+  end
+
+  def download_neo4j_unless_exists(edition)
+    download_neo4j(edition) unless File.exist?(file_name)
+  end
+
+  def download_neo4j(edition)
+    success = false
 
-    # # http://download.neo4j.org/artifact?edition=community&version=2.1.2&distribution=tarball&dlid=3462770&_ga=1.110610309.1220184053.1399636580
-    #
-    # parsed_url = URI.parse(download_url)
-    #
-    # puts "parsed_url.host #{parsed_url.host} port #{parsed_url.port} uri: #{parsed_url.request_uri}"
-    # Net::HTTP.start(parsed_url.host, parsed_url.port) do |http|
-    #   request = Net::HTTP::Get.new parsed_url.request_uri
-    #   http.request request do |response|
-    #     File.open 'large_file.tar.gz', 'wb' do |io|
-    #       response.read_body do |chunk|
-    #         io.write chunk
-    #       end
-    #     end
-    #   end
-    # end
-    #
-    # puts "DOWN LOAD URL #{download_url}, exist #{file_name} : #{File.exist?(file_name)}"
-    #
+    File.open(file_name, 'wb') do |file|
+      file << request_url(download_url(edition))
+      success = true
+    end
 
     file_name
+  ensure
+    File.delete(file_name) unless success
+  end
+
+  def request_url(url)
+    status = HTTParty.head(url).code
+    fail "#{edition} is not available to download, try a different version" if status < 200 || status >= 300
+
+    HTTParty.get(url)
   end
 
   def get_environment(args)
@@ -67,24 +55,36 @@ namespace :neo4j do
   def start_server(command, args)
     puts "Starting Neo4j #{get_environment(args)}..."
     if OS::Underlying.windows?
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `#{install_location(args)}/bin/Neo4j.bat #{command}`  # start service
-      else
-        puts 'Starting Neo4j directly, not as a service.'
-        `#{install_location(args)}/bin/Neo4j.bat`
-      end
+      start_windows_server(command, args)
+    else
+      start_starnix_server(command, args)
+    end
+  end
+
+  def system_or_fail(command)
+    system(command) or fail "Unable to run: #{command}" # rubocop:disable Style/AndOr
+  end
+
+  def start_windows_server(command, args)
+    if system_or_fail!('reg query "HKU\\S-1-5-19"').size > 0
+      system_or_fail("#{install_location(args)}/bin/Neo4j.bat #{command}")  # start service
     else
-      `#{install_location(args)}/bin/neo4j #{command}`
+      puts 'Starting Neo4j directly, not as a service.'
+      system_or_fail("#{install_location(args)}/bin/Neo4j.bat")
     end
   end
 
+  def start_starnix_server(command, args)
+    system_or_fail("#{install_location(args)}/bin/neo4j #{command}")
+  end
+
   desc 'Install Neo4j with auth disabled in v2.2+, example neo4j:install[community-2.1.3,development]'
   task :install, :edition, :environment do |_, args|
-    file = args[:edition]
+    edition = args[:edition]
     environment = get_environment(args)
-    puts "Installing Neo4j-#{file} environment: #{environment}"
+    puts "Installing Neo4j-#{edition} environment: #{environment}"
 
-    downloaded_file = download_neo4j file
+    downloaded_file = download_neo4j_unless_exists edition
 
     if OS::Underlying.windows?
       # Extract and move to neo4j directory
@@ -100,20 +100,20 @@ namespace :neo4j do
             end
           end
         end
-        FileUtils.mv "neo4j-#{file}", install_location(args)
+        FileUtils.mv "neo4j-#{edition}", install_location(args)
         FileUtils.rm downloaded_file
       end
 
       # Install if running with Admin Privileges
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `"#{install_location(args)}/bin/neo4j install"`
+      if system_or_fail('reg query "HKU\\S-1-5-19"').size > 0
+        system_or_fail("\"#{install_location(args)}/bin/neo4j install\"")
         puts 'Neo4j Installed as a service.'
       end
 
     else
-      `tar -xvf #{downloaded_file}`
-      `mv neo4j-#{file} #{install_location(args)}`
-      `rm #{downloaded_file}`
+      system_or_fail("tar -xvf #{downloaded_file}")
+      system_or_fail("mv neo4j-#{edition} #{install_location(args)}")
+      system_or_fail("rm #{downloaded_file}")
       puts 'Neo4j Installed in to neo4j directory.'
     end
     rake_auth_toggle(args, :disable) unless /-2\.0|1\.[0-9]/.match(args[:edition])
@@ -141,81 +141,58 @@ namespace :neo4j do
     File.open(location, 'w') { |file| file.puts replace }
   end
 
+  def validate_is_system_admin!
+    return unless OS::Underlying.windows?
+    return if system_or_fail("reg query \"HKU\\S-1-5-19\"").size > 0
+
+    fail 'You do not have administrative rights to stop the Neo4j Service'
+  end
+
+  def run_neo4j_command_or_fail!(args, command)
+    binary = OS::Underlying.windows? ? 'Neo4j.bat' : 'neo4j'
+
+    system_or_fail("#{install_location(args)}/bin/#{binary} #{command}")
+  end
+
   desc 'Stop the Neo4j Server'
   task :stop, :environment do |_, args|
     puts "Stopping Neo4j #{get_environment(args)}..."
-    if OS::Underlying.windows?
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `#{install_location(args)}/bin/Neo4j.bat stop`  # stop service
-      else
-        puts 'You do not have administrative rights to stop the Neo4j Service'
-      end
-    else
-      `#{install_location(args)}/bin/neo4j stop`
-    end
+    validate_is_system_admin!
+
+    run_neo4j_command_or_fail!(args, :stop)
   end
 
   desc 'Get info the Neo4j Server'
   task :info, :environment do |_, args|
     puts "Info from Neo4j #{get_environment(args)}..."
-    if OS::Underlying.windows?
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `#{install_location(args)}/bin/Neo4j.bat info`  # stop service
-      else
-        puts 'You do not have administrative rights to get info from the Neo4j Service'
-      end
-    else
-      puts `#{install_location(args)}/bin/neo4j info`
-    end
+    validate_is_system_admin!
+
+    run_neo4j_command_or_fail!(args, :info)
   end
 
   desc 'Restart the Neo4j Server'
   task :restart, :environment do |_, args|
     puts "Restarting Neo4j #{get_environment(args)}..."
-    if OS::Underlying.windows?
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `#{install_location(args)}/bin/Neo4j.bat restart`
-      else
-        puts 'You do not have administrative rights to restart the Neo4j Service'
-      end
-    else
-      `#{install_location(args)}/bin/neo4j restart`
-    end
+    validate_is_system_admin!
+
+    run_neo4j_command_or_fail!(args, :restart)
   end
 
   desc 'Reset the Neo4j Server'
   task :reset_yes_i_am_sure, :environment do |_, args|
-    # Stop the server
-    if OS::Underlying.windows?
-      if `reg query "HKU\\S-1-5-19"`.size > 0
-        `#{install_location(args)}/bin/Neo4j.bat stop`
-
-        # Reset the database
-        FileUtils.rm_rf("#{install_location(args)}/data/graph.db")
-        FileUtils.mkdir("#{install_location(args)}/data/graph.db")
-
-        # Remove log files
-        FileUtils.rm_rf("#{install_location(args)}/data/log")
-        FileUtils.mkdir("#{install_location(args)}/data/log")
+    validate_is_system_admin!
 
-        `#{install_location(args)}/bin/Neo4j.bat start`
-      else
-        puts 'You do not have administrative rights to reset the Neo4j Service'
-      end
-    else
-      `#{install_location(args)}/bin/neo4j stop`
+    run_neo4j_command_or_fail!(args, :stop)
 
-      # Reset the database
-      FileUtils.rm_rf("#{install_location(args)}/data/graph.db")
-      FileUtils.mkdir("#{install_location(args)}/data/graph.db")
+    # Reset the database
+    FileUtils.rm_rf("#{install_location(args)}/data/graph.db")
+    FileUtils.mkdir("#{install_location(args)}/data/graph.db")
 
-      # Remove log files
-      FileUtils.rm_rf("#{install_location(args)}/data/log")
-      FileUtils.mkdir("#{install_location(args)}/data/log")
+    # Remove log files
+    FileUtils.rm_rf("#{install_location(args)}/data/log")
+    FileUtils.mkdir("#{install_location(args)}/data/log")
 
-      # Start the server
-      `#{install_location(args)}/bin/neo4j start`
-    end
+    run_neo4j_command_or_fail!(args, :start)
   end
 
   desc 'Neo4j 2.2: Change connection password'

data/lib/neo4j/transaction.rb

@@ -24,7 +24,6 @@ module Neo4j
       def mark_expired
         @expired = true
       end
-      alias_method :expired, :mark_expired
 
       def expired?
         !!@expired
@@ -62,7 +61,7 @@ module Neo4j
         return if @pushed_nested >= 0
         fail "Can't commit transaction, already committed" if @pushed_nested < -1
         Neo4j::Transaction.unregister(self)
-        failed? ? _delete_tx : _commit_tx
+        failed? ? delete : commit
       end
     end
 
@@ -79,20 +78,14 @@ module Neo4j
 
       return yield(nil) unless run_in_tx
 
-      begin
-        tx = Neo4j::Transaction.new
-        ret = yield tx
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        if e.respond_to?(:cause) && e.cause.respond_to?(:print_stack_trace)
-          puts "Java Exception in a transaction, cause: #{e.cause}"
-          e.cause.print_stack_trace
-        end
-        tx.mark_failed unless tx.nil?
-        raise
-      ensure
-        tx.close unless tx.nil?
-      end
-      ret
+      tx = Neo4j::Transaction.new
+      yield tx
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      print_exception_cause(e)
+      tx.mark_failed unless tx.nil?
+      raise
+    ensure
+      tx.close unless tx.nil?
     end
 
     # @return [Neo4j::Transaction]
@@ -100,6 +93,14 @@ module Neo4j
       Thread.current[:neo4j_curr_tx]
     end
 
+    # @private
+    def print_exception_cause(exception)
+      return if !exception.respond_to?(:cause) || !exception.cause.respond_to?(:print_stack_trace)
+
+      puts "Java Exception in a transaction, cause: #{exception.cause}"
+      exception.cause.print_stack_trace
+    end
+
     # @private
     def unregister(tx)
       Thread.current[:neo4j_curr_tx] = nil if tx == Thread.current[:neo4j_curr_tx]

data/lib/neo4j-core/cypher_translator.rb

@@ -44,7 +44,7 @@ module Neo4j
       end
 
       # Cypher Helper
-      def cypher_prop_list(props)
+      def cypher_prop_list!(props)
         return nil unless props
         props.reject! { |_, v| v.nil? }
         {props: props.each { |k, v|  props[k] = create_escape_value(v) }}