activegraph 10.0.0.pre.beta.7 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2902297d95b7e8850de1e878b4adb9187ccba6cd40cfbb803717cb9175097923
-  data.tar.gz: 74884302b9d3990d944d809d67809037d5544411e748a203ab54710e91d51b1b
+  metadata.gz: 66259444a09dbe560ec1a284b7c1988b24eaf4b29386efb63664cef081edf520
+  data.tar.gz: ec43759b43c92f62a93589225207e0d37ef1d18ee4b61d5f4f204b89b8985787
 SHA512:
-  metadata.gz: dcbb938142991fcd1b4f3fd0def043448953cd1068ce40f44c04cd36b553f220b350c9f1bd80456142f3247312d2b8dfd2fbfba2a19aa0be99fbcc668ee8d39a
-  data.tar.gz: 8c694ef8ad6767e06fb93d6407052e5e4ef698f19c2ac774ca59448eca9e09a9e2da7791b0a3282f6990328e7efb7e28b2d69e5d258981e65f99112ea1496c80
+  metadata.gz: ec40cecc16c133c065672a3aa37360c304bba5cf24fe430dda7a789885262a7b239b798a7998b6d96b34ba8d05d5d0376c134dc829d6db0800e392fb740c0ec7
+  data.tar.gz: 9f7fc129cf6916cdf69373ebb789ff7bc5f6c38c675d3e51403c4b0e6e7135a9649cfb2f3f754634507979a371de2a6a16f8670c765e38a016627c21f04e8535

data/CHANGELOG.md

@@ -3,11 +3,24 @@ 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/).
 
-## [10.0.x] 2020-01-23
-
-- Executing relationship callbacks on relationship deletion.
-- When assiging relationships, preserving earlier relationships.
-- Enforcing has one constraint on relationships.
+## [10.0.0] 2020-07-06
+
+- neo4j 4.0 support (default database only)
+- dropped support for neo4j 3.3 or earlier
+- full bolt support
+- full causal cluster support
+- removal of http support
+- removal of embedded support (neo4j embedded is still supported via bolt)
+- support for a neo4j ruby driver with an api of the official drivers
+- discontinuation of the ``neo4j-core`` gem. Its functionality is replaced partially by ``neo4j-ruby-driver`` and
+   partially by ``activegraph``
+- higher naming consistency with ``activerecord`` and the official ``neo4j-java-driver``
+- configuration more consistent with ``activerecord``
+- changed transaction API
+- support for sessions with bookmarks and read and write transaction
+- enforcing has one constraint on relationships
+- better handling of has_many (no deletion and recreation)
+- executing association callbacks on relationship deletion
 
 ## [9.6.1] 2019-12-18
 

data/README.md

@@ -11,7 +11,7 @@
 
 ### Documentation
 
