neo4j 7.2.3 → 8.0.0.alpha.1

data/lib/neo4j/shared.rb

@@ -10,21 +10,26 @@ module Neo4j
     include ActiveModel::Serializers::JSON
 
     module ClassMethods
-      attr_writer :neo4j_session_name
+      # TODO: Deprecate neo4j_session_name(name)
 
-      def neo4j_session_name(name)
-        ActiveSupport::Deprecation.warn 'neo4j_session_name is deprecated and may be removed from future releases, use neo4j_session_name= instead.', caller
+      # remove?
+      def neo4j_session
+        Neo4j::ActiveBase.current_session
+      end
 
-        @neo4j_session_name = name
+      # remove?
+      def current_transaction
+        Neo4j::ActiveBase.current_transaction
       end
 
-      def neo4j_session
-        if @neo4j_session_name
-          Neo4j::Session.named(@neo4j_session_name) ||
-            fail("#{self.name} is configured to use a neo4j session named #{@neo4j_session_name}, but no such session is registered with Neo4j::Session")
-        else
-          Neo4j::Session.current!
-        end
+      # This should be used everywhere.  Should make it easy
+      # to support a session-per-model system
+      def neo4j_query(*args)
+        Neo4j::ActiveBase.query(*args)
+      end
+
+      def new_query
+        Neo4j::ActiveBase.new_query
       end
     end
 
@@ -47,5 +52,9 @@ module Neo4j
     def declared_properties
       self.class.declared_properties
     end
+
+    def neo4j_query(*args)
+      self.class.neo4j_query(*args)
+    end
   end
 end

data/lib/neo4j/shared/attributes.rb

@@ -61,20 +61,16 @@ module Neo4j::Shared
     #
     # @raise [UnknownAttributeError] if the attribute is unknown
     def write_attribute(name, value)
-      if respond_to? "#{name}="
-        send "#{name}=", value
-      else
-        fail Neo4j::UnknownAttributeError, "unknown attribute: #{name}"
-      end
+      fail Neo4j::UnknownAttributeError, "unknown attribute: #{name}" if !respond_to? "#{name}="
+
+      send "#{name}=", value
     end
-    alias_method :[]=, :write_attribute
+    alias []= write_attribute
 
     def query_attribute(name)
-      if respond_to? "#{name}?"
-        send "#{name}?"
-      else
-        fail Neo4j::UnknownAttributeError, "unknown attribute: #{name}"
-      end
+      fail Neo4j::UnknownAttributeError, "unknown attribute: #{name}" if !respond_to? "#{name}?"
+
+      send "#{name}?"
     end
 
     private
@@ -126,11 +122,9 @@ module Neo4j::Shared
       #
       # @return [AttributeDefinition] Attribute's definition
       def attribute(name)
-        if dangerous_attribute?(name)
-          fail Neo4j::DangerousAttributeError, %(an attribute method named "#{name}" would conflict with an existing method)
-        else
-          attribute!(name)
-        end
+        fail Neo4j::DangerousAttributeError, %(an attribute method named "#{name}" would conflict with an existing method) if dangerous_attribute?(name)
+
+        attribute!(name)
       end
 
       # Returns an Array of attribute names as Strings

data/lib/neo4j/shared/callbacks.rb

@@ -19,7 +19,7 @@ module Neo4j
       end
 
       def destroy #:nodoc:
-        tx = Neo4j::Transaction.new
+        tx = Neo4j::ActiveBase.new_transaction
         run_callbacks(:destroy) { super }
       rescue
         @_deleted = false
@@ -49,13 +49,13 @@ module Neo4j
       end
 
       def create_model #:nodoc:
-        Neo4j::Transaction.run do
+        self.class.run_transaction do
           run_callbacks(:create) { super }
         end
       end
 
       def update_model(*) #:nodoc:
-        Neo4j::Transaction.run do
+        self.class.run_transaction do
           run_callbacks(:update) { super }
         end
       end

data/lib/neo4j/shared/cypher.rb

@@ -17,7 +17,7 @@ module Neo4j::Shared
       def creates_unique?
         !!@creates_unique
       end
-      alias_method :unique?, :creates_unique?
+      alias unique? creates_unique?
     end
 
     module RelIdentifiers

