activegraph 10.0.0.pre.beta.3 → 10.0.0.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf12b2e24dd9557ad7d5a232f653e150241910a48293d4aeba5f5e16f160a42
-  data.tar.gz: 36adc4653772d9132ea19f086b361f4d14fe61704ad1c75214ff441bac0652c9
+  metadata.gz: ef0444b21eb9130b0047fa423911cff404686bb29a7af0e63b66dd093d822f2b
+  data.tar.gz: d359a53fbe4ecfec871b596ecd3aeae4293f9369059090cec06f78e2d8a6c77c
 SHA512:
-  metadata.gz: e0b15269740380e2bf9bf274f0d3cf89c0bc1394d3469c92919ce0fa172a0b7b22abeec2f7484440c2ff1dd38be275fbb6307aebcf1f8b5174cca8a8568aab70
-  data.tar.gz: fa92fc22ff87ae268a8ef951adb7dc2b838d3673db36ec34cbbf204be1584814a1c48d9c97fa2b87ae8ea09261ffb0a7a72e4c8be2f7dd4ac081c730b3be3b53
+  metadata.gz: 736e716587d1b7cb30f44263ac05108793b1819765c4e362240421022a3581b96bbbd186ca132846ade50a643f59edb422e2cb9c492c31d6c517556fb96e2c08
+  data.tar.gz: e985e8b8223a56a02c581f50e180851fee59b3fcbad402560f59746df6e64c3bfa8d4ccbf813571235ff5e5af1585b28939c51d835e13b8fd6b516dbe121b66c

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-# gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver'
+#gem "neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", path: '../neo4j-ruby-driver'
 
 gem 'listen', '< 3.1'
 

data/activegraph.gemspec

@@ -38,12 +38,12 @@ 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.3.0')
+  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.3.5')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rubocop', '~> 0.56.0')
+  s.add_development_dependency('rubocop', '>= 0.56.0')
   s.add_development_dependency('yard')
   s.add_development_dependency('dryspec')
 end

data/lib/active_graph/base.rb

@@ -1,8 +1,13 @@
+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
   module Base
     include ActiveGraph::Transactions
+    include ActiveGraph::Core::Querable
+    extend ActiveGraph::Core::Schema
 
     at_exit do
       @driver&.close
@@ -10,16 +15,12 @@ module ActiveGraph
 
     class << self
       # private?
-      def current_driver
+      def driver
         (@driver ||= establish_driver).tap do |driver|
           fail 'No driver defined!' if driver.nil?
         end
       end
 
-      def driver
-        current_driver.driver
-      end
-
       def on_establish_driver(&block)
         @establish_driver_block = block
       end
@@ -28,18 +29,10 @@ module ActiveGraph
         @establish_driver_block.call if @establish_driver_block
       end
 
-      def new_driver(url, auth_token, options = {})
-        verbose_query_logs = ActiveGraph::Config.fetch(:verbose_query_logs, false)
-        ActiveGraph::Core::Driver
-          .new(url, auth_token, options, verbose_query_logs: verbose_query_logs)
-      end
-
-      def transaction
-        current_transaction || Transaction
-      end
-
       def query(*args)
-        transaction.query(*args)
+        transaction do
+          super(*args)
+        end
       end
 
       # Should support setting driver via config options
@@ -48,35 +41,24 @@ module ActiveGraph
         @driver = driver
       end
 
-      def run_transaction(run_in_tx = true)
-        Transaction.run(current_driver, run_in_tx) do |tx|
-          yield tx
-        end
-      end
-
-      def new_transaction
+      def validating_transaction(&block)
         validate_model_schema!
-        ActiveGraph::Transaction.new
+        transaction(&block)
       end
 
       def new_query(options = {})
         validate_model_schema!
-        ActiveGraph::Core::Query.new({driver: current_driver}.merge(options))
+        ActiveGraph::Core::Query.new(options)
       end
 
       def magic_query(*args)
         if args.empty? || args.map(&:class) == [Hash]
-          Base.new_query(*args)
+          new_query(*args)
         else
-          Base.current_driver.query(*args)
+          query(*args)
         end
       end
 
-      def current_transaction
-        validate_model_schema!
-        Transaction.root
-      end
-
       def label_object(label_name)
         ActiveGraph::Core::Label.new(label_name)
       end