-All new documentation will be done via our [readthedocs](http://neo4jrb.readthedocs.org) site, though some old documentation has yet to be moved from our [wiki](https://github.com/neo4jrb/neo4j/wiki) (also there is the [neo4j-core wiki](https://github.com/neo4jrb/neo4j-core/wiki))
+All new documentation will be done via our [readthedocs](http://neo4jrb.readthedocs.org) site, though some old documentation has yet to be moved from our [wiki](https://github.com/neo4jrb/neo4j/wiki) 
 
 ### Contact Us
 
@@ -45,27 +45,31 @@ Neo4j.rb v4.1.0 was released in January of 2015. Its changes are outlined [here]
 
 ## Neo4j version support
 
-| **Neo4j Version** | v2.x | v3.x  | >= v4.x | >= 7.0.3 |
-|-------------------|------|-------|---------|----------|
-| 1.9.x             | Yes  | No    | No      | No       |
-| 2.0.x             | No   | Yes   | No      | No       |
-| 2.1.x             | No   | Yes   | Yes *   | Yes      |
-| 2.2.x             | No   | No    | Yes     | Yes      |
-| 2.3.x             | No   | No    | Yes     | Yes      |
-| >= 3.0.0           | No   | No    | No      | Yes      |
+| **Neo4j Version** | v2.x | v3.x  | >= v4.x | >= 7.0.3 | activegraph 10.0 |
+|-------------------|------|-------|---------|----------|------------------|
+| 1.9.x             | Yes  | No    | No      | No       | No               |
+| 2.0.x             | No   | Yes   | No      | No       | No               |
+| 2.1.x             | No   | Yes   | Yes *   | Yes      | No               |
+| 2.2.x             | No   | No    | Yes     | Yes      | No               |
+| 2.3.x             | No   | No    | Yes     | Yes      | No               |
+| 3.0, 3.1, 3.3     | No   | No    | No      | Yes      | No               |
+| 3.4, 3.5          | No   | No    | No      | Yes      | Yes              |
+| 4.0               | No   | No    | No      | No       | Yes              |
+| 4.1               | No   | No    | No      | No       | No               |
 
 `*` Neo4j.rb >= 4.x doesn't support Neo4j versions before 2.1.5.  To use 2.1.x you should upgrade to a version >= 2.1.5
 
 ## Neo4j feature support
 
-| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x |
-|----------------------------|--------|------|---------|--------|
-| Bolt Protocol              |   No   |  No  | No      | Yes    |
-| Auth                       |   No   |  No  | Yes     | Yes    |
-| Remote Cypher              |   Yes  |  Yes | Yes     | Yes    |
-| Transactions               |   Yes  |  Yes | Yes     | Yes    |
-| High Availability          |   No   |  Yes | Yes     | Yes    |
-| Embedded JVM support       |   Yes  |  Yes | Yes     | Yes    |
+| **Neo4j Feature**          |   v2.x | v3.x | >= v4.x | >= 8.x | activegraph 10.0 |
+|----------------------------|--------|------|---------|--------|------------------|
+| Bolt Protocol              |   No   |  No  | No      | Yes    | Yes              | 
+| Auth                       |   No   |  No  | Yes     | Yes    | Yes              |
+| Remote Cypher              |   Yes  |  Yes | Yes     | Yes    | No               |
+| Transactions               |   Yes  |  Yes | Yes     | Yes    | Yes              |
+| High Availability          |   No   |  Yes | Yes     | Yes    | Yes              |
+| Causal Cluster             |   No   |  No  | No      | No     | Yes              |
+| Embedded JVM support       |   Yes  |  Yes | Yes     | Yes    | via bolt only    |
 
 ## Documentation
 

data/activegraph.gemspec

@@ -38,7 +38,7 @@ DESCRIPTION
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
-  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.4.0')
+  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '~> 1.7.0')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph/class_arguments.rb

@@ -1,7 +1,7 @@
 module ActiveGraph
   module ClassArguments
     class << self
-      INVALID_CLASS_ARGUMENT_ERROR = 'option must by String, Symbol, false, nil, or an Array of Symbols/Strings'
+      INVALID_CLASS_ARGUMENT_ERROR = 'option must be String, Symbol, false, nil, or an Array of Symbols/Strings'
 
       def valid_argument?(class_argument)
         [NilClass, String, Symbol, FalseClass].include?(class_argument.class) ||

data/lib/active_graph/core.rb

@@ -1,15 +1,14 @@
-require 'active_graph/transaction'
 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 'neo4j_ruby_driver'
 require 'active_graph/core/wrappable'
-require 'active_graph/core/node'
-require 'active_graph/core/relationship'
+require 'active_graph/transaction'
+require 'neo4j_ruby_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::Types::Relationship.include ActiveGraph::Core::Relationship
 Neo4j::Driver::StatementResult.prepend ActiveGraph::Core::Result
 Neo4j::Driver::Record.prepend ActiveGraph::Core::Record

data/lib/active_graph/core/entity.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveGraph
+  module Core
+    module Entity
+      def properties
+        @properties ||= super
+      end
+    end
+  end
+end

data/lib/active_graph/core/node.rb

@@ -1,23 +1,15 @@
-require 'active_graph/core/wrappable'
+# frozen_string_literal: true
 
 module ActiveGraph
   module Core
     module Node
-      def props; properties; end
-      # Perhaps we should deprecate this?
-      def neo_id; id; end
-
-      def ==(other)
-        other.is_a?(Node) && neo_id == other.neo_id
+      def neo_id
+        id
       end
 
       def labels
         @labels ||= super
       end
-
-      def properties
-        @properties ||= super
-      end
     end
   end
 end

data/lib/active_graph/migrations/schema.rb

@@ -19,7 +19,7 @@ module ActiveGraph
         private
 
         def fetch_constraint_descriptions
-          ActiveGraph::Base.query('CALL db.constraints()').map(&:description)
+          ActiveGraph::Base.query('CALL db.constraints() YIELD description').map(&:first)
         end
 
         def fetch_index_descriptions

data/lib/active_graph/node/has_n.rb

@@ -402,7 +402,7 @@ module ActiveGraph::Node
       #
       # This would define the methods: ``#vehicle``, ``#vehicle=``, and ``.vehicle``.
       #
-      # See :ref:`#has_many <Neo4j/Node/HasN/ClassMethods#has_many>` for anything
+      # See :ref:`#has_many <ActiveGraph/Node/HasN/ClassMethods#has_many>` for anything
       # not specified here
       #
       def has_one(direction, name, options = {}) # rubocop:disable Naming/PredicateName

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

@@ -121,7 +121,7 @@ module ActiveGraph
         attr_reader :relationship_class_name
 
         def relationship_class_type
-          relationship_class._type.to_sym
+          relationship_class.type.to_sym
         end
 
         def relationship_class

data/lib/active_graph/node/initialize.rb

@@ -16,6 +16,6 @@ module ActiveGraph::Node::Initialize
 
   def init_on_reload(reloaded)
     @attributes = nil
-    init_on_load(reloaded, reloaded.props)
+    init_on_load(reloaded, reloaded.properties)
   end
 end

data/lib/active_graph/node/labels.rb

@@ -21,7 +21,7 @@ module ActiveGraph
       class RecordNotFound < ActiveGraph::RecordNotFound; end
 
       # @return the labels
-      # @see Neo4j-core
+      # @see ActiveGraph::Core
       def labels
         @_persisted_obj.labels
       end
@@ -32,7 +32,7 @@ module ActiveGraph
       # end
 
       # adds one or more labels
-      # @see Neo4j-core
+      # @see ActiveGraph::Core
       def add_labels(*labels)
         labels.inject(query_as(:n)) do |query, label|
           query.set("n:`#{label}`")
@@ -43,7 +43,7 @@ module ActiveGraph
 
       # Removes one or more labels
       # Be careful, don't remove the label representing the Ruby class.
-      # @see Neo4j-core
+      # @see ActiveGraph::Core
       def remove_labels(*labels)
         labels.inject(query_as(:n)) do |query, label|
           query.remove("n:`#{label}`")

data/lib/active_graph/node/node_wrapper.rb

@@ -6,7 +6,7 @@ wrapping_proc = proc do |node|
   next node if not found_class
 
   found_class.new.tap do |wrapped_node|
-    wrapped_node.init_on_load(node, node.props)
+    wrapped_node.init_on_load(node, node.properties)
   end
 end
 Neo4j::Driver::Types::Node.wrapper_callback(wrapping_proc)

data/lib/active_graph/node/persistence.rb

@@ -30,8 +30,8 @@ module ActiveGraph::Node
     end
 
     # Increments concurrently a numeric attribute by a centain amount
-    # @param [Symbol, String] name of the attribute to increment
-    # @param [Integer, Float] amount to increment
+    # @param [Symbol, String] attribute name of the attribute to increment
+    # @param [Integer, Float] by amount to increment
     def concurrent_increment!(attribute, by = 1)
       increment_by_query! query_as(:n), attribute, by
     end
@@ -55,7 +55,7 @@ module ActiveGraph::Node
     # @return true
     def create_model
       node = _create_node(props_for_create)
-      init_on_load(node, node.props)
+      init_on_load(node, node.properties)
       @deferred_nodes = nil
       true
     end

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

@@ -16,7 +16,7 @@ module ActiveGraph
         attr_reader :source_object, :association, :model, :starting_query
 
         # QueryProxy is Node's Cypher DSL. While the name might imply that it creates queries in a general sense,
-        # it is actually referring to <tt>ActiveGraph::Core::Query</tt>, which is a pure Ruby Cypher DSL provided by the <tt>neo4j-core</tt> gem.
+        # it is actually referring to <tt>ActiveGraph::Core::Query</tt>, which is a pure Ruby Cypher DSL provided by the <tt>activegraph</tt> gem.
         # QueryProxy provides ActiveRecord-like methods for common patterns. When it's not handling CRUD for relationships and queries, it
         # provides Node's association chaining (`student.lessons.teachers.where(age: 30).hobbies`) and enjoys long walks on the
         # beach.

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

@@ -62,7 +62,7 @@ module ActiveGraph
           if rel.is_a?(ActiveGraph::Relationship)
             rel.instance_variable_set(direction == :in ? '@from_node' : '@to_node', node)
           end
-          @_cache[direction == :out ? rel.start_node_neo_id : rel.end_node_neo_id]
+          @_cache[direction == :out ? rel.start_node_id : rel.end_node_id]
             .association_proxy(element.name).add_to_cache(node, rel)
         end
 

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

@@ -82,7 +82,7 @@ module ActiveGraph
 
         alias blank? empty?
 
-        # @param [ActiveGraph::Node, ActiveGraph::Node, String] other An instance of a Neo4j.rb model, a Neo4j-core node, or a string uuid
+        # @param [ActiveGraph::Node, ActiveGraph::Node, String] other An instance of a Neo4j.rb model, a core node, or a string uuid
         # @param [String, Symbol] target An identifier of a link in the Cypher chain
         # @return [Boolean]
         def include?(other, target = nil)

data/lib/active_graph/railtie.rb

@@ -2,12 +2,13 @@ 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'
 
 module ActiveGraph
   class Railtie < ::Rails::Railtie
     def empty_config
       ActiveSupport::OrderedOptions.new.tap do |cfg|
-        cfg.driver = ActiveSupport::OrderedOptions.new.tap { |cfg| cfg.config = ActiveSupport::OrderedOptions.new }
+        cfg.driver = ActiveSupport::OrderedOptions.new
       end
     end
 
@@ -58,29 +59,29 @@ module ActiveGraph
       end
     end
 
-    def setup!(neo4j_config = empty_config)
-      url, path, auth_token, username, password, config =
-        final_driver_config!(neo4j_config).values_at(:url, :path, :auth_token, :username, :password, :config)
+    def setup!(config = empty_config)
+      config = final_driver_config!(config)
+      scheme = config.delete(:scheme) || 'bolt'
+      host = config.delete(:host) || 'localhost'
+      port = config.delete(:port) || 7687
+      url = config.delete(:url) || URI::Generic.build( scheme: scheme, host: host, port: port ).to_s
+      username = config.delete(:username)
+      password = config.delete(:password)
+      auth_token = config.delete(:auth_token)
       auth_token ||= username ? Neo4j::Driver::AuthTokens.basic(username, password) : Neo4j::Driver::AuthTokens.none
       register_neo4j_cypher_logging
 
-      Neo4j::Driver::GraphDatabase.driver(url || path || default_driver_path_or_url, auth_token, config)
+      method = url.is_a?(Enumerable) ? :routing_driver : :driver
+      Neo4j::Driver::GraphDatabase.send(method, url, auth_token, config)
     end
 
-    def final_driver_config!(neo4j_config)
-      (neo4j_config[:driver].empty? ? yaml_config_data : neo4j_config[:driver]).dup
-    end
-
-    def default_driver_path_or_url
-      ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] || 'bolt://localhost:7474'
+    def final_driver_config!(config)
+      { url: ENV['NEO4J_URL'] }.compact.merge(config[:driver]).merge(yaml_config_data)
     end
 
     def yaml_config_data
