activegraph 11.4.0 → 11.5.0.alpha.1

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

data/lib/active_graph/shared/rel_query_factory.rb

@@ -0,0 +1,47 @@
+module ActiveGraph::Shared
+  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

data/lib/active_graph/shared/type_converters.rb

@@ -1,9 +1,3 @@
-require 'date'
-require 'bigdecimal'
-require 'bigdecimal/util'
-require 'active_support/core_ext/big_decimal/conversions'
-require 'active_support/core_ext/string/conversions'
-
 module ActiveGraph::Shared
   class Boolean; end
 

data/lib/active_graph/tasks/migration.rake

@@ -1,7 +1,3 @@
-require 'rake'
-require 'active_support/concern'
-require 'active_graph/migration'
-
 if !defined?(Rails) && !Rake::Task.task_defined?('environment')
   desc 'Run a script against the database to perform system-wide changes'
   task :environment do

data/lib/active_graph/timestamps.rb

@@ -1,6 +1,3 @@
-require 'active_graph/timestamps/created'
-require 'active_graph/timestamps/updated'
-
 module ActiveGraph
   # This mixin includes timestamps in the included class
   module Timestamps

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.4.0'
+  VERSION = '11.5.0.alpha.1'
 end

data/lib/active_graph.rb

@@ -1,125 +1,54 @@
+require 'benchmark'
+require 'bigdecimal'
+require 'bigdecimal/util'
+require 'date'
 require 'forwardable'
-require 'active_graph/version'
-
-require 'active_graph/core'
-require 'active_graph/core/query_ext' # From this gem
-
-require 'active_support/core_ext/module/attribute_accessors_per_thread'
-require 'active_graph/secure_random_ext'
-require 'active_graph/transactions'
-require 'active_graph/base'
-require 'active_graph/model_schema'
-
 require 'active_model'
-require 'active_support/concern'
-require 'active_support/core_ext/class/attribute.rb'
-require 'active_support/core_ext/class/subclasses.rb'
+require 'active_model/attribute_set'
+require 'active_support/core_ext/big_decimal/conversions'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/subclasses'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
+require 'active_support/core_ext/string/conversions'
+require 'active_support/inflector'
+require 'active_support/inflector/inflections'
+require 'active_support/notifications'
 require 'json'
+require 'neo4j/driver'
+require 'orm_adapter'
+require 'rake'
+require 'set'
+require 'sorted_set'
+require 'yaml'
 
