activegraph 11.4.0 → 11.5.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f068da2126bbed4301cf9fb15c34a708ef7f7a152afbfe42af5482237a041f0d
-  data.tar.gz: 0c87c4c2082a2e999ac8e0ff165e0cdbffe875f7f2eae407ea31f3f119d46a5f
+  metadata.gz: c217d68abf8f640ef01f10e2d7a5b96c6fe7b6f3c4499d24da58718a90646acc
+  data.tar.gz: d8bcda3316fd7cdc1422eb47b186f6eb7d853752d138f014e53a0e425c2f3e4f
 SHA512:
-  metadata.gz: 5c12b0fc53c6bb04d661ec6c1669843e3c59d2ce00a9c7ea909d49b87ba7ef7b4c58ba2196d2c880c70da4ed727d14851fa27a15cf948125e91ee7670a23ff9d
-  data.tar.gz: e0dda99c677170338a7a470d00660fa20528e272452ee81a58722d055af969f0951e3344e0961e3b5ec49b6e0e316527dc0deab5f0ce01fe3dda0c029310ee01
+  metadata.gz: fa79ae2d367a183fb0a5a26363f352d15767540288ae080558fc876854100ecf01815fb76be5460d1f638c3c1a8799a5b44f09e7ce5d0efc8faa8a74baf9c187
+  data.tar.gz: e39a318db8e56067cffbd7ba216d3951184124cb36b48da420334475472d63d17bff7d70027d4d7a9e495d7cb4cb7d4dd8b27b9a4c3bf44e265b24503802b2fd

data/CHANGELOG.md

@@ -3,10 +3,21 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [11.4.0] 2023-02-12
+## [11.5.0.beta.1] 2023-12-29
+
+## Added
+
+- migrated to zeitwerk
+- rails 7.1 support
 
 ## Fixed
 
+- caching of has one relationships
+
+## [11.4.0] 2023-12-02
+
+## Added
+
 - Added support for cypher UNION
 
 ## [11.3.1] 2023-02-12

data/Gemfile

@@ -2,10 +2,6 @@ source 'http://rubygems.org'
 
 gemspec
 
-# gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver'
-
-gem 'listen', '< 3.1'
-
 active_model_version = ENV['ACTIVE_MODEL_VERSION']
 gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive?
 

data/activegraph.gemspec

@@ -30,11 +30,10 @@ DESCRIPTION
     'bug_tracker_uri' => 'https://github.com/neo4jrb/activegraph/issues'
   }
 
-  s.add_dependency('activemodel', '>= 4.0')
-  s.add_dependency('activesupport', '>= 4.0')
+  s.add_dependency('activemodel', '>= 7')
   s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547
-  s.add_dependency('neo4j-ruby-driver', '>= 4.4.1')
-  s.add_dependency('orm_adapter', '~> 0.5.0')
+  s.add_dependency('neo4j-ruby-driver', '>= 4.4.1', '< 5')
+  s.add_dependency('orm_adapter', '>= 0.5.0')
   s.add_dependency('sorted_set')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
@@ -42,10 +41,10 @@ DESCRIPTION
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
-  s.add_development_dependency('railties', '>= 4.0')
+  s.add_development_dependency('railties', '>= 7')
   s.add_development_dependency('rake')
   s.add_development_dependency('rubocop', '>= 0.56.0')
   s.add_development_dependency('yard')
   s.add_development_dependency('dryspec')
-  s.add_development_dependency('rspec', '< 3.10') # Cannot proxy frozen objects
+  s.add_development_dependency('rspec', '>= 3.10')
 end

data/lib/active_graph/attribute_set.rb

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require 'active_model/attribute_set'
-
 module ActiveGraph
   class AttributeSet < ActiveModel::AttributeSet
     def initialize(attr_hash, attr_list)

data/lib/active_graph/base.rb

@@ -1,6 +1,3 @@
-require 'active_graph/core/querable'
-require 'active_graph/core/schema'
-
 module ActiveGraph
   # To contain any base login for Node/Relationship which
   # is external to the main classes

data/lib/active_graph/config.rb

@@ -26,7 +26,6 @@ module ActiveGraph
 
       # @return [Hash] the default file loaded by yaml
       def defaults
-        require 'yaml'
         @defaults ||= ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(default_file))
       end
 

data/lib/active_graph/core/instrumentable.rb

@@ -1,8 +1,3 @@
-require 'active_support/concern'
-require 'active_support/notifications'
-require 'active_graph/ansi'
-require 'active_graph/core/logging'
-
 module ActiveGraph
   module Core
     module Instrumentable