data/lib/neo4j/shared/declared_properties.rb

@@ -156,7 +156,7 @@ module Neo4j::Shared
 
     def inject_defaults!(object, props)
       declared_property_defaults.each_pair do |k, v|
-        props[k.to_sym] = v if object.send(k).nil? && props[k.to_sym].nil?
+        props[k.to_sym] = v.respond_to?(:call) ? v.call : v if object.send(k).nil? && props[k.to_sym].nil?
       end
       props
     end

data/lib/neo4j/shared/declared_property.rb

@@ -66,7 +66,7 @@ module Neo4j::Shared
     def default_value
       options[:default]
     end
-    alias_method :default, :default_value
+    alias default default_value
 
     def fail_invalid_options!
       case

data/lib/neo4j/shared/enum.rb

@@ -36,9 +36,6 @@ module Neo4j::Shared
       #   media.video_type!
       #   media.video_type? # => true
       #
-      # @example Disable index: :exact for enum elements
-      #   Media.enum type: [:image, :video, :unknown], _index: false
-      #
       # @example Define a custom mapping for keys-numbers
       #   Media.enum type: { image: 1, video: 2, unknown: 3 }
       #
@@ -67,13 +64,11 @@ module Neo4j::Shared
         end
       end
 
-      VALID_OPTIONS_FOR_ENUMS = [:_index, :_prefix, :_suffix, :_default]
-      DEFAULT_OPTIONS_FOR_ENUMS = {
-        _index: true
-      }
+      VALID_OPTIONS_FOR_ENUMS = [:_prefix, :_suffix]
+      DEFAULT_OPTIONS_FOR_ENUMS = {}
 
       def split_options_and_parameters(parameters)
-        options = DEFAULT_OPTIONS_FOR_ENUMS.clone
+        options = {}
         new_parameters = {}
         parameters.each do |k, v|
           if VALID_OPTIONS_FOR_ENUMS.include? k
@@ -85,16 +80,9 @@ module Neo4j::Shared
         [options, new_parameters]
       end
 
-      def define_property(property_name, enum_keys, options)
-        property_options = build_property_options(enum_keys, options)
-        property property_name, property_options
-        serialize property_name, Neo4j::Shared::TypeConverters::EnumConverter.new(enum_keys, property_options)
-      end
-
-      def build_property_options(_enum_keys, options = {})
-        {
-          default: options[:_default]
-        }
+      def define_property(property_name, enum_keys, _options)
+        property property_name, default: enum_keys.keys.first # .merge(options)
+        serialize property_name, Neo4j::Shared::TypeConverters::EnumConverter.new(enum_keys)
       end
 
       def define_enum_methods(property_name, enum_keys, options)

data/lib/neo4j/shared/identity.rb

@@ -1,28 +1,34 @@
-module Neo4j::Shared
-  module Identity
-    def ==(other)
-      other.class == self.class && other.id == id
-    end
-    alias_method :eql?, :==
+module Neo4j
+  module Shared
+    module Identity
+      def ==(other)
+        other.class == self.class && other.id == id
+      end
+      alias eql? ==
 
-    # Returns an Enumerable of all (primary) key attributes
-    # or nil if model.persisted? is false
-    def to_key
-      _persisted_obj ? [id] : nil
-    end
+      # Returns an Enumerable of all (primary) key attributes
+      # or nil if model.persisted? is false
+      def to_key
+        _persisted_obj ? [id] : nil
+      end
 
-    # @return [Integer, nil] the neo4j id of the node if persisted or nil
-    def neo_id
-      _persisted_obj ? _persisted_obj.neo_id : nil
-    end
+      # @return [Integer, nil] the neo4j id of the node if persisted or nil
+      def neo_id
+        _persisted_obj ? _persisted_obj.neo_id : nil
+      end
 
-    def id
-      id = neo_id
-      id.is_a?(Integer) ? id : nil
-    end
+      def id
+        if self.class.id_property_name
+          send(self.class.id_property_name)
+        else
+          # ActiveRel
+          neo_id
+        end
+      end
 
-    def hash
-      id.hash
+      def hash
+        id.hash
+      end
     end
   end
 end

