neo4j 4.0.0 → 4.1.0

data/lib/neo4j/active_rel/property.rb

@@ -3,10 +3,10 @@ module Neo4j::ActiveRel
     extend ActiveSupport::Concern
     include Neo4j::Shared::Property
 
-    %w[to_node from_node].each do |direction|
+    %w(to_node from_node).each do |direction|
       define_method("#{direction}") { instance_variable_get("@#{direction}") }
       define_method("#{direction}=") do |argument|
-        raise FrozenRelError, 'Relationship start/end nodes cannot be changed once persisted' if self.persisted?
+        fail FrozenRelError, 'Relationship start/end nodes cannot be changed once persisted' if self.persisted?
         instance_variable_set("@#{direction}", argument)
       end
     end
@@ -34,7 +34,7 @@ module Neo4j::ActiveRel
         end
       end
 
-      %w[to_class from_class].each do |direction|
+      %w(to_class from_class).each do |direction|
         define_method("#{direction}") { |argument| instance_variable_set("@#{direction}", argument) }
         define_method("_#{direction}") { instance_variable_get "@#{direction}" }
       end
@@ -45,6 +45,14 @@ module Neo4j::ActiveRel
       def load_entity(id)
         Neo4j::Node.load(id)
       end
+
+      def creates_unique_rel
+        @unique = true
+      end
+
+      def unique?
+        !!@unique
+      end
     end
 
     private
@@ -54,4 +62,4 @@ module Neo4j::ActiveRel
       @to_node = RelatedNode.new(to_node)
     end
   end
-end
+end

data/lib/neo4j/active_rel/query.rb

@@ -3,18 +3,17 @@ module Neo4j::ActiveRel
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Returns the object with the specified neo4j id.
       # @param [String,Fixnum] id of node to find
       # @param [Neo4j::Session] session optional
       def find(id, session = self.neo4j_session)
-        raise "Unknown argument #{id.class} in find method (expected String or Fixnum)" if not [String, Fixnum].include?(id.class)
+        fail "Unknown argument #{id.class} in find method (expected String or Fixnum)" if not [String, Fixnum].include?(id.class)
         find_by_id(id, session)
       end
 
       # Loads the relationship using its neo_id.
       def find_by_id(key, session = Neo4j::Session.current!)
-        session.query.match("()-[r]-()").where("ID(r)" => key.to_i).limit(1).return(:r).first.r
+        session.query.match('()-[r]-()').where('ID(r)' => key.to_i).limit(1).return(:r).first.r
       end
 
       # Performs a very basic match on the relationship.
@@ -22,7 +21,7 @@ module Neo4j::ActiveRel
       # To use a string, prefix the property with "r1"
       # @example Match with a string
       #   MyRelClass.where('r1.grade > r1')
-      def where(args={})
+      def where(args = {})
         where_query.where(where_string(args)).pluck(:r1)
       end
 
@@ -33,11 +32,11 @@ module Neo4j::ActiveRel
       end
 
       def first
-        all_query.limit(1).order("ID(r1)").pluck(:r1).first
+        all_query.limit(1).order('ID(r1)').pluck(:r1).first
       end
 
       def last
-        all_query.limit(1).order("ID(r1) DESC").pluck(:r1).first
+        all_query.limit(1).order('ID(r1) DESC').pluck(:r1).first
       end
 
       private
@@ -85,7 +84,6 @@ module Neo4j::ActiveRel
           args
         end
       end
-
     end
   end
-end
+end

data/lib/neo4j/active_rel/rel_wrapper.rb

@@ -1,5 +1,4 @@
 class Neo4j::Relationship
-
   module Wrapper
     def wrapper
       props.symbolize_keys!
@@ -25,5 +24,4 @@ class Neo4j::Relationship
       Neo4j::ActiveRel::Types::WRAPPED_CLASSES[rel_type] || rel_type.camelize
     end
   end
-
 end

data/lib/neo4j/active_rel/related_node.rb

@@ -3,7 +3,6 @@ module Neo4j::ActiveRel
   # It's important (or maybe not really IMPORTANT, but at least worth mentioning) that calling method_missing
   # will result in a query to load the node if the node is not already loaded.
   class RelatedNode
-
     class InvalidParameterError < StandardError; end
 
     # ActiveRel's related nodes can be initialized with nothing, an integer, or a fully wrapped node.
@@ -15,13 +14,13 @@ module Neo4j::ActiveRel
     #
     # Initialization with a node doesn't appear to happen in the code. TODO: maybe find out why this is an option.
     def initialize(node = nil)