-require 'active_graph/lazy_attribute_hash'
-require 'active_graph/attribute_set'
-require 'active_graph/errors'
-require 'active_graph/config'
-require 'active_graph/wrapper'
-require 'active_graph/relationship/rel_wrapper'
-require 'active_graph/node/node_wrapper'
-require 'active_graph/shared/type_converters'
-require 'active_graph/shared/rel_type_converters'
-require 'active_graph/shared/marshal'
-require 'active_graph/type_converters'
-require 'active_graph/paginated'
-require 'active_graph/schema/operation'
-
-require 'active_graph/timestamps'
-require 'active_graph/undeclared_properties'
-
-require 'active_graph/shared/callbacks'
-require 'active_graph/shared/filtered_hash'
-require 'active_graph/shared/declared_property/index'
-require 'active_graph/shared/declared_property'
-require 'active_graph/shared/declared_properties'
-require 'active_graph/shared/enum'
-require 'active_graph/shared/mass_assignment'
-require 'active_graph/shared/attributes'
-require 'active_graph/shared/typecasted_attributes'
-require 'active_graph/shared/property'
-require 'active_graph/shared/persistence'
-require 'active_graph/shared/validations'
-require 'active_graph/shared/identity'
-require 'active_graph/shared/serialized_properties'
-require 'active_graph/shared/typecaster'
-require 'active_graph/shared/initialize'
-require 'active_graph/shared/query_factory'
-require 'active_graph/shared/cypher'
-require 'active_graph/shared/permitted_attributes'
-require 'active_graph/shared'
-
-require 'active_graph/relationship/callbacks'
-require 'active_graph/relationship/initialize'
-require 'active_graph/relationship/property'
-require 'active_graph/relationship/persistence/query_factory'
-require 'active_graph/relationship/persistence'
-require 'active_graph/relationship/validations'
-require 'active_graph/relationship/query'
-require 'active_graph/relationship/related_node'
-require 'active_graph/relationship/types'
-require 'active_graph/relationship'
-
-require 'active_graph/node/dependent_callbacks'
-require 'active_graph/node/node_list_formatter'
-require 'active_graph/node/dependent'
-require 'active_graph/node/dependent/query_proxy_methods'
-require 'active_graph/node/dependent/association_methods'
-require 'active_graph/node/enum'
-require 'active_graph/node/query_methods'
-require 'active_graph/node/query/query_proxy_methods'
-require 'active_graph/node/query/query_proxy_methods_of_mass_updating'
-require 'active_graph/node/query/query_proxy_enumerable'
-require 'active_graph/node/query/query_proxy_find_in_batches'
-require 'active_graph/node/query/query_proxy_eager_loading'
-require 'active_graph/node/query/query_proxy_eager_loading/association_tree'
-require 'active_graph/node/query/query_proxy_link'
-require 'active_graph/node/labels/index'
-require 'active_graph/node/labels/reloading'
-require 'active_graph/node/labels'
-require 'active_graph/node/id_property/accessor'
-require 'active_graph/node/id_property'
-require 'active_graph/node/callbacks'
-require 'active_graph/node/initialize'
-require 'active_graph/node/property'
-require 'active_graph/node/persistence'
-require 'active_graph/node/validations'
-require 'active_graph/node/rels'
-require 'active_graph/node/reflection'
-require 'active_graph/node/unpersisted'
-require 'active_graph/node/has_n'
-require 'active_graph/node/has_n/association_cypher_methods'
-require 'active_graph/node/has_n/association/rel_wrapper'
-require 'active_graph/node/has_n/association/rel_factory'
-require 'active_graph/node/has_n/association'
-require 'active_graph/node/query/query_proxy'
-require 'active_graph/node/query'
-require 'active_graph/node/scope'
-require 'active_graph/node'
-
-require 'active_support/concern'
-require 'active_graph/core/cypher_error'
-require 'active_graph/core/schema_errors'
-
-module ActiveGraph
-  extend ActiveSupport::Autoload
-  autoload :Migrations
-  autoload :Migration
-end
-
-load 'active_graph/tasks/migration.rake'
-
-require 'active_graph/node/orm_adapter'
 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_graph_generator'
+  require 'rails/generators/active_model'
+  require 'rails/generators/named_base'
+  require 'rails/railtie'
 end
 
+loader = Zeitwerk::Loader.for_gem
+unless defined?(Rails)
+  loader.ignore(File.expand_path('active_graph/generators', __dir__))
+  loader.ignore(File.expand_path('active_graph/railtie.rb', __dir__))
+end
+loader.inflector.inflect("ansi" => "ANSI")
+loader.setup
+# loader.eager_load
+
+Neo4j::Driver::Result.prepend ActiveGraph::Core::Result
+Neo4j::Driver::Record.prepend ActiveGraph::Core::Record
 Neo4j::Driver::Transaction.prepend ActiveGraph::Transaction
+Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
+Neo4j::Driver::Types::Entity.prepend ActiveGraph::Core::Entity
+Neo4j::Driver::Types::Node.prepend ActiveGraph::Core::Node
+Neo4j::Driver::Types::Node.wrapper_callback(&ActiveGraph::Node::Wrapping.method(:wrapper))
+Neo4j::Driver::Types::Relationship.wrapper_callback(&ActiveGraph::Relationship::Wrapping.method(:wrapper))
 SecureRandom.singleton_class.prepend ActiveGraph::SecureRandomExt