-      @yaml_config_data ||= if yaml_path
-                              HashWithIndifferentAccess.new(YAML.load(ERB.new(yaml_path.read).result)[Rails.env])
-                            else
-                              {}
-                            end
+      @yaml_config_data ||=
+        yaml_path ? YAML.load(ERB.new(yaml_path.read).result)[Rails.env].transform_keys!(&:to_sym) : {}
     end
 
     def yaml_path

data/lib/active_graph/relationship.rb

@@ -4,7 +4,7 @@ module ActiveGraph
   module Relationship
     extend ActiveSupport::Concern
 
-    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@rel_type, :@_persisted_obj]
+    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@type, :@_persisted_obj]
 
     include ActiveGraph::Shared
     include ActiveGraph::Relationship::Initialize

data/lib/active_graph/relationship/initialize.rb

@@ -9,10 +9,10 @@ module ActiveGraph::Relationship
     # @param [ActiveGraph::Relationship] to_node_id The neo_id of the ending node of this rel
     # @param [String] type the relationship type
     def init_on_load(persisted_rel, from_node_id, to_node_id, type)
-      @rel_type = type
+      @type = type
       @_persisted_obj = persisted_rel
       changed_attributes_clear!
-      @attributes = convert_and_assign_attributes(persisted_rel.props)
+      @attributes = convert_and_assign_attributes(persisted_rel.properties)
       load_nodes(from_node_id, to_node_id)
     end
 
