activegraph 11.5.0.alpha.1 → 11.5.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0101891bd10ab15f40fe0b95d8f9801addbad38e6a9a620d6ed3172538f13b81'
-  data.tar.gz: 29cd3cdd821bdd01723767210820b441d175c20722d086791e3b6f96c60e7860
+  metadata.gz: c217d68abf8f640ef01f10e2d7a5b96c6fe7b6f3c4499d24da58718a90646acc
+  data.tar.gz: d8bcda3316fd7cdc1422eb47b186f6eb7d853752d138f014e53a0e425c2f3e4f
 SHA512:
-  metadata.gz: 236ae57612400438f2ea424600e5b4013790d9fe77840421727f83e5158ca4c8622cc8b2bda502d19c8f212956c86111f25b38fe5d3a68e2ef4819620432aa53
-  data.tar.gz: e699e3c4788af542fec9c1b74552b08309a8bd3611a25232445c0bf8a7a4f292067ee3cb86db5c7ed7a34dc134eff8a1fea59c772b778a58de2b1c3d1ec47bb1
+  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,8 +30,7 @@ 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', '< 5')
   s.add_dependency('orm_adapter', '>= 0.5.0')
@@ -42,7 +41,7 @@ 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')

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/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/railtie.rb

@@ -1,3 +1,16 @@
+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/transactions.rb

@@ -28,6 +28,10 @@ module ActiveGraph
 
       alias transaction write_transaction
 
+      def lock_node(node)
+        node.as(:n).query.remove('n._AGLOCK_').exec if tx&.open?
+      end
+
       private
 
       def send_transaction(method, **config, &block)

data/lib/active_graph/version.rb

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

data/lib/active_graph.rb

@@ -22,20 +22,9 @@ require 'set'
 require 'sorted_set'
 require 'yaml'
 
-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'
-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.ignore(File.expand_path('rails', __dir__))
+loader.ignore(File.expand_path('active_graph/railtie.rb', __dir__))
 loader.inflector.inflect("ansi" => "ANSI")
 loader.setup
 # loader.eager_load
@@ -49,6 +38,5 @@ 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'

data/lib/{active_graph/generators → rails/generators/active_graph/migration}/migration_generator.rb

@@ -1,8 +1,11 @@
+require_relative '../../migration_helper'
+require_relative '../../source_path_helper'
+
 module ActiveGraph
   module Generators
     class MigrationGenerator < ::Rails::Generators::NamedBase
-      include ::ActiveGraph::Generators::SourcePathHelper
-      include ::ActiveGraph::Generators::MigrationHelper
+      include ActiveGraph::Generators::SourcePathHelper
+      include ActiveGraph::Generators::MigrationHelper
 
       def create_migration_file
         migration_template 'migration.erb'

data/lib/{active_graph/generators → rails/generators/active_graph/model}/model_generator.rb

@@ -1,6 +1,9 @@
+require_relative '../../migration_helper'
+require_relative '../../source_path_helper'
+
 class ActiveGraph::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
-  include ::ActiveGraph::Generators::SourcePathHelper
-  include ::ActiveGraph::Generators::MigrationHelper
+  include ActiveGraph::Generators::SourcePathHelper
+  include ActiveGraph::Generators::MigrationHelper
 
   argument :attributes, type: :array, default: [], banner: 'field:type field:type'
 

data/lib/{active_graph/generators → rails/generators/active_graph/upgrade_v8}/upgrade_v8_generator.rb

@@ -1,8 +1,11 @@
+require_relative '../../migration_helper'
+require_relative '../../source_path_helper'
+
 module ActiveGraph
   module Generators
     class UpgradeV8Generator < ::Rails::Generators::Base
-      include ::ActiveGraph::Generators::SourcePathHelper
-      include ::ActiveGraph::Generators::MigrationHelper
+      include ActiveGraph::Generators::SourcePathHelper
+      include ActiveGraph::Generators::MigrationHelper
 
       def create_upgrade_v8_file
         @schema = load_all_models_schema!