data/lib/active_graph/core/querable.rb

@@ -1,8 +1,3 @@
-require 'active_graph/core/instrumentable'
-require 'active_graph/transaction'
-require 'active_graph/core/query_builder'
-require 'active_graph/core/record'
-
 module ActiveGraph
   module Core
     module Querable

data/lib/active_graph/core/query.rb

@@ -1,7 +1,3 @@
-require 'active_graph/core/query_clauses'
-require 'active_graph/core/query_find_in_batches'
-require 'active_support/notifications'
-
 module ActiveGraph
   module Core
     # Allows for generation of cypher queries via ruby method calls (inspired by ActiveRecord / arel syntax)
@@ -15,9 +11,9 @@ module ActiveGraph
     class Query
       include ActiveGraph::Core::QueryClauses
       include ActiveGraph::Core::QueryFindInBatches
+      include QueryExt
       DEFINED_CLAUSES = {}
 
-
       attr_accessor :clauses
 
       class Parameters
@@ -247,7 +243,7 @@ module ActiveGraph
           neo_id = (node_object.respond_to?(:neo_id) ? node_object.neo_id : node_object)
 
           match_method = optional_match ? :optional_match : :match
-          query.send(match_method, variable).where(variable => {neo_id: neo_id})
+          query.send(match_method, variable).where(variable => { neo_id: })
         end
       end
 
@@ -271,7 +267,6 @@ module ActiveGraph
       # @return [Array]
       # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
 
-
       # Executes a query without returning the result
       # @return [Boolean] true if successful
       # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
@@ -318,6 +313,7 @@ module ActiveGraph
       # @return [String] Resulting cypher query string
       EMPTY = ' '
       NEWLINE = "\n"
+
       def to_cypher(options = {})
         join_string = options[:pretty] ? NEWLINE : EMPTY
 
@@ -334,6 +330,7 @@ module ActiveGraph
         cypher_string = "CYPHER #{@options[:parser]} #{cypher_string}" if @options[:parser]
         cypher_string.tap(&:strip!)
       end
+
       alias cypher to_cypher
 
       def pretty_cypher

data/lib/active_graph/core/query_ext.rb

@@ -1,6 +1,6 @@
 module ActiveGraph
   module Core
-    class Query
+    module QueryExt
       # Creates a ActiveGraph::Node::Query::QueryProxy object that builds off of a Core::Query object.
       #
       # @param [Class] model An Node model to be used as the start of a new QueryuProxy chain

data/lib/active_graph/core/record.rb

@@ -1,8 +1,3 @@
-# frozen_string_literal: true
-
-require 'active_graph/core/result'
-require 'active_support/core_ext/module/attribute_accessors'
-
 module ActiveGraph
   module Core
     module Record

data/lib/active_graph/core/result.rb

@@ -16,6 +16,11 @@ module ActiveGraph
         @records&.each(&block) || super
       end
 
+      ## To avoid to_a on Neo4j::Driver::Result as that one does not call the above block
+      def to_a
+        map.to_a
+      end
+
       def store
         return if @records
         keys

data/lib/active_graph/core/wrappable.rb

@@ -8,7 +8,7 @@ module ActiveGraph
       end
 
       class_methods do
-        def wrapper_callback(proc)
+        def wrapper_callback(&proc)
           fail 'Callback already specified!' if @wrapper_callback
           @wrapper_callback = proc
         end

data/lib/active_graph/lazy_attribute_hash.rb

@@ -1,5 +1,3 @@
-require 'active_model/attribute_set'
-
 module ActiveGraph
   class LazyAttributeHash < ActiveModel::LazyAttributeHash
     def initialize(values, attr_list)

data/lib/active_graph/migration.rb

@@ -1,6 +1,3 @@
-require 'benchmark'
-require 'active_graph/migrations/helpers/id_property'
-
 module ActiveGraph
   class Migration
     def migrate

data/lib/active_graph/migrations/helpers.rb

@@ -1,14 +1,7 @@
-require 'benchmark'
-
 module ActiveGraph
   module Migrations
     module Helpers
       extend ActiveSupport::Concern
-      extend ActiveSupport::Autoload
-
-      autoload :Schema
-      autoload :IdProperty
-      autoload :Relationships
 
       PROPERTY_ALREADY_DEFINED = 'Property `%{new_property}` is already defined in `%{label}`. '\
                                  'To overwrite, call `remove_property(:%{label}, :%{new_property})` before this method.'.freeze