@@ -21,7 +21,7 @@ module ActiveGraph::Relationship
       init_on_load(unwrapped_reloaded,
                    unwrapped_reloaded.start_node_id,
                    unwrapped_reloaded.end_node_id,
-                   unwrapped_reloaded.rel_type)
+                   unwrapped_reloaded.type)
       self
     end
   end

data/lib/active_graph/relationship/persistence.rb

@@ -37,8 +37,8 @@ module ActiveGraph::Relationship
     end
 
     # Increments concurrently a numeric attribute by a centain amount
-    # @param [Symbol, String] name of the attribute to increment
-    # @param [Integer, Float] amount to increment
+    # @param [Symbol, String] attribute name of the attribute to increment
+    # @param [Integer, Float] by  amount to increment
     def concurrent_increment!(attribute, by = 1)
       increment_by_query! query_as(:r), attribute, by, :r
     end
@@ -47,8 +47,8 @@ module ActiveGraph::Relationship
       validate_node_classes!
       delete_has_one_rel
       rel = _create_rel
-      return self unless rel.respond_to?(:props)
-      init_on_load(rel, from_node, to_node, @rel_type)
+      return self unless rel.respond_to?(:properties)
+      init_on_load(rel, from_node, to_node, @type)
       true
     end
 
@@ -65,7 +65,7 @@ module ActiveGraph::Relationship
 
     module ClassMethods
       # Creates a new relationship between objects