data/lib/{active_graph → rails}/generators/migration_helper.rb

@@ -1,3 +1,8 @@
+module ActiveGraph
+  module Generators #:nodoc:
+  end
+end
+
 module ActiveGraph::Generators::MigrationHelper
   extend ActiveSupport::Concern
 
@@ -44,3 +49,55 @@ module ActiveGraph::Generators::MigrationHelper
     FileUtils.rm(real_file_name) if @behavior == :revoke
   end
 end
+
+class ActiveGraph::Generators::ActiveModel < Rails::Generators::ActiveModel #:nodoc:
+  def self.all(klass)
+    "#{klass}.all"
+  end
+
+  def self.find(klass, params = nil)
+    "#{klass}.find(#{params})"
+  end
+
+  def self.build(klass, params = nil)
+    if params
+      "#{klass}.new(#{params})"
+    else
+      "#{klass}.new"
+    end
+  end
+
+  def save
+    "#{name}.save"
+  end
+
+  def update_attributes(params = nil)
+    "#{name}.update_attributes(#{params})"
+  end
+
+  def errors
+    "#{name}.errors"
+  end
+
+  def destroy
+    "#{name}.destroy"
+  end
+end
+
+module ActiveGraph
+  module Generators
+    module GeneratedAttribute #:nodoc:
+      def type_class
+        case type.to_s.downcase
+        when 'any' then 'any'
+        when 'datetime' then 'DateTime'
+        when 'date' then 'Date'
+        when 'integer', 'number', 'fixnum' then 'Integer'
+        when 'float' then 'Float'
+        else
+          'String'
+        end
+      end
+    end
+  end
+end

data/lib/{active_graph → rails}/generators/source_path_helper.rb

@@ -4,7 +4,7 @@ module ActiveGraph::Generators::SourcePathHelper
   module ClassMethods
     def source_root
       @_neo4j_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                         generator_name, 'templates'))
+                                                         'active_graph', generator_name, 'templates'))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.5.0.alpha.1
+  version: 11.5.0.beta.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +176,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -311,17 +297,6 @@ files:
 - lib/active_graph/core/schema_errors.rb
 - lib/active_graph/core/wrappable.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
@@ -423,6 +398,15 @@ files:
 - lib/active_graph/type_converters.rb
 - lib/active_graph/undeclared_properties.rb
 - lib/active_graph/version.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/migration_helper.rb
+- lib/rails/generators/source_path_helper.rb
 homepage: https://github.com/neo4jrb/activegraph/
 licenses:
 - MIT

data/lib/active_graph/generators/active_model.rb

@@ -1,33 +0,0 @@
-class ActiveGraph::Generators::ActiveModel < Rails::Generators::ActiveModel #:nodoc:
-  def self.all(klass)
-    "#{klass}.all"
-  end
-
-  def self.find(klass, params = nil)
-    "#{klass}.find(#{params})"
-  end
-
-  def self.build(klass, params = nil)
-    if params
-      "#{klass}.new(#{params})"
-    else
-      "#{klass}.new"
-    end
-  end
-
-  def save
-    "#{name}.save"
-  end
-
-  def update_attributes(params = nil)
-    "#{name}.update_attributes(#{params})"
-  end
-
-  def errors
-    "#{name}.errors"
-  end
-
-  def destroy
-    "#{name}.destroy"
-  end
-end

data/lib/active_graph/generators/generated_attribute.rb

@@ -1,17 +0,0 @@
-module ActiveGraph
-  module Generators
-    module GeneratedAttribute #:nodoc:
-      def type_class
-        case type.to_s.downcase
-        when 'any' then 'any'
-        when 'datetime' then 'DateTime'
-        when 'date' then 'Date'
-        when 'integer', 'number', 'fixnum' then 'Integer'
-        when 'float' then 'Float'
-        else
-          'String'
-        end
-      end
-    end
-  end
-end