+Rails::Generators::GeneratedAttribute.include ActiveGraph::Generators::GeneratedAttribute if defined?(Rails)
+
+load 'active_graph/tasks/migration.rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.4.0
+  version: 11.5.0.alpha.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -59,6 +59,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,18 +69,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -252,14 +258,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
@@ -287,7 +293,6 @@ files:
 - lib/active_graph/base.rb
 - lib/active_graph/class_arguments.rb
 - lib/active_graph/config.rb
-- lib/active_graph/core.rb
 - lib/active_graph/core/cypher_error.rb
 - lib/active_graph/core/entity.rb
 - lib/active_graph/core/instrumentable.rb
@@ -305,7 +310,18 @@ files:
 - lib/active_graph/core/schema.rb
 - lib/active_graph/core/schema_errors.rb
 - lib/active_graph/core/wrappable.rb
-- lib/active_graph/errors.rb
+- lib/active_graph/error.rb
+- lib/active_graph/generators/active_model.rb
+- lib/active_graph/generators/generated_attribute.rb
+- lib/active_graph/generators/migration/templates/migration.erb
+- lib/active_graph/generators/migration_generator.rb
+- lib/active_graph/generators/migration_helper.rb
+- lib/active_graph/generators/model/templates/migration.erb
+- lib/active_graph/generators/model/templates/model.erb
+- lib/active_graph/generators/model_generator.rb
+- lib/active_graph/generators/source_path_helper.rb
+- lib/active_graph/generators/upgrade_v8/templates/migration.erb
+- lib/active_graph/generators/upgrade_v8_generator.rb
 - lib/active_graph/lazy_attribute_hash.rb
 - lib/active_graph/migration.rb
 - lib/active_graph/migrations.rb
@@ -339,17 +355,16 @@ files:
 - lib/active_graph/node/labels/index.rb
 - lib/active_graph/node/labels/reloading.rb
 - lib/active_graph/node/node_list_formatter.rb
-- lib/active_graph/node/node_wrapper.rb
 - lib/active_graph/node/orm_adapter.rb
 - lib/active_graph/node/persistence.rb
 - lib/active_graph/node/property.rb
 - lib/active_graph/node/query.rb
 - lib/active_graph/node/query/query_proxy.rb
+- lib/active_graph/node/query/query_proxy/link.rb
 - lib/active_graph/node/query/query_proxy_eager_loading.rb
 - lib/active_graph/node/query/query_proxy_eager_loading/association_tree.rb
 - lib/active_graph/node/query/query_proxy_enumerable.rb
 - lib/active_graph/node/query/query_proxy_find_in_batches.rb
-- lib/active_graph/node/query/query_proxy_link.rb
 - lib/active_graph/node/query/query_proxy_methods.rb
 - lib/active_graph/node/query/query_proxy_methods_of_mass_updating.rb
 - lib/active_graph/node/query_methods.rb
@@ -358,6 +373,7 @@ files:
 - lib/active_graph/node/scope.rb
 - lib/active_graph/node/unpersisted.rb
 - lib/active_graph/node/validations.rb
+- lib/active_graph/node/wrapping.rb
 - lib/active_graph/paginated.rb
 - lib/active_graph/railtie.rb
 - lib/active_graph/relationship.rb
@@ -367,10 +383,10 @@ files:
 - lib/active_graph/relationship/persistence/query_factory.rb
 - lib/active_graph/relationship/property.rb
 - lib/active_graph/relationship/query.rb
-- lib/active_graph/relationship/rel_wrapper.rb
 - lib/active_graph/relationship/related_node.rb
 - lib/active_graph/relationship/types.rb
 - lib/active_graph/relationship/validations.rb
+- lib/active_graph/relationship/wrapping.rb
 - lib/active_graph/schema/operation.rb
 - lib/active_graph/secure_random_ext.rb
 - lib/active_graph/shared.rb
