neo4j-core 3.1.1 → 4.0.0

data/lib/neo4j/property_container.rb

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

data/lib/neo4j/property_validator.rb

@@ -2,7 +2,6 @@ module Neo4j
   module PropertyValidator
     require 'set'
     class InvalidPropertyException < Exception
-
     end
 
     # the valid values on a property, and arrays of those.
@@ -15,9 +14,9 @@ module Neo4j
     end
 
     def validate_property(value)
-      unless valid_property?(value)
-        raise Neo4j::PropertyValidator::InvalidPropertyException.new("Not valid Neo4j Property value #{value.class}, valid: #{Neo4j::Node::VALID_PROPERTY_VALUE_CLASSES.to_a.join(', ')}")
-      end
+      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(', ')}"
     end
   end
-end
+end

data/lib/neo4j/relationship.rb

@@ -9,7 +9,6 @@ module Neo4j
   # Furthermore, Neo4j guarantees that a relationship is never "hanging freely,"
   # i.e. start_node, end_node and other_node are guaranteed to always return valid, non-nil nodes.
   class Relationship
-
     # A module that allows plugins to register wrappers around Neo4j::Node objects
     module Wrapper
       # Used by Neo4j::NodeMixin to wrap nodes
@@ -20,7 +19,6 @@ module Neo4j
       def neo4j_obj
         self
       end
-
     end
 
     include PropertyContainer
@@ -28,39 +26,39 @@ module Neo4j
     include Wrapper
 
     # @return [Hash<Symbol,Object>] all properties of the relationship
-    def props()
-      raise 'not implemented'
+    def props
+      fail 'not implemented'
     end
 
     # replace all properties with new properties
     # @param [Hash] properties a hash of properties the relationship should have
     def props=(properties)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Updates the properties, keeps old properties
     # @param [Hash<Symbol,Object>] properties hash of properties that should be updated on the relationship
     def update_props(properties)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Directly remove the property on the relationship (low level method, may need transaction)
     def remove_property(key)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Directly set the property on the relationship (low level method, may need transaction)
     # @param [Hash, String] key
     # @param value see Neo4j::PropertyValidator::VALID_PROPERTY_VALUE_CLASSES for valid values
     def set_property(key, value)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Directly get the property on the relationship (low level method, may need transaction)
     # @param [Hash, String] key
     # @return the value of the key
     def get_property(key, value)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Returns the start node of this relationship.
@@ -72,7 +70,7 @@ module Neo4j
     # Same as #start_node but does not wrap the node
     # @return [Neo4j::Node]
     def _start_node
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Returns the end node of this relationship.
@@ -84,24 +82,24 @@ module Neo4j
     # Same as #end_node but does not wrap the node
     # @return [Neo4j::Node]
     def _end_node
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # @abstract
     def del
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # The unique neo4j id
     # @abstract
     def neo_id
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # @return [true, false] if the relationship exists
     # @abstract
     def exist?
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # Returns the relationship name
@@ -112,7 +110,7 @@ module Neo4j
     #   a.rels.first.rel_type # => :friends
     # @return [Symbol] the type of the relationship
     def rel_type
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     # A convenience operation that, given a node that is attached to this relationship, returns the other node.
@@ -134,14 +132,12 @@ module Neo4j
 
     # Same as #other_node but can return a none wrapped node
     def _other_node(node)
-      s = _start_node
-      e = _end_node
       if node == _start_node
-        return _end_node
+        _end_node
       elsif node == _end_node
-        return _start_node
+        _start_node
       else
-        raise "Node #{node.inspect} is neither start nor end node"
+        fail "Node #{node.inspect} is neither start nor end node"
       end
     end
 
@@ -159,7 +155,6 @@ module Neo4j
       def _load(neo_id, session = Neo4j::Session.current)
         session.load_relationship(neo_id)
       end
-
     end
   end
-end
+end

data/lib/neo4j/session.rb

@@ -1,6 +1,5 @@
 module Neo4j
   class Session
-
     @@current_session = nil
     @@all_sessions = {}
     @@factories = {}
@@ -13,24 +12,24 @@ module Neo4j
     # Only for embedded database
     # @abstract
     def start
-      raise "not impl."
+      fail 'not impl.'
     end
 
     # Only for embedded database
     # @abstract
     def shutdown
-      raise "not impl."
+      fail 'not impl.'
     end
 
     # Only for embedded database
     # @abstract
     def running
-      raise "not impl."
+      fail 'not impl.'
     end
 
     # @return [:embedded_db | :server_db]
     def db_type
-      raise "not impl."
+      fail 'not impl.'
     end
 
     def auto_commit?
@@ -39,7 +38,7 @@ module Neo4j
 
     # @abstract
     def begin_tx