-      @node = valid_node_param?(node) ? node : (raise InvalidParameterError, 'RelatedNode must be initialized with either a node ID or node' )
+      @node = valid_node_param?(node) ? node : (fail InvalidParameterError, 'RelatedNode must be initialized with either a node ID or node')
     end
 
     # Loads the node if needed, then conducts comparison.
-    def == (obj)
+    def ==(other)
       loaded if @node.is_a?(Fixnum)
-      @node == obj
+      @node == other
     end
 
     # Returns the neo_id of a given node without loading.
@@ -53,4 +52,4 @@ module Neo4j::ActiveRel
       node.nil? || node.is_a?(Integer) || node.respond_to?(:neo_id)
     end
   end
-end
+end

data/lib/neo4j/active_rel/types.rb

@@ -1,6 +1,5 @@
 module Neo4j
   module ActiveRel
-
     # provides mapping of type to model name
     module Types
       extend ActiveSupport::Concern
@@ -21,7 +20,7 @@ module Neo4j
       # which will completely bypass this whole process.
       WRAPPED_CLASSES = {}
 
-      included do |klazz|
+      included do
         type self.name, true
       end
 
@@ -36,12 +35,11 @@ module Neo4j
         end
 
         # @return [String] a string representing the relationship type that will be created
-        def _type
-          @rel_type
-        end
+        attr_reader :rel_type
+        alias_method :_type, :rel_type # Should be deprecated
 
         def add_wrapped_class(type)
-          #_wrapped_classes[type.to_sym.downcase] = self.name
+          # _wrapped_classes[type.to_sym.downcase] = self.name
           _wrapped_classes[type.to_sym] = self.name
         end
 

data/lib/neo4j/active_rel/validations.rb

@@ -3,7 +3,6 @@ module Neo4j
     module Validations
       extend ActiveSupport::Concern
       include Neo4j::Shared::Validations
-
     end
   end
 end

data/lib/neo4j/config.rb

@@ -1,16 +1,12 @@
 module Neo4j
-
-
   # == Keeps configuration for neo4j
   #
   # == Configurations keys
   #
   class Config
-
-    DEFAULT_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "neo4j", "config.yml"))
+    DEFAULT_FILE = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'neo4j', 'config.yml'))
 
     class << self
-
       # @return [Fixnum] The location of the default configuration file.
       def default_file
         @default_file ||= DEFAULT_FILE
@@ -32,14 +28,13 @@ module Neo4j
       end
 
       # Reads from the default_file if configuration is not set already
-      # @return [Hash] the configuration
-      def get_or_setup_configuration
-        @configuration ||= setup
-      end
-
       # @return [Hash] the configuration
       def configuration
-        @configuration || {}
+        return @configuration if @configuration
+
+        @configuration = ActiveSupport::HashWithIndifferentAccess.new
+        @configuration.merge!(defaults)
+        @configuration
       end
 
       # Yields the configuration
@@ -64,14 +59,14 @@ module Neo4j
       # @param [Symbol] key the key to set the parameter for
       # @param val the value of the parameter.
       def []=(key, val)
-        get_or_setup_configuration[key.to_s] = val
+        configuration[key.to_s] = val
       end
 
 
       # @param [Symbol] key The key of the config entry value we want
       # @return the the value of a config entry
       def [](key)
-        get_or_setup_configuration[key.to_s]
+        configuration[key.to_s]
       end
 
 
@@ -80,7 +75,7 @@ module Neo4j
       # @param [Symbol] key the key of the configuration entry to delete
       # @return The value of the removed entry.
       def delete(key)
-        get_or_setup_configuration.delete(key)
+        configuration.delete(key)
       end
 
 
@@ -94,19 +89,12 @@ module Neo4j
 
       # @return [Hash] The config as a hash.
       def to_hash
-        get_or_setup_configuration.to_hash
+        configuration.to_hash
       end
 
       # @return [String] The config as a YAML
       def to_yaml
-        get_or_setup_configuration.to_yaml
-      end
-
-      # @return The a new configuration using default values as a hash.
-      def setup
-        @configuration = ActiveSupport::HashWithIndifferentAccess.new
-        @configuration.merge!(defaults)
-        @configuration
+        configuration.to_yaml
       end
 
       def class_name_property

data/lib/neo4j/core/query.rb

@@ -8,7 +8,7 @@ module Neo4j::Core
     # @return [Neo4j::ActiveNode::Query::QueryProxy] A QueryProxy object.
     def proxy_as(model, var, optional = false)
       # TODO: Discuss whether it's necessary to call `break` on the query or if this should be left to the user.
-      Neo4j::ActiveNode::Query::QueryProxy.new(model, nil, { starting_query: self.break, node: var, optional: optional })
+      Neo4j::ActiveNode::Query::QueryProxy.new(model, nil,  starting_query: self.break, node: var, optional: optional)
     end
 
     # Calls proxy_as with `optional` set true. This doesn't offer anything different from calling `proxy_as` directly but it may be more readable.