data/lib/active_graph/migrations/runner.rb

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require 'sorted_set'
-
 module ActiveGraph
   module Migrations
     class Runner

data/lib/active_graph/migrations.rb

@@ -1,13 +1,5 @@
 module ActiveGraph
   module Migrations
-    extend ActiveSupport::Autoload
-    autoload :Helpers
-    autoload :MigrationFile
-    autoload :Base
-    autoload :Runner
-    autoload :SchemaMigration
-    autoload :CheckPending
-
     class << self
       def check_for_pending_migrations!
         return if ActiveGraph::Config.configuration['skip_migration_check']

data/lib/active_graph/model_schema.rb

@@ -1,4 +1,3 @@
-require 'set'
 module ActiveGraph
   # This is here to support the removed functionality of being able to
   # defined indexes and constraints on models

data/lib/active_graph/node/has_n/association.rb

@@ -1,6 +1,3 @@
-require 'active_support/inflector/inflections'
-require 'active_graph/class_arguments'
-
 module ActiveGraph
   module Node
     module HasN

data/lib/active_graph/node/has_n.rb

@@ -111,13 +111,17 @@ module ActiveGraph::Node
 
       def add_to_cache(object, rel = nil)
         (@cached_rels ||= []) << rel if rel
-        (@cached_result ||= []).tap { |results| results << object if object && !results.include?(object) }
+        (@cached_result ||= []).tap { |results| results << object if !results.include?(object) } if object
       end
 
       def rels
         @cached_rels || super.tap { |rels| rels.each { |rel| add_to_cache(nil, rel)  } }
       end
 
+      def rel
+        rels.first
+      end
+
       def cache_query_proxy_result
         (result_cache_proc_cache || @query_proxy).to_a.tap { |result| cache_result(result) }
       end

data/lib/active_graph/node/labels.rb

@@ -1,5 +1,3 @@
-require 'active_graph/core/label'
-
 module ActiveGraph
   module Node
     # Provides a mapping between neo4j labels and Ruby classes
@@ -76,7 +74,7 @@ module ActiveGraph
 
       def self.clear_wrapped_models
         MODELS_FOR_LABELS_CACHE.clear
-        ActiveGraph::NodeWrapping::CONSTANTS_FOR_LABELS_CACHE.clear
+        ActiveGraph::Node::Wrapping::CONSTANTS_FOR_LABELS_CACHE.clear
       end
 
       module ClassMethods

data/lib/active_graph/node/orm_adapter.rb

@@ -1,11 +1,5 @@
-require 'orm_adapter'
-
 module ActiveGraph
   module Node
-    module ClassMethods
-      include OrmAdapter::ToAdapter
-    end
-
     class OrmAdapter < ::OrmAdapter::Base
       module ClassMethods
         include ActiveModel::Callbacks

data/lib/active_graph/node/query/query_proxy_methods_of_mass_updating.rb

@@ -51,6 +51,7 @@ module ActiveGraph
         def replace_with(node_or_nodes)
           node_or_nodes = Array(node_or_nodes).map { |arg| arg.is_a?(ActiveGraph::Node) ? arg : @model.find(arg) }
           original_ids = self.pluck(:id)
+          ActiveGraph::Base.lock_node(start_object) unless start_object.new_record?
           delete_rels_for_nodes(original_ids, node_or_nodes.collect(&:id))
           add_rels(node_or_nodes, original_ids)
         end

data/lib/active_graph/node/scope.rb

@@ -1,9 +1,11 @@
-require 'active_support/per_thread_registry'
-
 module ActiveGraph::Node
   module Scope
     extend ActiveSupport::Concern
 
+    included do
+      thread_mattr_accessor :current_scope
+    end
+
     module ClassMethods
       # Similar to ActiveRecord scope
       #
@@ -86,14 +88,6 @@ module ActiveGraph::Node
         end
       end
 
-      def current_scope #:nodoc:
-        ScopeRegistry.value_for(:current_scope, base_class.to_s)
-      end
-
-      def current_scope=(scope) #:nodoc:
-        ScopeRegistry.set_value_for(:current_scope, base_class.to_s, scope)
-      end
-
       def all(new_var = nil)
         var = new_var || (current_scope ? current_scope.node_identity : :n)
         if current_scope
@@ -139,38 +133,5 @@ module ActiveGraph::Node
         @query_proxy_or_target ||= @query_proxy || @target
       end
     end