data/lib/active_graph/core/instrumentable.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'active_support/notifications'
 require 'active_graph/ansi'
+require 'active_graph/core/logging'
 
 module ActiveGraph
   module Core
@@ -14,7 +15,7 @@ module ActiveGraph
         def subscribe_to_request
           ActiveSupport::Notifications.subscribe('neo4j.core.bolt.request') do |_, start, finish, _id, _payload|
             ms = (finish - start) * 1000
-            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{Base.current_driver.url}"
+            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR}"
           end
         end
 
@@ -27,7 +28,7 @@ module ActiveGraph
             source_line, line_number = Logging.first_external_path_and_line(caller_locations)
 
             yield " #{ANSI::CYAN}#{query.context || 'CYPHER'}#{ANSI::CLEAR} #{cypher} #{params_string}" +
-              ("\n   ↳ #{source_line}:#{line_number}" if Base.current_driver.options[:verbose_query_logs] && source_line).to_s
+              ("\n   ↳ #{source_line}:#{line_number}" if ActiveGraph::Config.fetch(:verbose_query_logs, false) && source_line).to_s
           end
         end
       end

data/lib/active_graph/core/label.rb

@@ -76,7 +76,7 @@ module ActiveGraph
       end
 
       def constraints(_options = {})
-        ActiveGraph::Transaction.constraints.select do |definition|
+        ActiveGraph::Base.constraints.select do |definition|
           definition[:label] == @name.to_sym
         end
       end
@@ -109,13 +109,13 @@ module ActiveGraph
 
       class << self
         def indexes
-          ActiveGraph::Transaction.indexes
+          ActiveGraph::Base.indexes
         end
 
         def drop_indexes
           indexes.each do |definition|
             begin
-              ActiveGraph::Transaction.query("DROP INDEX ON :`#{definition[:label]}`(#{definition[:properties][0]})")
+              ActiveGraph::Base.query("DROP INDEX ON :`#{definition[:label]}`(#{definition[:properties][0]})")
             rescue Neo4j::Driver::Exceptions::DatabaseException
               # This will error on each constraint. Ignore and continue.
               next
@@ -124,11 +124,10 @@ module ActiveGraph
         end
 
         def drop_constraints