data/lib/neo4j/shared/persistence.rb

@@ -9,7 +9,7 @@ module Neo4j::Shared
 
     def update_model
       return if !changed_attributes || changed_attributes.empty?
-      _persisted_obj.update_props(props_for_update)
+      neo4j_query(query_as(:n).set(n: props_for_update))
       changed_attributes.clear
     end
 
@@ -81,14 +81,13 @@ module Neo4j::Shared
       @_create_or_updating = true
       apply_default_values
       result = _persisted_obj ? update_model : create_model
-      if result == false
-        Neo4j::Transaction.current.failure if Neo4j::Transaction.current
-        false
-      else
-        true
-      end
+      current_transaction = Neo4j::ActiveBase.current_transaction
+
+      current_transaction.mark_failed if result == false && current_transaction
+
+      result != false
     rescue => e
-      Neo4j::Transaction.current.failure if Neo4j::Transaction.current
+      current_transaction.mark_failed if current_transaction
       raise e
     ensure
       @_create_or_updating = nil
@@ -97,7 +96,7 @@ module Neo4j::Shared
     def apply_default_values
       return if self.class.declared_property_defaults.empty?
       self.class.declared_property_defaults.each_pair do |key, value|
-        self.send("#{key}=", value) if self.send(key).nil?
+        self.send("#{key}=", value.respond_to?(:call) ? value.call : value) if self.send(key).nil?
       end
     end
 
@@ -116,16 +115,20 @@ module Neo4j::Shared
       !_persisted_obj
     end
 
-    alias_method :new?, :new_record?
+    alias new? new_record?
 
     def destroy
       freeze
-      _persisted_obj && _persisted_obj.del
+
+      destroy_query.exec if _persisted_obj
+
       @_deleted = true
     end
 
     def exist?
-      _persisted_obj && _persisted_obj.exist?
+      return if !_persisted_obj
+
+      neo4j_query(query_as(:n).return('ID(n)')).any?
     end
 
     # Returns +true+ if the object was destroyed.
@@ -170,14 +173,14 @@ module Neo4j::Shared
       self.attributes = process_attributes(attributes)
       save
     end
-    alias_method :update_attributes, :update
+    alias update_attributes update
 
     # Same as {#update_attributes}, but raises an exception if saving fails.
     def update!(attributes)
       self.attributes = process_attributes(attributes)
       save!
     end
-    alias_method :update_attributes!, :update!
+    alias update_attributes! update!
 
     def cache_key
       if self.new_record?
@@ -189,13 +192,19 @@ module Neo4j::Shared
       end
     end
 
+    module ClassMethods
+      def run_transaction(run_in_tx = true)
+        Neo4j::ActiveBase.run_transaction(run_in_tx) { |tx| yield tx }
+      end
+    end
+
     protected
 
     def increment_by_query!(match_query, attribute, by, element_name = :n)
       new_attribute = match_query.with(element_name)
-                      .set("#{element_name}.`#{attribute}` = COALESCE(#{element_name}.`#{attribute}`, 0) + {by}")
-                      .params(by: by).limit(1)
-                      .pluck("#{element_name}.`#{attribute}`").first
+                                 .set("#{element_name}.`#{attribute}` = COALESCE(#{element_name}.`#{attribute}`, 0) + {by}")
+                                 .params(by: by).limit(1)
+                                 .pluck("#{element_name}.`#{attribute}`").first
       return false unless new_attribute
       self[attribute] = new_attribute
       changed_attributes.delete(attribute)

data/lib/neo4j/shared/property.rb

@@ -37,7 +37,7 @@ module Neo4j::Shared
     def read_attribute(name)
       respond_to?(name) ? send(name) : nil
     end
-    alias_method :[], :read_attribute
+    alias [] read_attribute
 
     def send_props(hash)
       return hash if hash.blank?
@@ -58,7 +58,7 @@ module Neo4j::Shared
       return attributes if attributes.blank?
       invalid_properties = attributes.keys.map(&:to_s) - self.attributes.keys
       invalid_properties.reject! { |name| self.respond_to?("#{name}=") }