-
-
-    # Stolen from ActiveRecord
-    # https://github.com/rails/rails/blob/08754f12e65a9ec79633a605e986d0f1ffa4b251/activerecord/lib/active_record/scoping.rb#L57
-    class ScopeRegistry # :nodoc:
-      extend ActiveSupport::PerThreadRegistry
-
-      VALID_SCOPE_TYPES = [:current_scope, :ignore_default_scope]
-
-      def initialize
-        @registry = Hash.new { |hash, key| hash[key] = {} }
-      end
-
-      # Obtains the value for a given +scope_name+ and +variable_name+.
-      def value_for(scope_type, variable_name)
-        raise_invalid_scope_type!(scope_type)
-        @registry[scope_type][variable_name]
-      end
-
-      # Sets the +value+ for a given +scope_type+ and +variable_name+.
-      def set_value_for(scope_type, variable_name, value)
-        raise_invalid_scope_type!(scope_type)
-        @registry[scope_type][variable_name] = value
-      end
-
-      private
-
-      def raise_invalid_scope_type!(scope_type)
-        return if VALID_SCOPE_TYPES.include?(scope_type)
-
-        fail ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. Scope types must be included in VALID_SCOPE_TYPES"
-      end
-    end
   end
 end

data/lib/active_graph/node/wrapping.rb

@@ -0,0 +1,52 @@
+module ActiveGraph
+  module Node
+    module Wrapping
+      # Only load classes once for performance
+      CONSTANTS_FOR_LABELS_CACHE = {}
+
+      class << self
+        def wrapper(node)
+          found_class = class_to_wrap(node.labels)
+          return node unless found_class
+
+          found_class.new.tap do |wrapped_node|
+            wrapped_node.init_on_load(node, node.properties)
+          end
+        end
+
+        def class_to_wrap(labels)
+          load_classes_from_labels(labels)
+          ActiveGraph::Node::Labels.model_for_labels(labels).tap do |model_class|
+            populate_constants_for_labels_cache(model_class, labels)
+          end
+        end
+
+        private
+
+        def load_classes_from_labels(labels)
+          labels.each { |label| constant_for_label(label) }
+        end
+
+        def constant_for_label(label)
+          CONSTANTS_FOR_LABELS_CACHE[label] ||= constantized_label(label)
+        end
+
+        def constantized_label(label)
+          "#{association_model_namespace}::#{label}".constantize
+        rescue NameError, LoadError
+          nil
+        end
+
+        def populate_constants_for_labels_cache(model_class, labels)
+          labels.each do |label|
+            CONSTANTS_FOR_LABELS_CACHE[label] ||= model_class
+          end
+        end
+
+        def association_model_namespace
+          ActiveGraph::Config.association_model_namespace_string
+        end
+      end
+    end
+  end
+end

data/lib/active_graph/node.rb

@@ -66,6 +66,7 @@ module ActiveGraph
     end
 
     module ClassMethods
+      include ::OrmAdapter::ToAdapter
       def nodeify(object)
         if object.is_a?(::ActiveGraph::Node) || object.nil?
           object

data/lib/active_graph/railtie.rb

@@ -1,9 +1,16 @@
-require 'active_support/notifications'
-require 'rails/railtie'
-# Need the action_dispatch railtie to have action_dispatch.rescue_responses initialized correctly
-require 'action_dispatch/railtie'
 require 'active_graph'
 
+if defined?(Rails)
+  # Need the action_dispatch railtie to have action_dispatch.rescue_responses initialized correctly
+  require 'action_dispatch/railtie'
+  require 'rails/generators'
+  require 'rails/generators/active_model'
+  require 'rails/generators/named_base'
+  require 'rails/railtie'
+  require File.expand_path('../rails/generators/migration_helper.rb', __dir__)
+  Rails::Generators::GeneratedAttribute.include ActiveGraph::Generators::GeneratedAttribute
+end
+
 module ActiveGraph
   class Railtie < ::Rails::Railtie
     def empty_config

data/lib/active_graph/relationship/property.rb

@@ -1,5 +1,3 @@
-require 'active_graph/class_arguments'
-
 module ActiveGraph::Relationship
   module Property
     extend ActiveSupport::Concern

data/lib/active_graph/relationship/wrapping.rb