-          ActiveGraph::Transaction.named_constraints.each do |constraint|
-            ActiveGraph::Transaction.query("DROP CONSTRAINT #{constraint.name}")
-          end
-          ActiveGraph::Transaction.constraints.each do |definition|
-            ActiveGraph::Transaction.query("DROP CONSTRAINT ON (n:`#{definition[:label]}`) ASSERT n.`#{definition[:properties][0]}` IS UNIQUE")
+          ActiveGraph::Base.transaction do |tx|
+            tx.run('CALL db.constraints').each do |record|
+              tx.run("DROP #{record.keys.include?(:name) ? "CONSTRAINT #{record[:name]}" : record[:description]}")
+            end
           end
         end
 
@@ -147,7 +146,7 @@ module ActiveGraph
       end
 
       def schema_query(cypher)
-        ActiveGraph::Transaction.transaction { |tx| tx.query(cypher, {}) }
+        ActiveGraph::Base.query(cypher, {})
       end
 
       def validate_index_options!(options)

data/lib/active_graph/core/logging.rb

@@ -30,7 +30,7 @@ module ActiveGraph
         def neo4j_gem_path
           return if !defined?(::Rails.root)
 
-          @neo4j_gem_path ||= File.expand_path('../../..', ActiveGraph::Base.method(:current_driver).source_location[0])
+          @neo4j_gem_path ||= File.expand_path('../../..', ActiveGraph::Base.method(:driver).source_location[0])
         end
 
         def active_support_gem_path

data/lib/active_graph/core/querable.rb

@@ -27,29 +27,8 @@ module ActiveGraph
 
           query_builder.instance_eval(&block)
 
-          new_or_current_transaction(options[:transaction]) do |tx|
-            query_set(tx, query_builder.queries, { commit: !options[:transaction] }.merge(options))
-          end
-        end
-
-# If called without a block, returns a Transaction object
-# which can be used to call query/queries/mark_failed/commit
-# If called with a block, the Transaction object is yielded
-# to the block and `commit` is ensured.  Any uncaught exceptions
-# will mark the transaction as failed first
-        def transaction
-          return Transaction.new unless block_given?
-
-          begin
-            tx = transaction
-
-            yield tx
-          rescue => e
-            tx.mark_failed if tx
-
-            raise e
-          ensure
-            tx.close if tx
+          transaction do
+            query_set(query_builder.queries, options)
           end
         end
 
@@ -60,28 +39,20 @@ module ActiveGraph
           end
         end
 
-        def query_set(transaction, queries, options = {})
+        def query_set(queries, options = {})
           setup_queries!(queries, skip_instrumentation: options[:skip_instrumentation])
 
           ActiveSupport::Notifications.instrument('neo4j.core.bolt.request') do
             self.wrap_level = options[:wrap_level]
-            queries.map do |query|
-              result_from_data(transaction.root_tx.run(query.cypher, query.parameters))
+            transaction do |tx|
+              queries.map do |query|
+                result_from_data(tx.run(query.cypher, query.parameters))
+              end
             end
           rescue Neo4j::Driver::Exceptions::Neo4jException => e
             raise ActiveGraph::Core::CypherError.new_from(e.code, e.message) # , e.stack_track.to_a
           end
         end
-
-        private
-
-        def new_or_current_transaction(tx, &block)
-          if tx
-            yield(tx)
-          else
-            transaction(&block)
-          end
-        end
       end
     end
   end

data/lib/active_graph/core/query.rb

@@ -68,8 +68,6 @@ module ActiveGraph
       end
 
       def initialize(options = {})
-        @driver = options[:driver]
-
         @options = options
         @clauses = []
         @_params = {}
@@ -237,7 +235,7 @@ module ActiveGraph
       def response
         return @response if @response
 
-        @response = ActiveGraph::Transaction.query(self, transaction: Transaction.root, wrap_level: (:core_entity if unwrapped?))
+        @response = ActiveGraph::Base.query(self, wrap_level: (:core_entity if unwrapped?))
       end
 
       def raise_if_cypher_error!(response)
@@ -374,7 +372,7 @@ module ActiveGraph
       end
 
       def &(other)
-        self.class.new(driver: @driver).tap do |new_query|
+        self.class.new.tap do |new_query|
           new_query.options = options.merge(other.options)
           new_query.clauses = clauses + other.clauses
         end.params(other._params)

data/lib/active_graph/core/query_builder.rb

@@ -23,9 +23,7 @@ module ActiveGraph
       end
 
       def query
-        # `nil` drivers are just a workaround until
-        # we phase out `Query` objects containing drivers
-        ActiveGraph::Core::Query.new(driver: nil)
+        ActiveGraph::Core::Query.new
       end
     end
   end

data/lib/active_graph/core/schema.rb

@@ -24,11 +24,6 @@ module ActiveGraph
         end
       end
 
-      def named_constraints
-        result = query('CALL db.constraints()', {}, skip_instrumentation: true)
-        result.columns.include?(:name) ? result : []
-      end
-
       private
 
       def v4_filter(row)

data/lib/active_graph/core.rb

@@ -1,7 +1,6 @@
 require 'active_graph/transaction'
 require 'active_graph/core/instrumentable'
 require 'active_graph/core/query'
-require 'active_graph/core/driver'
 require 'active_graph/core/responses'
 
 require 'neo4j_ruby_driver'

data/lib/active_graph/migration.rb

@@ -28,7 +28,7 @@ module ActiveGraph
     end
 
     def query(*args)
-      ActiveGraph::Base.current_driver.query(*args)
+      ActiveGraph::Base.query(*args)
     end
 
     class AddIdProperty < ActiveGraph::Migration
@@ -115,7 +115,7 @@ MESSAGE
       # def id_batch_set(label, id_property, new_ids, count)
       #  tx = ActiveGraph::Base.new_transaction
 
-      #  ActiveGraph::Base.current_driver.query("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
+      #  ActiveGraph::Base.query("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
       #    with COLLECT(n) as nodes, #{new_ids} as ids
       #    FOREACH(i in range(0,#{count - 1})|
       #      FOREACH(node in [nodes[i]]|

data/lib/active_graph/migrations/base.rb

@@ -63,11 +63,11 @@ module ActiveGraph
       end
 
       def migration_transaction(&block)
-        ActiveGraph::Base.run_transaction(transactions?, &block)
+        transactions? ? ActiveGraph::Base.transaction(&block) : block.call
       end
 
       def log_queries
-        subscriber = ActiveGraph::Transaction.subscribe_to_query(&method(:output))
+        subscriber = ActiveGraph::Base.subscribe_to_query(&method(:output))
         yield
       ensure
         ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber

data/lib/active_graph/migrations/helpers/id_property.rb

@@ -27,23 +27,20 @@ module ActiveGraph
         end
 
         def id_batch_set(label, id_property, new_ids, count)
-          tx = ActiveGraph::Base.new_transaction
-
-          execute("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
+          ActiveGraph::Base.transaction do
+            execute("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
             with COLLECT(n) as nodes, #{new_ids} as ids
             FOREACH(i in range(0,#{count - 1})|
               FOREACH(node in [nodes[i]]|
                 SET node.#{id_property} = ids[i]))
             RETURN distinct(true)
             LIMIT #{count}")
-
-          count
-        rescue ActiveGraph::Server::CypherResponse::ResponseError, Faraday::TimeoutError
+            count
+          end
+        rescue ActiveGraph::Server::CypherResponse::ResponseError
           new_max_per_batch = (max_per_batch * 0.8).round
           output "Error querying #{max_per_batch} nodes. Trying #{new_max_per_batch}"
           new_max_per_batch
-        ensure
-          tx.close
         end
 
         def print_status(last_time_taken, max_per_batch, nodes_left)

data/lib/active_graph/migrations/schema.rb

@@ -2,16 +2,16 @@ module ActiveGraph
   module Migrations
     module Schema
       class << self
-        def fetch_schema_data(driver)
-          {constraints: fetch_constraint_descriptions(driver).sort,
-           indexes: fetch_index_descriptions(driver).sort}
+        def fetch_schema_data
+          {constraints: fetch_constraint_descriptions.sort,
+           indexes: fetch_index_descriptions.sort}
         end
 
-        def synchronize_schema_data(driver, schema_data, remove_missing)
+        def synchronize_schema_data(schema_data, remove_missing)
           queries = []
           queries += drop_and_create_queries(fetch_constraint_descriptions(driver), schema_data[:constraints], remove_missing)
           queries += drop_and_create_queries(fetch_index_descriptions(driver), schema_data[:indexes], remove_missing)
-          driver.queries do
+          ActiveGraph::Base.queries do
             queries.each { |query| append query }
           end
         end
@@ -19,11 +19,11 @@ module ActiveGraph
         private
 
         def fetch_constraint_descriptions(driver)
-          driver.query('CALL db.constraints()').map(&:description)
+          ActiveGraph::Base.query('CALL db.constraints()').map(&:description)
         end
 
         def fetch_index_descriptions(driver)
-          result = driver.query('CALL db.indexes()')
+          result = ActiveGraph::Base.query('CALL db.indexes()')
           if result.columns.include?(:description)
             v3_indexes(result)
           else

data/lib/active_graph/model_schema.rb

@@ -32,7 +32,7 @@ module ActiveGraph
       def model_constraints
         return @model_constraints if @model_constraints
 
-        constraints = ActiveGraph::Transaction.constraints.each_with_object({}) do |row, result|
+        constraints = ActiveGraph::Base.constraints.each_with_object({}) do |row, result|
           result[row[:label]] ||= []
           result[row[:label]] << row[:properties]
         end
@@ -43,7 +43,7 @@ module ActiveGraph
       def model_indexes
         return @model_indexes if @model_indexes
 
-        indexes = ActiveGraph::Transaction.indexes.each_with_object({}) do |row, result|
+        indexes = ActiveGraph::Base.indexes.each_with_object({}) do |row, result|
           result[row[:label]] ||= []
           result[row[:label]] << row[:properties]
         end

data/lib/active_graph/node/has_n.rb

@@ -446,7 +446,7 @@ module ActiveGraph::Node
 
           clear_deferred_nodes_for_association(name)
 
-          self.class.run_transaction { association_proxy(name).replace_with(other_nodes) }
+          ActiveGraph::Base.transaction { association_proxy(name).replace_with(other_nodes) }
         end
       end
 
@@ -524,7 +524,7 @@ module ActiveGraph::Node
           if persisted?
             other_node.save if other_node.respond_to?(:persisted?) && !other_node.persisted?
             association_proxy_cache.clear # TODO: Should probably just clear for this association...
-            self.class.run_transaction { association_proxy(name).replace_with(other_node) }
+            ActiveGraph::Base.transaction { association_proxy(name).replace_with(other_node) }
             # handle_non_persisted_node(other_node)
           else
             defer_create(name, other_node, clear: true)

data/lib/active_graph/node/persistence.rb

@@ -93,10 +93,9 @@ module ActiveGraph::Node
     end
 
     # The pending associations are cleared during the save process, so it's necessary to
-    # build the processable hash before it begins. If there are nodes and associations that
-    # need to be created after the node is saved, a new transaction is started.
+    # build the processable hash before it begins.
     def cascade_save
-      self.class.run_transaction(pending_deferred_creations?) do
+      ActiveGraph::Base.transaction do
         yield.tap { process_unpersisted_nodes! }
       end
     end

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

@@ -205,7 +205,7 @@ module ActiveGraph
           fail 'Can only create relationships on associations' if !@association
           other_nodes = _nodeify!(*other_nodes)
 
-          ActiveGraph::Base.run_transaction do
+          ActiveGraph::Base.transaction do
             other_nodes.each do |other_node|
               if other_node.neo_id
                 other_node.try(:delete_reverse_has_one_core_rel, association)

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

@@ -152,10 +152,10 @@ module ActiveGraph
           fail 'Method invalid when called on Class objects' unless source_object
           result = self.where(params).first
           return result unless result.nil?
-          ActiveGraph::Base.run_transaction do
+          ActiveGraph::Base.transaction do
             node = model.create(params)
             self << node
-            return node
+            node
           end
         end
 

data/lib/active_graph/node.rb

@@ -46,6 +46,7 @@ module ActiveGraph
     include ActiveGraph::Node::Enum
     include ActiveGraph::Shared::PermittedAttributes
     include ActiveGraph::Node::DependentCallbacks
+    include ActiveGraph::Transactions
 
     def initialize(args = nil)
       self.class.ensure_id_property_info! # So that we make sure all objects have an id_property

data/lib/active_graph/railtie.rb

@@ -2,7 +2,6 @@ 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/core/driver'
 
 module ActiveGraph
   class Railtie < ::Rails::Railtie
@@ -65,7 +64,7 @@ module ActiveGraph
       auth_token ||= username ? Neo4j::Driver::AuthTokens.basic(username, password) : Neo4j::Driver::AuthTokens.none
       register_neo4j_cypher_logging
 
-      ActiveGraph::Base.new_driver(url || path || default_driver_path_or_url, auth_token, config)
+      Neo4j::Driver::GraphDatabase.driver(url || path || default_driver_path_or_url, auth_token, config)
     end
 
     def final_driver_config!(neo4j_config)
@@ -99,8 +98,8 @@ module ActiveGraph
       logger_proc = ->(message) do
         (ActiveGraph::Config[:logger] ||= Rails.logger).debug message
       end
-      ActiveGraph::Transaction.subscribe_to_query(&logger_proc)
-      ActiveGraph::Transaction.subscribe_to_request(&logger_proc)
+      ActiveGraph::Base.subscribe_to_query(&logger_proc)
+      ActiveGraph::Base.subscribe_to_request(&logger_proc)
 
       @neo4j_cypher_logging_registered = true
     end

data/lib/active_graph/relationship.rb

@@ -19,6 +19,7 @@ module ActiveGraph
     include ActiveGraph::Relationship::Types
     include ActiveGraph::Shared::Enum
     include ActiveGraph::Shared::PermittedAttributes
+    include ActiveGraph::Transactions
 
     class FrozenRelError < ActiveGraph::Error; end
 

data/lib/active_graph/shared/callbacks.rb

@@ -20,16 +20,14 @@ module ActiveGraph
       end
 
       def destroy #:nodoc:
-        tx = ActiveGraph::Base.new_transaction
-        tx.root.after_commit { run_callbacks(:destroy_commit) {} }
-        run_callbacks(:destroy) { super }
+        ActiveGraph::Base.validating_transaction do |tx|
+          tx.after_commit { run_callbacks(:destroy_commit) {} }
+          run_callbacks(:destroy) { super }
+        end
       rescue
         @_deleted = false
         @attributes = @attributes.dup
-        tx.mark_failed if tx
         raise
-      ensure
-        tx.close if tx
       end
 
       def touch #:nodoc:
@@ -51,15 +49,15 @@ module ActiveGraph
       end
 
       def create_model #:nodoc:
-        self.class.run_transaction do |tx|
-          tx.root.after_commit { run_callbacks(:create_commit) {} }
+        ActiveGraph::Base.transaction do |tx|
+          tx.after_commit { run_callbacks(:create_commit) {} }
           run_callbacks(:create) { super }
         end
       end
 
       def update_model(*) #:nodoc:
-        self.class.run_transaction do |tx|
-          tx.root.after_commit { run_callbacks(:update_commit) {} }
+        ActiveGraph::Base.transaction do |tx|
+          tx.after_commit { run_callbacks(:update_commit) {} }
           run_callbacks(:update) { super }
         end
       end

data/lib/active_graph/shared/persistence.rb

@@ -89,14 +89,10 @@ module ActiveGraph::Shared
       @_create_or_updating = true
       apply_default_values
       result = _persisted_obj ? update_model : create_model
-      current_transaction = ActiveGraph::Base.current_transaction
 
-      current_transaction.mark_failed if result == false && current_transaction
+      ActiveGraph::Base.transaction(&:failure) if result == false
 
       result != false
-    rescue => e
-      current_transaction.mark_failed if current_transaction
-      raise e
     ensure
       @_create_or_updating = nil
     end
@@ -180,10 +176,10 @@ module ActiveGraph::Shared
     # Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.
     # If saving fails because the resource is invalid then false will be returned.
     def update(attributes)
-      self.class.run_transaction do |tx|
+      ActiveGraph::Base.transaction do |tx|
         self.attributes = process_attributes(attributes)
         saved = save
-        tx.mark_failed unless saved
+        tx.failure unless saved
         saved
       end
     end
@@ -197,7 +193,7 @@ module ActiveGraph::Shared
 
     def update_db_properties(hash)
       fail ::ActiveGraph::Error, 'can not update on a new record object' unless persisted?
-      self.class.run_transaction do
+      ActiveGraph::Base.transaction do
         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) }
@@ -210,7 +206,7 @@ module ActiveGraph::Shared
 
     # Same as {#update_attributes}, but raises an exception if saving fails.
     def update!(attributes)
-      self.class.run_transaction do
+      ActiveGraph::Base.transaction do
         self.attributes = process_attributes(attributes)
         save!
       end
@@ -227,12 +223,6 @@ module ActiveGraph::Shared
       end
     end
 
-    module ClassMethods
-      def run_transaction(run_in_tx = true)
-        ActiveGraph::Base.run_transaction(run_in_tx) { |tx| yield tx }
-      end
-    end
-
     protected
 
     def increment_by_query!(match_query, attribute, by, element_name = :n)

data/lib/active_graph/shared.rb

@@ -14,7 +14,7 @@ module ActiveGraph
 
       # remove?
       def neo4j_driver
-        ActiveGraph::Base.current_driver
+        ActiveGraph::Base.driver
       end
 
       # remove?

data/lib/active_graph/tasks/migration.rake

@@ -9,8 +9,8 @@ if !defined?(Rails) && !Rake::Task.task_defined?('environment')
     require 'ostruct'
     neo4j_url = ENV['NEO4J_URL'] || 'http://localhost:7474'
     $LOAD_PATH.unshift File.dirname('./')
-    ActiveGraph::Base.on_establish_session do
-      ActiveGraph::Base.new_driver(neo4j_url)
+    ActiveGraph::Base.on_establish_driver do
+      Neo4j::Driver::GraphDatabase.driver(neo4j_url)
     end
   end
 end
@@ -64,7 +64,7 @@ namespace :neo4j do
 COMMENT
 
     def check_neo4j_version_3
-      if ActiveGraph::Base.transaction.version > '3.0.0'
+      if ActiveGraph::Base.version > '3.0.0'
         yield
       else
         puts 'WARNING: This task does not work for versions of Neo4j before 3.0.0'
@@ -76,7 +76,7 @@ COMMENT
       check_neo4j_version_3 do
         require 'active_graph/migrations/schema'
 
-        schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data(ActiveGraph::Base.transaction)
+        schema_data = ActiveGraph::Migrations::Schema.fetch_schema_data
 
         runner = ActiveGraph::Migrations::Runner.new
         schema_data[:versions] = runner.complete_migration_versions.sort
@@ -97,13 +97,13 @@ COMMENT
 
         schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
 
-        ActiveGraph::Transaction.subscribe_to_query(&method(:puts))
+        ActiveGraph::Base.subscribe_to_query(&method(:puts))
 
-        ActiveGraph::Base.run_transaction do
-          ActiveGraph::Migrations::Schema.synchronize_schema_data(ActiveGraph::Base.transaction, schema_data, args[:remove_missing])
+        ActiveGraph::Base.transaction do
+          ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
         end
 
-        ActiveGraph::Base.run_transaction do
+        ActiveGraph::Base.transaction do
           runner = ActiveGraph::Migrations::Runner.new
           runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
         end

data/lib/active_graph/transaction.rb

@@ -1,139 +1,24 @@
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/attribute_accessors_per_thread'
-require 'active_graph/core/querable'
-require 'active_graph/core/schema'
-
 module ActiveGraph
-  class Transaction
-    include ActiveGraph::Core::Querable
-    extend ActiveGraph::Core::Schema
-
-    thread_mattr_accessor :stack
-    attr_reader :root
-    attr_reader :driver_tx, :driver_session
-
-    class << self
-      # Runs the given block in a new transaction.
-      # @param [Boolean] run_in_tx if true a new transaction will not be created, instead if will simply yield to the given block
-      # @@yield [ActiveGraph::Transaction::Instance]
-      def run(_driver, run_in_tx)
-        return yield(nil) unless run_in_tx
-
-        tx = ActiveGraph::Transaction.new
-        yield tx
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        tx.mark_failed unless tx.nil?
-        raise e
-      ensure
-        tx.close unless tx.nil?
-      end
-
-      def root
-        initialized_stack.first
-      end
-
-      def initialized_stack
-        self.stack ||= []
-      end
-    end
-
-    def initialize(_options = {})
-      self.class.initialized_stack << self
-      @root = stack.first
-      return unless root?
-      @driver_session = Base.current_driver.driver.session(Neo4j::Driver::AccessMode::WRITE)
-      @driver_tx = @driver_session.begin_transaction
-    rescue StandardError => e
-      self.stack = []
-      @driver_tx.close if @driver_tx
-      @driver_session.close if @driver_session
-      raise e
-    end
-
-    # Commits or marks this transaction for rollback, depending on whether #mark_failed has been previously invoked.
-    def close
-      fail 'Tried closing when transaction stack is empty (maybe you closed too many?)' if stack.empty?
-      fail "Closed transaction which wasn't the most recent on the stack (maybe you forgot to close one?)" if stack.pop != self
-
-      post_close! if stack.empty?
-    end
-
-    # Marks this transaction as failed,
-    # which means that it will unconditionally be rolled back
-    # when #close is called.
-    # Aliased for legacy purposes.
-    def mark_failed
-      root.mark_failed if root && root != self
+  module Transaction
+    def failure
+      super
       @failure = true
     end
 
-    alias failure mark_failed
-
-    # If it has been marked as failed.
-    # Aliased for legacy purposes.
-    def failed?
-      !!@failure
-    end
-
-    alias failure? failed?
-
-    def root?
-      @root == self
-    end
-
-    def query(*args)
-      options = if args[0].is_a?(::ActiveGraph::Core::Query)
-                  args[1] ||= {}
-                else
-                  args[1] ||= {}
-                  args[2] ||= {}
-                end
-      options[:transaction] ||= self
-
-      self.class.query(*args)
-    end
-
-    def queries(options = {}, &block)
-      self.class.queries({ transaction: self }.merge(options), &block)
-    end
-
-    def after_commit_registry
-      @after_commit_registry ||= []
+    def close
+      success
+      super
+      after_commit_registry.each(&:call) unless @failure
     end
 
     def after_commit(&block)
       after_commit_registry << block
     end
 
-    def commit
-      return unless root?
-      begin
-        @driver_tx.success
-        @driver_tx.close
-      ensure
-        @driver_session.close
-      end
-    end
-
-    def delete
-      root.driver_tx.failure
-      root.driver_tx.close
-      root.driver_session.close
-    end
-
-    def root_tx
-      root.driver_tx
-    end
-
     private
 
-    def post_close!
-      if failed?
-        delete
-      else
-        commit
-        after_commit_registry.each(&:call)
-      end
+    def after_commit_registry
+      @after_commit_registry ||= []
     end
   end
 end

data/lib/active_graph/transactions.rb

@@ -5,50 +5,53 @@ module ActiveGraph
     extend ActiveSupport::Concern
 
     included do
-      thread_mattr_accessor :ag_session, :tx
+      thread_mattr_accessor :explicit_session, :tx
     end
 
     class_methods do
       def session(*args)
-        driver.session(*args) do |session|
-          self.ag_session = session
+        ActiveGraph::Base.driver.session(*args) do |session|
+          self.explicit_session = session
           yield session
           session.last_bookmark
-        ensure
-          self.ag_session = nil
         end
       end
 
-      def write_transaction(config = nil, &block)
-        send_transaction(:write_transaction, config, &block)
+      def transaction(**config, &block)
+        send_transaction(:begin_transaction, **config, &block)
       end
-      alias transaction write_transaction
 
-      def read_transaction(config = nil, &block)
-        send_transaction(:read_transaction, config, &block)
+      def write_transaction(**config, &block)
+        send_transaction(:write_transaction, **config, &block)
       end
 
-      def begin_transaction(config = nil, &block)
-        send_transaction(:begin_transaction, config, &block)
+      def read_transaction(**config, &block)
+        send_transaction(:read_transaction, **config, &block)
       end
 
       private
 
-      def send_transaction(method, config = nil, &block)
-        return yield tx if tx
-        return reuse(ag_session, method, config, &block) if ag_session
-        driver.session { |session| reuse(session, method, config, &block) }
+      def send_transaction(method, **config, &block)
+        return checked_yield(tx, &block) if tx&.open?
+        return run_transaction_work(explicit_session, method, **config, &block) if explicit_session&.open?
+        driver.session do |session|
+          run_transaction_work(session, method, **config, &block)
+        end
       end
 
-      def reuse(session, method, config)
-        session.send(method, config) do |tx|
+      def run_transaction_work(session, method, **config, &block)
+        session.send(method, **config) do |tx|
           self.tx = tx
-          yield tx
-          tx.success
-        ensure
-          self.tx = nil
+          checked_yield(tx, &block)
         end
       end
+
+      def checked_yield(tx)
+        yield tx
+      rescue StandardError => e
+        tx.failure
+        raise e
+      end
     end
   end
 end

data/lib/active_graph/version.rb

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

data/lib/active_graph.rb

@@ -4,6 +4,7 @@ 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/transactions'
 require 'active_graph/base'
 require 'active_graph/model_schema'
@@ -118,3 +119,5 @@ if defined?(Rails)
   require 'rails/generators'
   require 'rails/generators/neo4j_generator'
 end
+
+Neo4j::Driver::Transaction.prepend ActiveGraph::Transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.3
+  version: 10.0.0.pre.beta.4
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -196,14 +196,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.56.0
 - !ruby/object:Gem::Dependency
@@ -262,7 +262,6 @@ 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/driver.rb
 - lib/active_graph/core/instrumentable.rb
 - lib/active_graph/core/label.rb
 - lib/active_graph/core/logging.rb

data/lib/active_graph/core/driver.rb

@@ -1,49 +0,0 @@
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_graph/core/logging'
-require 'active_graph/version'
-
-module ActiveGraph
-  module Core
-    class Driver
-      USER_AGENT_STRING = "activegraph-gem/#{::ActiveGraph::VERSION} (https://github.com/neo4jrb/activegraph)"
-
-      attr_accessor :wrap_level
-      attr_reader :options, :driver, :url
-      delegate :close, to: :driver
-
-      class << self
-        def new_instance(url, auth_token,  options = {})
-          Neo4j::Driver::GraphDatabase.driver(url, auth_token, options)
-        end
-      end
-
-      def initialize(url, auth_token = Neo4j::Driver::AuthTokens.none, options = {}, extended_options = {})
-        @url = url
-        @driver = self.class.new_instance(url, auth_token, options)
-        @options = extended_options
-      end
-
-      def logger
-        return @logger if @logger
-
-        @logger = if @options[:logger]
-                    @options[:logger]
-                  else
-                    Logger.new(logger_location).tap do |logger|
-                      logger.level = logger_level
-                    end
-                  end
-      end
-
-      private
-
-      def logger_location
-        @options[:logger_location] || STDOUT
-      end
-
-      def logger_level
-        @options[:logger_level] || Logger::WARN
-      end
-    end
-  end
-end