-      # @param [Hash] props the properties the new relationship should have
+      # @param [Hash] args the properties the new relationship should have
       def create(*args)
         new(*args).tap(&:save)
       end

data/lib/active_graph/relationship/persistence/query_factory.rb

@@ -85,7 +85,7 @@ module ActiveGraph::Relationship::Persistence
     def wrap!(node, res, key)
       return if node.persisted? || !res.keys.include?(key)
       unwrapped = res[key]
-      node.init_on_load(unwrapped, unwrapped.props)
+      node.init_on_load(unwrapped, unwrapped.properties)
     end
 
     def node_symbols

data/lib/active_graph/relationship/property.rb

@@ -17,16 +17,13 @@ module ActiveGraph::Relationship
     alias end_node to_node
 
     %w(start_node end_node).each do |direction|
-      define_method("#{direction}_neo_id") { send(direction).neo_id if direction }
+      define_method("#{direction}_id") { send(direction).neo_id if direction }
     end
-    alias from_node_neo_id start_node_neo_id
-    alias to_node_neo_id end_node_neo_id
 
     # @return [String] a string representing the relationship type that will be created
     def type
       self.class.type
     end
-    alias rel_type type
 
     def initialize(attributes = nil)
       super(attributes)

data/lib/active_graph/relationship/query.rb

