activecypher 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43840a1c50c381abdd55b077b1748b8b06f6bd360cea489c70f46bb2da54735a
-  data.tar.gz: 4a06216a9511ca7c5f25b509a742aa91d701c634cd1778f7feecdba9ee948492
+  metadata.gz: 29fa2252b85c3c67d4f8a8e72acc69ad1021088561ce02c8e1d205bef28b4069
+  data.tar.gz: 0665ef0b5e7a68264f50b846ba78036dc5d3c805e874bc475abb12a3bb699069
 SHA512:
-  metadata.gz: a3aeb03225c68a06e1a085ddef27f89d51e3084b86ddce90111754ab619a70f73e082eba8f1f7b80a9b8d2a1b6e297ff403d47f79e3877487cfbcb86fec322c2
-  data.tar.gz: 635b65a8fa3eb23e6758aaaa9fe51390ebce7e92b442710bffd672865b3767663aa4b02de768fca692db6d9e247ba8a80b2036d2a8c0639a06d815eeddc5439b
+  metadata.gz: 13b575ead30e4ea3b3476e97993c33e8eebc2dfb788d10e7ad9aa8e02014f389581d3e619f50629611340ea33af2bae967b026cd07110de57586887919ff89f3
+  data.tar.gz: a9dd762af2674169b558739ca5652e21cfcb60adb8a491c5d0bdf22b64a19b45c1087858db972a71f26af9113ee146e67ef57188e6f273adef959ca369a407d3

data/lib/active_cypher/bolt/connection.rb

@@ -485,15 +485,6 @@ module ActiveCypher
         session(database: db).write_transaction(db: db, timeout: timeout, metadata: metadata, &)
       end
 
-      # Asynchronously execute a read transaction.
-      def async_read_transaction(db: nil, timeout: nil, metadata: nil, &)
-        session(database: db).async_read_transaction(db: db, timeout: timeout, metadata: metadata, &)
-      end
-
-      # Asynchronously execute a write transaction.
-      def async_write_transaction(db: nil, timeout: nil, metadata: nil, &)
-        session(database: db).async_write_transaction(db: db, timeout: timeout, metadata: metadata, &)
-      end
 
       # ────────────────────────────────────────────────────────────────────
       # HEALTH AND VERSION DETECTION METHODS

data/lib/active_cypher/bolt/driver.rb

@@ -40,19 +40,9 @@ module ActiveCypher
       #
       # @yieldparam session [Bolt::Session] The session to use
       # @return [Object] The result of the block
-      def with_session(**kw)
+      def with_session(**kw, &block)
         Sync do
-          @pool.acquire do |conn|
-            conn.mark_used!
-            session = Bolt::Session.new(conn, **kw)
-
-            yield session
-          ensure
-            # Make sure any open transaction is cleaned up before returning the
-            # connection to the pool, so the next borrower doesn't inherit
-            # IN_TRANSACTION state.
-            session&.close
-          end
+          _acquire_session(**kw, &block)
         end
       rescue Async::TimeoutError => e
         raise ActiveCypher::ConnectionError, "Connection pool timeout: #{e.message}"
@@ -60,6 +50,19 @@ module ActiveCypher
         raise ActiveCypher::ConnectionError, "Connection error: #{e.message}"
       end
 
+      # Asynchronously yields a Session. Each call acquires its own connection from the pool,
+      # making it safe for concurrent use across fibers.
+      #
+      # @yieldparam session [Bolt::Session] The session to use
+      # @return [Async::Task] A task that resolves to the block's result
+      def async_with_session(**kw, &block)
+        raise 'Cannot run async_with_session outside of an Async task' unless Async::Task.current?
+
+        Async do
+          _acquire_session(**kw, &block)
+        end
+      end
+
       # Checks if the database is alive, or just faking it for your benefit.
       #
       # @return [Boolean]
@@ -78,6 +81,25 @@ module ActiveCypher
 
       private
 
+      # Internal: acquires a connection and yields a session.
+      # @yieldparam session [Bolt::Session]
+      # @return [Object] The result of the block
+      def _acquire_session(**kw)
+        @pool.acquire do |conn|
+          conn.mark_used!
+          session = Bolt::Session.new(conn, **kw)
+
+          begin
+            yield session
+          ensure
+            # Make sure any open transaction is cleaned up before returning the
+            # connection to the pool, so the next borrower doesn't inherit
+            # IN_TRANSACTION state.
+            session&.close
+          end
+        end
+      end
+
       # Builds a new connection, because the old one just wasn't good enough.
       #
       # @return [Connection]

data/lib/active_cypher/connection_adapters/abstract_bolt_adapter.rb

@@ -11,11 +11,12 @@ module ActiveCypher
     class AbstractBoltAdapter < AbstractAdapter
       include Instrumentation
 
-      attr_reader :connection
+      attr_reader :connection, :driver
 
       # Returns the raw Bolt connection object
       # This is useful for accessing low-level connection methods like
-      # read_transaction, write_transaction, async_read_transaction, etc.
+      # read_transaction, write_transaction, etc.
+      # NOTE: For concurrent async operations, use with_session or async_with_session instead.
       def raw_connection
         @connection
       end
@@ -54,6 +55,18 @@ module ActiveCypher
                          }
                        end
 
+          # Create the driver with connection pool for concurrent operations
+          @driver = Bolt::Driver.new(
+            uri: "bolt://#{host}:#{port}",
+            adapter: self,
+            auth_token: auth,
+            pool_size: config.fetch(:pool_size, 10),
+            secure: ssl_params[:secure],
+            verify_cert: ssl_params[:verify_cert]
+          )
+
+          # Also create a single connection for backwards compatibility
+          # This connection is used for simple synchronous operations
           @connection = Bolt::Connection.new(
             host, port, self,
             auth_token: auth,
@@ -72,12 +85,34 @@ module ActiveCypher
       # Clean disconnection. Resets the internal state.
       def disconnect
         instrument_connection(:disconnect) do
-          @connection.close if @connection
+          @driver&.close
+          @driver = nil
+          @connection&.close
           @connection = nil
           true
         end
       end
 
+      # Yields a Session from the connection pool. Safe for concurrent use.
+      # Each call acquires its own connection from the pool.
+      #
+      # @yieldparam session [Bolt::Session] The session to use
+      # @return [Object] The result of the block
+      def with_session(**kw, &block)
+        connect
+        @driver.with_session(**kw, &block)
+      end
+
+      # Asynchronously yields a Session from the connection pool.
+      # Each call acquires its own connection, making it safe for concurrent fibers.
+      #
+      # @yieldparam session [Bolt::Session] The session to use
+      # @return [Async::Task] A task that resolves to the block's result
+      def async_with_session(**kw, &block)
+        connect
+        @driver.async_with_session(**kw, &block)
+      end
+
       # Runs a Cypher query via Bolt session.
       # Automatically handles connect, logs query, cleans up session. Very adult.
       def run(cypher, params = {}, context: 'Query', db: nil, access_mode: :write)

data/lib/active_cypher/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveCypher
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 
   def self.gem_version
     Gem::Version.new VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -93,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: async-safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenCypher Adapter ala ActiveRecord
 email:
 - seuros@pre-history.com