@@ -386,10 +402,12 @@ files:
 - lib/active_graph/shared/initialize.rb
 - lib/active_graph/shared/marshal.rb
 - lib/active_graph/shared/mass_assignment.rb
+- lib/active_graph/shared/node_query_factory.rb
 - lib/active_graph/shared/permitted_attributes.rb
 - lib/active_graph/shared/persistence.rb
 - lib/active_graph/shared/property.rb
 - lib/active_graph/shared/query_factory.rb
+- lib/active_graph/shared/rel_query_factory.rb
 - lib/active_graph/shared/rel_type_converters.rb
 - lib/active_graph/shared/serialized_properties.rb
 - lib/active_graph/shared/type_converters.rb
@@ -405,15 +423,6 @@ files:
 - lib/active_graph/type_converters.rb
 - lib/active_graph/undeclared_properties.rb
 - lib/active_graph/version.rb
-- lib/active_graph/wrapper.rb
-- lib/rails/generators/active_graph/migration/migration_generator.rb
-- lib/rails/generators/active_graph/migration/templates/migration.erb
-- lib/rails/generators/active_graph/model/model_generator.rb
-- lib/rails/generators/active_graph/model/templates/migration.erb
-- lib/rails/generators/active_graph/model/templates/model.erb
-- lib/rails/generators/active_graph/upgrade_v8/templates/migration.erb
-- lib/rails/generators/active_graph/upgrade_v8/upgrade_v8_generator.rb
-- lib/rails/generators/active_graph_generator.rb
 homepage: https://github.com/neo4jrb/activegraph/
 licenses:
 - MIT
@@ -440,11 +449,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A graph database for Ruby

data/lib/active_graph/core.rb

@@ -1,14 +0,0 @@
-require 'active_graph/core/instrumentable'
-require 'active_graph/core/entity'
-require 'active_graph/core/node'
-require 'active_graph/core/query'
-require 'active_graph/core/record'
-require 'active_graph/core/wrappable'
-require 'active_graph/transaction'
-require 'neo4j/driver'
-
-Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
-Neo4j::Driver::Types::Entity.prepend ActiveGraph::Core::Entity
-Neo4j::Driver::Types::Node.prepend ActiveGraph::Core::Node
-Neo4j::Driver::Result.prepend ActiveGraph::Core::Result
-Neo4j::Driver::Record.prepend ActiveGraph::Core::Record

data/lib/active_graph/node/node_wrapper.rb

@@ -1,54 +0,0 @@
-require 'active_support/inflector'
-require 'active_graph/core/node'
-
-wrapping_proc = proc do |node|
-  found_class = ActiveGraph::NodeWrapping.class_to_wrap(node.labels)
-  next node if not found_class
-
-  found_class.new.tap do |wrapped_node|
-    wrapped_node.init_on_load(node, node.properties)
-  end
-end
-Neo4j::Driver::Types::Node.wrapper_callback(wrapping_proc)
-
-module ActiveGraph
-  module NodeWrapping
-    # Only load classes once for performance
-    CONSTANTS_FOR_LABELS_CACHE = {}
-
-    class << self
-      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] || 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 if CONSTANTS_FOR_LABELS_CACHE[label].nil?
-        end
-      end
-
-      def association_model_namespace
-        ActiveGraph::Config.association_model_namespace_string
-      end
-    end
-  end
-end

data/lib/active_graph/relationship/rel_wrapper.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-wrapping_proc = proc do |relationship|
-  ActiveGraph::RelWrapping.wrapper(relationship)
-end
-Neo4j::Driver::Types::Relationship.wrapper_callback(wrapping_proc)
-
-module ActiveGraph
-  module RelWrapping
-    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

data/lib/active_graph/wrapper.rb

@@ -1,4 +0,0 @@
-module ActiveGraph
-  module ClassWrapper
-  end
-end