-      raise "not impl."
+      fail 'not impl.'
     end
 
     class CypherError < StandardError
@@ -67,14 +66,14 @@ module Neo4j
     # @see http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html The Cypher Query Language Documentation
     #
     def query(options = {})
-      raise 'not implemented, abstract'
+      fail 'not implemented, abstract'
     end
 
     # Same as #query but does not accept an DSL and returns the raw result from the database.
     # Notice, it might return different values depending on which database is used, embedded or server.
     # @abstract
     def _query(*params)
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     class << self
@@ -95,19 +94,19 @@ 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)
+      def open(db_type = :server_db, *params)
         register(create_session(db_type, params))
       end
 
       def open_named(db_type, name, default = nil, *params)
-        raise "Multiple sessions is currently only supported for Neo4j Server connections." unless db_type == :server_db
+        fail 'Multiple sessions is currently only supported for Neo4j Server connections.' unless db_type == :server_db
         register(create_session(db_type, params), name, default)
       end
 
       # @private
       def create_session(db_type, params = {})
-        unless (@@factories[db_type])
-          raise "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
+        unless @@factories[db_type]
+          fail "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
         end
         @@factories[db_type].call(*params)
       end
@@ -119,7 +118,7 @@ module Neo4j
 
       # Returns the current session or raise an exception if no session is available
       def current!
-        raise "No session, please create a session first with Neo4j::Session.open(:server_db) or :embedded_db" unless current
+        fail 'No session, please create a session first with Neo4j::Session.open(:server_db) or :embedded_db' unless current
         current
       end
 
@@ -130,7 +129,7 @@ module Neo4j
 
       # Returns a session with given name or else raise an exception
       def named(name)
-        @@all_sessions[name] || raise("No session named #{name}.")
+        @@all_sessions[name] || fail("No session named #{name}.")
       end
 
       # Sets the session to be used as default
@@ -142,9 +141,8 @@ 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)
-        if (Neo4j::Session.current)
-          callback.call(Neo4j::Session.current)
-        end
+        callback.call(Neo4j::Session.current) if Neo4j::Session.current
+
         add_listener do |event, data|
           callback.call(data) if event == :session_available
         end
@@ -158,12 +156,12 @@ module Neo4j
                        end
 
 
-        "#{gem} gem/#{version} (https://github.com/neo4jrb/#{gem})"
+        "#{gem}-gem/#{version} (https://github.com/neo4jrb/#{gem})"
       end
 
       # @private
       def add_listener(&listener)
-        self._listeners << listener
+        _listeners << listener
       end
 
       # @private
@@ -174,7 +172,7 @@ module Neo4j
 
       # @private
       def _notify_listeners(event, data)
-        _listeners.each {|li| li.call(event, data)}
+        _listeners.each { |li| li.call(event, data) }
       end
 
       # @private
@@ -194,7 +192,7 @@ module Neo4j
       end
 
       def inspect
-         "Neo4j::Session available: #{@@factories && @@factories.keys}"
+        "Neo4j::Session available: #{@@factories && @@factories.keys}"
       end
 
       # @private

data/lib/neo4j/tasks/config_server.rb

@@ -1,7 +1,6 @@
 module Neo4j
   module Tasks
     module ConfigServer
-
       def config(source_text, port)
         s = set_property(source_text, 'org.neo4j.server.webserver.https.enabled', 'false')
         set_property(s, 'org.neo4j.server.webserver.port', port)
@@ -24,11 +23,11 @@ module Neo4j
       # @return [Hash] The response from the server indicating success/failure.
       def change_password(target_address, old_password, new_password)
         uri = URI.parse("#{target_address}/user/neo4j/password")
-        response = Net::HTTP.post_form(uri, { 'password' => old_password, 'new_password' => new_password })
+        response = Net::HTTP.post_form(uri,  'password' => old_password, 'new_password' => new_password)
         JSON.parse(response.body)
       end
 
       extend self
     end
   end
-end
+end

data/lib/neo4j/tasks/neo4j_server.rake

@@ -4,27 +4,27 @@ require 'os'
 require 'httparty'
 require 'zip'
 require 'httparty'
-require File.expand_path("../config_server", __FILE__)
+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"]
+                                ['neo4j.zip', "http://dist.neo4j.org/neo4j-#{file}-windows.zip"]
                               else