-      fail UndefinedPropertyError, "Undefined properties: #{invalid_properties.join(',')}" if invalid_properties.size > 0
+      fail UndefinedPropertyError, "Undefined properties: #{invalid_properties.join(',')}" if !invalid_properties.empty?
     end
 
     def extract_writer_methods!(attributes)
@@ -113,6 +113,7 @@ module Neo4j::Shared
 
       def_delegators :declared_properties, :serialized_properties, :serialized_properties=, :serialize, :declared_property_defaults
 
+      VALID_PROPERTY_OPTIONS = %w(type default index constraint serializer typecaster null).map(&:to_sym)
       # Defines a property on the class
       #
       # See active_attr gem for allowed options, e.g which type
@@ -142,6 +143,8 @@ module Neo4j::Shared
       #      property :name, constraint: :unique
       #    end
       def property(name, options = {})
+        invalid_option_keys = options.keys.map(&:to_sym) - VALID_PROPERTY_OPTIONS
+        fail ArgumentError, "Invalid options for property `#{name}` on `#{self.name}`: #{invalid_option_keys.join(', ')}" if invalid_option_keys.any?
         build_property(name, options) do |prop|
           attribute(prop)
         end

data/lib/neo4j/shared/query_factory.rb

@@ -36,7 +36,7 @@ module Neo4j::Shared
     end
 
     def base_query
-      @base_query || Neo4j::Session.current.query
+      @base_query || Neo4j::ActiveBase.new_query
     end
 
     protected
@@ -69,8 +69,7 @@ module Neo4j::Shared
 
     def create_query
       return match_query if graph_object.persisted?
-      labels = graph_object.labels_for_create.map { |l| ":`#{l}`" }.join
-      base_query.create("(#{identifier}#{labels} {#{identifier}_params})").params(identifier_params => graph_object.props_for_create)
+      base_query.create(identifier => {graph_object.labels_for_create => graph_object.props_for_create})
     end
   end
 
@@ -85,8 +84,8 @@ module Neo4j::Shared
       return match_query if graph_object.persisted?
       create_props, set_props = filtered_props
       base_query.send(graph_object.create_method, query_string).break
-        .set(identifier => set_props)
-        .params(:"#{identifier}_create_props" => create_props)
+                .set(identifier => set_props)
+                .params(:"#{identifier}_create_props" => create_props)
     end
 
     private

data/lib/neo4j/shared/type_converters.rb

@@ -38,7 +38,7 @@ module Neo4j::Shared
           value.to_i
         end
 
-        alias_method :to_ruby, :to_db
+        alias to_ruby to_db
       end
     end
 
@@ -55,7 +55,7 @@ module Neo4j::Shared
         def to_db(value)
           value.to_f
         end
-        alias_method :to_ruby, :to_db
+        alias to_ruby to_db
       end
     end
 
@@ -79,7 +79,7 @@ module Neo4j::Shared
             BigDecimal.new(value.to_s)
           end
         end
-        alias_method :to_ruby, :to_db
+        alias to_ruby to_db
       end
     end
 
@@ -96,7 +96,7 @@ module Neo4j::Shared
         def to_db(value)
           value.to_s
         end
-        alias_method :to_ruby, :to_db
+        alias to_ruby to_db
       end
     end
 
@@ -116,7 +116,7 @@ module Neo4j::Shared
           Neo4j::Shared::Boolean
         end
 
-        alias_method :convert_type, :db_type
+        alias convert_type db_type
 
         def to_db(value)
           return false if FALSE_VALUES.include?(value)
@@ -130,7 +130,7 @@ module Neo4j::Shared
           end
         end
 
-        alias_method :to_ruby, :to_db
+        alias to_ruby to_db
       end
     end
 
@@ -264,9 +264,8 @@ module Neo4j::Shared
     end
 
     class EnumConverter
-      def initialize(enum_keys, options)
+      def initialize(enum_keys)
         @enum_keys = enum_keys
-        @options = options
       end
 
       def converted?(value)
@@ -289,7 +288,7 @@ module Neo4j::Shared
         @enum_keys.key(value) unless value.nil?
       end
 
-      alias_method :call, :to_ruby
+      alias call to_ruby
 
       def to_db(value)
         if value.is_a?(Array)