@@ -0,0 +1,26 @@
+module ActiveGraph
+  module Relationship
+    module Wrapping
+      class << self
+        def wrapper(rel)
+          rel.properties.symbolize_keys!
+          begin
+            most_concrete_class = class_from_type(rel.type).constantize
+            return rel unless most_concrete_class < ActiveGraph::Relationship
+            most_concrete_class.new
+          rescue NameError => e
+            raise e unless e.message =~ /(uninitialized|wrong) constant/
+
+            return rel
+          end.tap do |wrapped_rel|
+            wrapped_rel.init_on_load(rel, rel.start_node_id, rel.end_node_id, rel.type)
+          end
+        end
+
+        def class_from_type(type)
+          ActiveGraph::Relationship::Types::WRAPPED_CLASSES[type] || ActiveGraph::Relationship::Types::WRAPPED_CLASSES[type] = type.to_s.downcase.camelize
+        end
+      end
+    end
+  end
+end

data/lib/active_graph/shared/attributes.rb

@@ -18,9 +18,10 @@ module ActiveGraph::Shared
 
     # Methods deprecated on the Object class which can be safely overridden
     DEPRECATED_OBJECT_METHODS = %w(id type)
+    ATTRIBUTES_METHOD_PATTERNS = Gem::Requirement.create('>= 7.1').satisfied_by?(Gem.loaded_specs["activesupport"].version) ? :attribute_method_patterns : :attribute_method_matchers
 
     included do
-      attribute_method_suffix '' if attribute_method_matchers.none? { |matcher| matcher.prefix == '' && matcher.suffix == '' }
+      attribute_method_suffix '' if send(ATTRIBUTES_METHOD_PATTERNS).none? { |matcher| matcher.prefix == '' && matcher.suffix == '' }
       attribute_method_suffix '='
       attribute_method_suffix '?'
     end
@@ -204,7 +205,7 @@ module ActiveGraph::Shared
 
       # Expand an attribute name into its generated methods names
       def attribute_methods(name)
-        attribute_method_matchers.map { |matcher| matcher.method_name name }
+        send(ATTRIBUTES_METHOD_PATTERNS).map { |matcher| matcher.method_name name }
       end
 
       # Ruby inherited hook to assign superclass attributes to subclasses

data/lib/active_graph/shared/node_query_factory.rb

@@ -0,0 +1,15 @@
+module ActiveGraph::Shared
+  class NodeQueryFactory < QueryFactory
+    protected
+
+    def match_string
+      "(#{identifier})"
+    end
+
+    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)
+    end
+  end
+end

data/lib/active_graph/shared/persistence.rb

@@ -217,7 +217,7 @@ module ActiveGraph::Shared
       if self.new_record?
         "#{model_cache_key}/new"
       elsif self.respond_to?(:updated_at) && !self.updated_at.blank?
-        "#{model_cache_key}/#{neo_id}-#{self.updated_at.utc.to_s(:number)}"
+        "#{model_cache_key}/#{neo_id}-#{self.updated_at.utc.to_fs(:number)}"
       else
         "#{model_cache_key}/#{neo_id}"
       end

data/lib/active_graph/shared/query_factory.rb

@@ -59,64 +59,4 @@ module ActiveGraph::Shared
       @identifier_params ||= "#{identifier}_params"
     end
   end
-
-  class NodeQueryFactory < QueryFactory
-    protected
-
-    def match_string
-      "(#{identifier})"
-    end
-
-    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)
-    end
-  end
-
-  class RelQueryFactory < QueryFactory
-    protected
-
-    def match_string
-      "(#{graph_object.from_node_identifier})-[#{identifier}]->()"
-    end
-
-    def create_query
-      return match_query if graph_object.persisted?
-      create_props, set_props = filtered_props
-      base_query.send(graph_object.create_method, query_string(create_props)).break
-        .set(identifier => set_props)
-        .params(params(create_props))
-    end
-
-    private
-
-    def filtered_props
-      ActiveGraph::Shared::FilteredHash.new(graph_object.props_for_create, graph_object.creates_unique_option).filtered_base
-    end
-
-    def query_string(create_props)
-      "(#{graph_object.from_node_identifier})-[#{identifier}:`#{graph_object.type}` #{pattern(create_props)}]->(#{graph_object.to_node_identifier})"
-    end
-
-    def params(create_props)
-      unique? ? create_props.transform_keys { |key| scoped(key).to_sym } : { namespace.to_sym => create_props }
-    end
-
-    def unique?
-      graph_object.create_method == :create_unique
-    end
-
-    def pattern(create_props)
-      unique? ? "{#{create_props.keys.map { |key| "#{key}: $#{scoped(key)}" }.join(', ')}}" : "$#{namespace}"
-    end
-
-    def scoped(key)
-      "#{namespace}_#{key}"
-    end
-
-    def namespace
-      "#{identifier}_create_props"
-    end
-  end
 end