data/lib/neo4j/migration.rb

@@ -1,8 +1,7 @@
 module Neo4j
   class Migration
-
     def migrate
-      raise 'not implemented'
+      fail 'not implemented'
     end
 
     def output(string = '')
@@ -30,8 +29,8 @@ module Neo4j
 
       def migrate
         models = ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(models_filename))[:models]
-        output "This task will add an ID Property every node in the given file."
-        output "It may take a significant amount of time, please be patient."
+        output 'This task will add an ID Property every node in the given file.'
+        output 'It may take a significant amount of time, please be patient.'
         models.each do |model|
           output
           output
@@ -41,7 +40,7 @@ module Neo4j
       end
 
       def setup
-        FileUtils.mkdir_p("db/neo4j-migrate")
+        FileUtils.mkdir_p('db/neo4j-migrate')
         unless File.file?(models_filename)
           File.open(models_filename, 'w') do |file|
             file.write("# Provide models to which IDs should be added.\n# It will only modify nodes that do not have IDs. There is no danger of overwriting data.\n# models: [Student,Lesson,Teacher,Exam]\nmodels: []")
@@ -62,7 +61,7 @@ module Neo4j
         last_time_taken = nil
 
         until nodes_left == 0
-          nodes_left = Neo4j::Session.query.match(n: label).where("NOT has(n.#{property})").return("COUNT(n) AS ids").first.ids
+          nodes_left = Neo4j::Session.query.match(n: label).where("NOT has(n.#{property})").return('COUNT(n) AS ids').first.ids
 
           time_per_node = last_time_taken / max_per_batch if last_time_taken
           print_output "Running first batch...\r"
@@ -108,7 +107,7 @@ module Neo4j
 
       def new_id_for(model)
         if model.id_property_info[:type][:auto]
-          SecureRandom::uuid
+          SecureRandom.uuid
         else
           model.new.send(model.id_property_info[:type][:on])
         end
@@ -116,32 +115,32 @@ module Neo4j
     end
 
     class AddClassnames < Neo4j::Migration
-
       def initialize(path = default_path)
         @classnames_filename = 'add_classnames.yml'
         @classnames_filepath = File.join(joined_path(path), classnames_filename)
       end
 
       def migrate
-        output "Adding classnames. This make take some time."
+        output 'Adding classnames. This make take some time.'
         execute(true)
       end
 
       def test
-        output "TESTING! No queries will be executed."
+        output 'TESTING! No queries will be executed.'
         execute(false)
       end
 
       def setup
         output "Creating file #{classnames_filepath}. Please use this as the migration guide."
-        FileUtils.mkdir_p("db/neo4j-migrate")
+        FileUtils.mkdir_p('db/neo4j-migrate')
         unless File.file?(classnames_filepath)
-          source = File.join(File.dirname(__FILE__), "..", "..", "config", "neo4j", classnames_filename)
+          source = File.join(File.dirname(__FILE__), '..', '..', 'config', 'neo4j', classnames_filename)
           FileUtils.copy_file(source, classnames_filepath)
         end
       end
 
       private
+
       attr_reader :classnames_filename, :classnames_filepath, :model_map
 
       def execute(migrate = false)
@@ -165,7 +164,7 @@ module Neo4j
       end
 
       def file_init
-        @model_map = ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(classnames_filepath)) 
+        @model_map = ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(classnames_filepath))
       end
 
       def node_cypher(label, action)
@@ -178,11 +177,11 @@ module Neo4j
         label = hash[0]
         value = hash[1]
         from = value[:from]
-        raise "All relationships require a 'type'" unless value[:type]
+        fail "All relationships require a 'type'" unless value[:type]
 
-        from_cypher = from ? "(from:`#{from}`)" : "(from)"
+        from_cypher = from ? "(from:`#{from}`)" : '(from)'
         to = value[:to]
-        to_cypher = to ? "(to:`#{to}`)" : "(to)"
+        to_cypher = to ? "(to:`#{to}`)" : '(to)'
         type = "[r:`#{value[:type]}`]"
         where, phrase_start = action_variables(action, 'r')
         output "#{phrase_start} _classname '#{label}' where type is '#{value[:type]}' using cypher:"
@@ -191,7 +190,7 @@ module Neo4j
 
       def execute_cypher(query_string)
         output "Modified #{Neo4j::Session.query(query_string).first.modified} records"
-        output ""
+        output ''
       end
 
       def action_variables(action, identifier)
@@ -201,7 +200,7 @@ module Neo4j
         when 'add'
           ["WHERE NOT HAS(#{identifier}._classname)", 'Adding']
         else