@@ -51,12 +51,12 @@ module ActiveGraph::Relationship
 
       def where_query
         deprecation_warning!
-        ActiveGraph::Base.new_query.match("#{cypher_string(:outbound)}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
+        ActiveGraph::Base.new_query.match("#{cypher_string(:outbound)}-[r1:`#{type}`]->#{cypher_string(:inbound)}")
       end
 
       def all_query
         deprecation_warning!
-        ActiveGraph::Base.new_query.match("#{cypher_string}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
+        ActiveGraph::Base.new_query.match("#{cypher_string}-[r1:`#{type}`]->#{cypher_string(:inbound)}")
       end
 
       def cypher_string(dir = :outbound)

data/lib/active_graph/relationship/rel_wrapper.rb

@@ -1,4 +1,4 @@
-require 'active_graph/core/relationship'
+# frozen_string_literal: true
 
 wrapping_proc = proc do |relationship|
   ActiveGraph::RelWrapping.wrapper(relationship)
@@ -9,9 +9,9 @@ module ActiveGraph
   module RelWrapping
     class << self
       def wrapper(rel)
-        rel.props.symbolize_keys!
+        rel.properties.symbolize_keys!
         begin
-          most_concrete_class = class_from_type(rel.rel_type).constantize
+          most_concrete_class = class_from_type(rel.type).constantize
           return rel unless most_concrete_class < ActiveGraph::Relationship
           most_concrete_class.new
         rescue NameError => e
@@ -23,8 +23,8 @@ module ActiveGraph
         end
       end
 
-      def class_from_type(rel_type)
-        ActiveGraph::Relationship::Types::WRAPPED_CLASSES[rel_type] || ActiveGraph::Relationship::Types::WRAPPED_CLASSES[rel_type] = rel_type.to_s.downcase.camelize
+      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

data/lib/active_graph/relationship/types.rb

@@ -14,7 +14,7 @@ module ActiveGraph
       # and Lesson is 'EnrolledIn'." After all, that is a big part of why we have models, right? To make our lives easier?
       #
       # A model is added to WRAPPED_CLASSES when it is initalized AND when the `type` class method is called within a model. This means that
-      # it's possible a model will be added twice: once with the rel_type version of the model name, again with the custom type. deal_with_it.gif.
+      # it's possible a model will be added twice: once with the type version of the model name, again with the custom type. deal_with_it.gif.
       WRAPPED_CLASSES = {}
 
       included do
@@ -34,16 +34,14 @@ module ActiveGraph
         # @param [Boolean] auto Should the given_type be changed in compliance with the gem's rel decorator setting?
         def type(given_type = nil, auto = false)
           case
-          when !given_type && rel_type?
-            @rel_type
+          when !given_type && type?
+            @type
           when given_type
             assign_type!(given_type, auto)
           else
             assign_type!(namespaced_model_name, true)
           end
         end
-        alias rel_type type
-        alias _type type # should be deprecated
 
         def namespaced_model_name
           case ActiveGraph::Config[:module_handling]
@@ -65,14 +63,14 @@ module ActiveGraph
           _wrapped_classes[type.to_sym] = self.name
         end
 
-        def rel_type?
-          !!@rel_type
+        def type?
+          !!@type
         end
 
         private
 
         def assign_type!(given_type, auto)
-          @rel_type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
+          @type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
             add_wrapped_class(type)
           end
         end

data/lib/active_graph/shared/attributes.rb

@@ -189,7 +189,7 @@ module ActiveGraph::Shared
 
       # Assign a set of attribute definitions, used when subclassing models
       #
-      # @param [Array<ActiveGraph::Shared::DeclaredProperties>] The Array of
+      # @param [Array<ActiveGraph::Shared::DeclaredProperties>] attributes The Array of
       #   AttributeDefinition instances
       def attributes=(attributes)
         @attributes = attributes

data/lib/active_graph/shared/callbacks.rb

@@ -9,7 +9,7 @@ module ActiveGraph
 
       included do
         include ActiveModel::Validations::Callbacks
-        # after_find is triggered by the `find` method defined in lib/neo4j/node/id_property.rb
+        # after_find is triggered by the `find` method defined in lib/active_graph/node/id_property.rb
         define_model_callbacks :initialize, :find, only: :after
         define_model_callbacks :create_commit, :update_commit, :destroy_commit, only: :after
         define_model_callbacks :save, :create, :update, :destroy, :touch

data/lib/active_graph/shared/declared_properties.rb

@@ -75,7 +75,7 @@ module ActiveGraph::Shared
       end.freeze
     end
 
-    # During object wrapping, a props hash is built with string keys but Neo4j-core provides symbols.
+    # During object wrapping, a props hash is built with string keys but ActiveGraph::Core provides symbols.
     # Rather than a `to_s` or `symbolize_keys` during every load, we build a map of symbol-to-string
     # to speed up the process. This increases memory used by the gem but reduces object allocation and GC, so it is faster
     # in practice.
@@ -174,7 +174,7 @@ module ActiveGraph::Shared
       (value.is_a?(Array) && supports_array?(key)) || !EXCLUDED_TYPES.include?(value.class)
     end
 
-    # @param [Symbol] key An undeclared property value found in the _persisted_obj.props hash.
+    # @param [Symbol] key An undeclared property value found in the _persisted_obj.properties hash.
     # Typically, this is a node's id property, which will not be registered as other properties are.
     # In the future, this should probably be reworked a bit. This class should either not know or care
     # about the id property or it should be in charge of it. In the meantime, this improves

data/lib/active_graph/shared/identity.rb

@@ -14,7 +14,7 @@ module ActiveGraph
 
       # @return [Integer, nil] the neo4j id of the node if persisted or nil
       def neo_id
-        _persisted_obj ? _persisted_obj.neo_id : nil
+        _persisted_obj ? _persisted_obj.id : nil
       end
 
       def id

data/lib/active_graph/shared/mass_assignment.rb

@@ -19,9 +19,8 @@ module ActiveGraph::Shared
     #   person.first_name #=> "Chris"
     #   person.last_name #=> "Griego"
     #
-    # @param [Hash{#to_s => Object}, #each] attributes Attributes used to
+    # @param [Hash{#to_s => Object}, #each] new_attributes Attributes used to
     #   populate the model
-    # @param [Hash, #[]] options Options that affect mass assignment
     def assign_attributes(new_attributes = nil)
       return unless new_attributes.present?
       new_attributes.each do |name, value|

data/lib/active_graph/shared/persistence.rb

@@ -13,7 +13,7 @@ module ActiveGraph::Shared
       return if skip_update?
       props = props_for_update
       neo4j_query(query_as(:n).set(n: props))
-      _persisted_obj.props.merge!(props)
+      _persisted_obj.properties.merge!(props)
       changed_attributes_clear!
     end
 
@@ -46,8 +46,8 @@ module ActiveGraph::Shared
     end
 
     # Increments a numeric attribute by a centain amount
-    # @param [Symbol, String] name of the attribute to increment
-    # @param [Integer, Float] amount to increment
+    # @param [Symbol, String] attribute name of the attribute to increment
+    # @param [Integer, Float] by amount to increment
     def increment(attribute, by = 1)
       self[attribute] ||= 0
       self[attribute] += by
@@ -55,15 +55,15 @@ module ActiveGraph::Shared
     end
 
     # Convenience method to increment numeric attribute and #save at the same time
-    # @param [Symbol, String] name of the attribute to increment
-    # @param [Integer, Float] amount to increment
+    # @param [Symbol, String] attribute name of the attribute to increment
+    # @param [Integer, Float] by amount to increment
     def increment!(attribute, by = 1)
       increment(attribute, by).update_attribute(attribute, self[attribute])
     end
 
     # Increments concurrently a numeric attribute by a centain amount
-    # @param [Symbol, String] name of the attribute to increment
-    # @param [Integer, Float] amount to increment
+    # @param [Symbol, String] _attribute name of the attribute to increment
+    # @param [Integer, Float] _by amount to increment
     def concurrent_increment!(_attribute, _by = 1)
       fail 'not_implemented'
     end
@@ -197,7 +197,7 @@ module ActiveGraph::Shared
         db_values = props_for_db(hash)
         neo4j_query(query_as(:n).set(n: db_values))
         db_values.each_pair { |k, v| self.public_send(:"#{k}=", v) }
-        _persisted_obj.props.merge!(db_values)
+        _persisted_obj.properties.merge!(db_values)
         changed_attributes_selective_clear!(db_values)
         true
       end

data/lib/active_graph/shared/property.rb

@@ -132,7 +132,7 @@ module ActiveGraph::Shared
       # Defines a property on the class
       #
       # See active_attr gem for allowed options, e.g which type
-      # Notice, in Neo4j you don't have to declare properties before using them, see the neo4j-core api.
+      # Notice, in ActiveGraph you don't have to declare properties before using them, see the ActiveGraph::Coree api.
       #
       # @example Without type
       #    class Person

data/lib/active_graph/shared/query_factory.rb

@@ -18,7 +18,7 @@ module ActiveGraph::Shared
       case
       when graph_obj.respond_to?(:labels_for_create)
         NodeQueryFactory
-      when graph_obj.respond_to?(:rel_type)
+      when graph_obj.respond_to?(:type)
         RelQueryFactory
       else
         fail "Unable to find factory for #{graph_obj}"

data/lib/active_graph/undeclared_properties.rb

@@ -16,7 +16,7 @@ module ActiveGraph
     alias [] read_attribute
 
     def read_undeclared_property(name)
-      _persisted_obj ? _persisted_obj.props[name] : (undeclared_properties && undeclared_properties[name])
+      _persisted_obj ? _persisted_obj.properties[name] : (undeclared_properties && undeclared_properties[name])
     end
 
     def write_attribute(name, value)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.7'
+  VERSION = '10.0.0'
 end

data/lib/rails/generators/active_graph/model/templates/migration.erb

@@ -1,4 +1,6 @@
 class Create<%= @migration_class_name.underscore.camelize %> < ActiveGraph::Migrations::Base
+  disable_transactions!
+
   def up
     add_constraint :<%= class_name %>, :uuid
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.7
+  version: 10.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -126,16 +126,16 @@ dependencies:
   name: neo4j-ruby-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/active_graph/core.rb
 - lib/active_graph/core/connection_failed_error.rb
 - lib/active_graph/core/cypher_error.rb
+- lib/active_graph/core/entity.rb
 - lib/active_graph/core/instrumentable.rb
 - lib/active_graph/core/label.rb
 - lib/active_graph/core/logging.rb
@@ -273,7 +274,6 @@ files:
 - lib/active_graph/core/query_ext.rb
 - lib/active_graph/core/query_find_in_batches.rb
 - lib/active_graph/core/record.rb
-- lib/active_graph/core/relationship.rb
 - lib/active_graph/core/result.rb
 - lib/active_graph/core/schema.rb
 - lib/active_graph/core/schema_errors.rb
@@ -412,9 +412,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/lib/active_graph/core/relationship.rb

@@ -1,13 +0,0 @@
-require 'active_graph/core/wrappable'
-
-module ActiveGraph
-  module Core
-    module Relationship
-      def props; properties; end
-      def neo_id; id; end
-      def start_node_neo_id; start_node_id; end
-      def end_node_neo_id; end_node_id; end
-      def rel_type; type; end
-    end
-  end
-end