-                                ["neo4j-unix.tar.gz", "http://dist.neo4j.org/neo4j-#{file}-unix.tar.gz"]
+                                ['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
-      raise "#{file} is not available to download, try a different version" if status < 200 || status >= 300
+      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()
+        df.close
         File.delete(file_name) unless success
       end
     end
@@ -56,7 +56,7 @@ namespace :neo4j do
   end
 
   def install_location(args)
-    FileUtils.mkdir_p("db/neo4j")
+    FileUtils.mkdir_p('db/neo4j')
     "db/neo4j/#{get_environment(args)}"
   end
 
@@ -64,7 +64,21 @@ namespace :neo4j do
     "#{install_location(args)}/conf/neo4j-server.properties"
   end
 
-  desc "Install Neo4j with auth disabled in v2.2+, example neo4j:install[community-2.1.3,development]"
+  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
+    else
+      `#{install_location(args)}/bin/neo4j #{command}`
+    end
+  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]
     environment = get_environment(args)
@@ -77,110 +91,104 @@ namespace :neo4j do
       unless File.exist?(install_location(args))
         Zip::ZipFile.open(downloaded_file) do |zip_file|
           zip_file.each do |f|
-           f_path = File.join(".", f.name)
-           FileUtils.mkdir_p(File.dirname(f_path))
-           begin
-             zip_file.extract(f, f_path) unless File.exist?(f_path)
-           rescue
-             puts "#{f.name} failed to extract."
-           end
+            f_path = File.join('.', f.name)
+            FileUtils.mkdir_p(File.dirname(f_path))
+            begin
+              zip_file.extract(f, f_path) unless File.exist?(f_path)
+            rescue
+              puts "#{f.name} failed to extract."
+            end
           end
         end
         FileUtils.mv "neo4j-#{file}", install_location(args)
         FileUtils.rm downloaded_file
-     end
+      end
 
       # Install if running with Admin Privileges
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-        %x["#{install_location(args)}/bin/neo4j install"]
-        puts "Neo4j Installed as a service."
+      if `reg query "HKU\\S-1-5-19"`.size > 0
+        `"#{install_location(args)}/bin/neo4j install"`
+        puts 'Neo4j Installed as a service.'
       end
 
     else