-          raise "Invalid action #{action} specified"
+          fail "Invalid action #{action} specified"
         end
       end
     end

data/lib/neo4j/paginated.rb

@@ -18,8 +18,8 @@ module Neo4j
       Paginated.new(ordered_partial, ordered_source, page)
     end
 
-    delegate :each, :to => :items
-    delegate :pluck, :to => :items
-    delegate :size, :[], :to => :items
+    delegate :each, to: :items
+    delegate :pluck, to: :items
+    delegate :size, :[], to: :items
   end
-end
+end

data/lib/neo4j/railtie.rb

@@ -6,8 +6,8 @@ module Neo4j
     config.neo4j = ActiveSupport::OrderedOptions.new
 
     # Add ActiveModel translations to the I18n load_path
-    initializer "i18n" do |app|
-    	config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'locales', '*.{rb,yml}')]
+    initializer 'i18n' do
+      config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'locales', '*.{rb,yml}')]
     end
 
     rake_tasks do
@@ -20,19 +20,19 @@ module Neo4j
         RUBY_PLATFORM =~ /java/
       end
 
-      def set_default_session(cfg)
+      def setup_default_session(cfg)
         cfg.session_type ||= :server_db
-        cfg.session_path ||= "http://localhost:7474"
+        cfg.session_path ||= 'http://localhost:7474'
         cfg.session_options ||= {}
         cfg.sessions ||= []
 
         unless (uri = URI(cfg.session_path)).user.blank?
-          cfg.session_options.reverse_merge!({ basic_auth: { username: uri.user, password: uri.password } })
+          cfg.session_options.reverse_merge!(basic_auth: {username: uri.user, password: uri.password})
           cfg.session_path = cfg.session_path.gsub("#{uri.user}:#{uri.password}@", '')
         end
 
         if cfg.sessions.empty?
-          cfg.sessions << { type: cfg.session_type, path: cfg.session_path, options: cfg.session_options }
+          cfg.sessions << {type: cfg.session_type, path: cfg.session_path, options: cfg.session_options}
         end
       end
 
@@ -46,40 +46,40 @@ module Neo4j
         session.start
       end
 
-      def open_neo4j_session(session_opts)
-        if !java_platform? && session_opts[:type] == :embedded_db
-          raise "Tried to start embedded Neo4j db without using JRuby (got #{RUBY_PLATFORM}), please run `rvm jruby`"
+      def open_neo4j_session(options)
+        type, name, default, path = options.values_at(:type, :name, :default, :path)
+
+        if !java_platform? && type == :embedded_db
+          fail "Tried to start embedded Neo4j db without using JRuby (got #{RUBY_PLATFORM}), please run `rvm jruby`"
         end
 
-        session = if session_opts.key?(:name)
-                    Neo4j::Session.open_named(session_opts[:type], session_opts[:name], session_opts[:default], session_opts[:path])
+        session = if options.key?(:name)
+                    Neo4j::Session.open_named(type, name, default, path)
                   else
-                    Neo4j::Session.open(session_opts[:type], session_opts[:path], session_opts[:options])
+                    Neo4j::Session.open(type, path, options[:options])
                   end
 
-        start_embedded_session(session) if session_opts[:type] == :embedded_db
+        start_embedded_session(session) if type == :embedded_db
       end
-
     end
 
     # Starting Neo after :load_config_initializers allows apps to
     # register migrations in config/initializers
-    initializer "neo4j.start", :after => :load_config_initializers do |app|
+    initializer 'neo4j.start', after: :load_config_initializers do |app|
       cfg = app.config.neo4j
       # Set Rails specific defaults
-      Neo4j::Railtie.set_default_session(cfg)
+      Neo4j::Railtie.setup_default_session(cfg)
 
       cfg.sessions.each do |session_opts|
         Neo4j::Railtie.open_neo4j_session(session_opts)
       end
-      Neo4j::Config.setup.merge!(cfg.to_hash)
+      Neo4j::Config.configuration.merge!(cfg.to_hash)
 
       clear = "\e[0m"
-      red = "\e[31m"
       yellow = "\e[33m"
       cyan = "\e[36m"
 
-      ActiveSupport::Notifications.subscribe('neo4j.cypher_query') do |name, start, finish, id, payload|
+      ActiveSupport::Notifications.subscribe('neo4j.cypher_query') do |_, start, finish, _id, payload|
         ms = (finish - start) * 1000
         Rails.logger.info " #{cyan}#{payload[:context]}#{clear} #{yellow}#{ms.round}ms#{clear} #{payload[:cypher]}" + (payload[:params].size > 0 ? ' | ' + payload[:params].inspect : '')
       end