-      %x[tar -xvf #{downloaded_file}]
-      %x[mv neo4j-#{file} #{install_location(args)}]
-      %x[rm #{downloaded_file}]
-      puts "Neo4j Installed in to neo4j directory."
+      `tar -xvf #{downloaded_file}`
+      `mv neo4j-#{file} #{install_location(args)}`
+      `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])
     puts "Type 'rake neo4j:start' or 'rake neo4j:start[ENVIRONMENT]' to start it\nType 'neo4j:config[ENVIRONMENT,PORT]' for changing server port, (default 7474)"
   end
 
-  desc "Start the Neo4j Server"
+  desc 'Start the Neo4j Server'
   task :start, :environment do |_, args|
-    puts "Starting Neo4j #{get_environment(args)}..."
-    if OS::Underlying.windows?
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-        %x[#{install_location(args)}/bin/Neo4j.bat start]  #start service
-      else
-        puts "Starting Neo4j directly, not as a service."
-        %x[#{install_location(args)}/bin/Neo4j.bat]
-      end
-    else
-      %x[#{install_location(args)}/bin/neo4j start]
-    end
+    start_server('start', args)
   end
 
-  desc "Configure Server, e.g. rake neo4j:config[development,8888]"
-  task :config, :environment, :port do |_, args|
+  desc 'Start the Neo4j Server asynchronously'
+  task :start_no_wait, :environment do |_, args|
+    start_server('start-no-wait', args)
+  end
 
+  desc 'Configure Server, e.g. rake neo4j:config[development,8888]'
+  task :config, :environment, :port do |_, args|
     port = args[:port]
-    raise "no port given" unless port
+    fail 'no port given' unless port
     puts "Config Neo4j #{get_environment(args)} for port #{port}"
     location = config_location(args)
     text = File.read(location)
     replace = Neo4j::Tasks::ConfigServer.config(text, port)
-    File.open(location, "w") {|file| file.puts replace}
+    File.open(location, 'w') { |file| file.puts replace }
   end
 
-  desc "Stop the Neo4j Server"
+  desc 'Stop the Neo4j Server'
   task :stop, :environment do |_, args|
     puts "Stopping Neo4j #{get_environment(args)}..."
     if OS::Underlying.windows?
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-         %x[#{install_location(args)}/bin/Neo4j.bat stop]  #stop service
+      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"
+        puts 'You do not have administrative rights to stop the Neo4j Service'
       end
     else
-      %x[#{install_location(args)}/bin/neo4j stop]
+      `#{install_location(args)}/bin/neo4j stop`
     end
   end
 
-  desc "Get info the Neo4j Server"
+  desc 'Get info the Neo4j Server'
   task :info, :environment do |_, args|
     puts "Info from Neo4j #{get_environment(args)}..."
     if OS::Underlying.windows?
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-        %x[#{install_location(args)}/bin/Neo4j.bat info]  #stop service
+      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"
+        puts 'You do not have administrative rights to get info from the Neo4j Service'
       end
     else
-      puts %x[#{install_location(args)}/bin/neo4j info]
+      puts `#{install_location(args)}/bin/neo4j info`
     end
   end
 
-  desc "Restart the Neo4j Server"
+  desc 'Restart the Neo4j Server'
   task :restart, :environment do |_, args|
     puts "Restarting Neo4j #{get_environment(args)}..."
     if OS::Underlying.windows?
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-         %x[#{install_location(args)}/bin/Neo4j.bat restart]
+      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"
+        puts 'You do not have administrative rights to restart the Neo4j Service'
       end
     else
-      %x[#{install_location(args)}/bin/neo4j restart]
+      `#{install_location(args)}/bin/neo4j restart`
     end
   end
 
-  desc "Reset the Neo4j Server"
+  desc 'Reset the Neo4j Server'
   task :reset_yes_i_am_sure, :environment do |_, args|
     # Stop the server
     if OS::Underlying.windows?
-      if %x[reg query "HKU\\S-1-5-19"].size > 0
-         %x[#{install_location(args)}/bin/Neo4j.bat stop]
+      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")
@@ -190,12 +198,12 @@ namespace :neo4j do
         FileUtils.rm_rf("#{install_location(args)}/data/log")
         FileUtils.mkdir("#{install_location(args)}/data/log")
 
-        %x[#{install_location(args)}/bin/Neo4j.bat start]
+        `#{install_location(args)}/bin/Neo4j.bat start`
       else
-        puts "You do not have administrative rights to reset the Neo4j Service"
+        puts 'You do not have administrative rights to reset the Neo4j Service'
       end
     else
-      %x[#{install_location(args)}/bin/neo4j stop]
+      `#{install_location(args)}/bin/neo4j stop`
 
       # Reset the database
       FileUtils.rm_rf("#{install_location(args)}/data/graph.db")
@@ -206,31 +214,31 @@ namespace :neo4j do
       FileUtils.mkdir("#{install_location(args)}/data/log")
 
       # Start the server
-      %x[#{install_location(args)}/bin/neo4j start]
+      `#{install_location(args)}/bin/neo4j start`
     end
   end
 
-  desc "Neo4j 2.2: Change connection password"
-  task :change_password do |_, args|
-    puts "This will change the password for a Neo4j server"
-    puts "Enter target IP address or host name without protocal and port, press enter for http://localhost:7474"
+  desc 'Neo4j 2.2: Change connection password'
+  task :change_password do
+    puts 'This will change the password for a Neo4j server'
+    puts 'Enter target IP address or host name without protocal and port, press enter for http://localhost:7474'
     address = STDIN.gets.chomp
-    target_address = address.empty? ? "http://localhost:7474" : address
+    target_address = address.empty? ? 'http://localhost:7474' : address
 
-    puts "Input current password. Leave blank if this is a fresh installation of Neo4j."
+    puts 'Input current password. Leave blank if this is a fresh installation of Neo4j.'
     password = STDIN.gets.chomp
-    old_password = password.empty? ? "neo4j" : password
+    old_password = password.empty? ? 'neo4j' : password
 
-    puts "Input new password."
+    puts 'Input new password.'
     new_password = STDIN.gets.chomp
-    raise 'A new password is required' if new_password.empty?
+    fail 'A new password is required' if new_password.empty?
 
     body = Neo4j::Tasks::ConfigServer.change_password(target_address, old_password, new_password)
     if body['errors']
       puts "An error was returned: #{body['errors'][0]['message']}"
     else
-      puts "Password changed successfully! Please update your app to use:"
-      puts "username: neo4j"
+      puts 'Password changed successfully! Please update your app to use:'
+      puts 'username: neo4j'
       puts "password: #{new_password}"
     end
   end
@@ -239,20 +247,20 @@ namespace :neo4j do
     location = config_location(args)
     text = File.read(location)
     replace = Neo4j::Tasks::ConfigServer.toggle_auth(status, text)
-    File.open(location, "w") {|file| file.puts replace}
+    File.open(location, 'w') { |file| file.puts replace }
   end
 
   def auth_toggle_complete(status)
     puts "Neo4j basic authentication #{status}. Restart server to apply."
   end
 
-  desc "Neo4j 2.2: Enable Auth"
+  desc 'Neo4j 2.2: Enable Auth'
   task :enable_auth, :environment do |_, args|
     rake_auth_toggle(args, :enable)
     auth_toggle_complete('enabled')
   end
 
-  desc "Neo4j 2.2: Disable Auth"
+  desc 'Neo4j 2.2: Disable Auth'
   task :disable_auth, :environment do |_, args|
     rake_auth_toggle(args, :disable)
     auth_toggle_complete('disabled')