activecypher 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2396c4b661d5d743f6c35c7921d020f096531f543c7df9b99e05bddf84c9a2db
-  data.tar.gz: 51e407abc0ac00aaa315fd8acdf489fad8a8d8ae3a46702df4b97c8347ea3fbd
+  metadata.gz: a39f60243be9073a1c3e2f05e1239239de9412d95184a321d22c4f582b0cdbdb
+  data.tar.gz: f125c98717432f24b3e0e28e4066f962cc2cb46bbab556bda52a44c3f4f12e7c
 SHA512:
-  metadata.gz: 210b7c45581497c2ab69a3609e452dba832c0b15ccd3dbf1ee81740f7e4a4c693c537745ea9de13b3904f4c2c5c8386fecfd3fa45eab7e98ce2e7c8976b85cf6
-  data.tar.gz: 29df9c560d01ec8ce6e8c7eee1e977d6a1b61dc532c7af929b3da101fbf9f3440afdd4332a9b7cc2c2f4af1ab420e51bcc21f55841e9a1b57f94120371459610
+  metadata.gz: 3bea961b864932446e0c667c7f88c9a428204f62089696b65d32dc62c4297e10e7d86e1f2ce67db8eb32e3a771944d882840b5d416345eed3296a3b23dec1d09
+  data.tar.gz: 1803663082f2fa06c7af69af355d0bd05ad78901c217c8b5f2aa2486b3adc009a6784d11b09731b1bd88d0b533e12420c13b11254b4b0852de5636b1e0d530f3

data/lib/active_cypher/base.rb

@@ -34,7 +34,6 @@ module ActiveCypher
     include Model::Persistence
     include Model::Destruction
     include Model::Countable
-    include Model::Inspectable
 
     class << self
       # Attempts to retrieve a connection from the handler.
@@ -61,6 +60,24 @@ module ActiveCypher
       end
     end
 
+    # Custom object inspection method for pretty-printing a compact,
+    # single-line summary of the object. Output examples:
+    #
+    #   #<UserNode id="26" name="Alice" age=34>   => persisted object
+    #   #<UserNode (new) name="Bob">              => object not yet saved
+    #
+    def inspect
+      # Put 'internal_id' first like it's the main character (even if it's nil)
+      ordered = attributes.dup
+      ordered = ordered.slice('internal_id').merge(ordered.except('internal_id'))
+
+      # Turn each attr into "key: value" because we humans fear raw hashes
+      parts = ordered.map { |k, v| "#{k}: #{v.inspect}" }
+
+      # Wrap it all up in a fake-sane object string, so you can pretend your data is organized.
+      "#<#{self.class} #{parts.join(', ')}>"
+    end
+
     # Because Rails needs to feel included, too.
     ActiveSupport.run_load_hooks(:active_cypher, self)
   end

data/lib/active_cypher/bolt/connection.rb

@@ -133,7 +133,7 @@ module ActiveCypher
       #
       # @note The digital equivalent of ghosting.
       def close
-        @socket&.close if connected?
+        @socket.close if connected?
       rescue IOError
       ensure
         @socket = nil

data/lib/active_cypher/bolt/driver.rb

@@ -47,11 +47,7 @@ module ActiveCypher
             # Check if connection is viable before using it
             unless conn.viable?
               # Create a fresh connection, because hope springs eternal
-              begin
-                conn.close
-              rescue StandardError
-                nil
-              end
+              conn.close
               conn = build_connection
             end
 
@@ -64,11 +60,7 @@ module ActiveCypher
               # Check if connection is viable before using it
               unless conn.viable?
                 # Create a fresh connection, because why not
-                begin
-                  conn.close
-                rescue StandardError
-                  nil
-                end
+                conn.close
                 conn = build_connection
               end
 
@@ -88,8 +80,6 @@ module ActiveCypher
       def verify_connectivity
         with_session { |s| s.run('RETURN 1') }
         true
-      rescue StandardError
-        false
       end
 
       # Closes the connection pool. Because sometimes you just need to let go.
@@ -119,11 +109,7 @@ module ActiveCypher
         begin
           connection.connect
         rescue StandardError => e
-          begin
-            connection.close
-          rescue StandardError
-            nil
-          end
+          connection.close
           raise e
         end
 

data/lib/active_cypher/bolt/session.rb

@@ -7,6 +7,7 @@ module ActiveCypher
     # It maintains a connection to the database server and allows running queries.
     class Session
       include Instrumentation
+
       attr_reader :connection, :database
 
       def initialize(connection, database: nil)
@@ -119,15 +120,15 @@ module ActiveCypher
       # @param metadata [Hash] Transaction metadata to send to the server.
       # @yield [tx] The transaction to use for queries.
       # @return The result of the block.
-      def run_transaction(mode = :write, db: nil, timeout: nil, metadata: nil, &block)
+      def run_transaction(mode = :write, db: nil, timeout: nil, metadata: nil, &)
         if Async::Task.current?
           # Already in an async context, just run the block.
           # The block will run asynchronously within the current task.
-          _execute_transaction_block(mode, db, timeout, metadata, &block)
+          _execute_transaction_block(mode, db, timeout, metadata, &)
         else
           # Not in an async context, so we need to create one and wait for it to complete.
           Async do
-            _execute_transaction_block(mode, db, timeout, metadata, &block)
+            _execute_transaction_block(mode, db, timeout, metadata, &)
           end.wait
         end
       end
@@ -141,12 +142,12 @@ module ActiveCypher
       # @param metadata [Hash] Transaction metadata to send to the server.
       # @yield [tx] The transaction to use for queries.
       # @return [Async::Task] A task that will complete with the result of the block.
-      def async_run_transaction(mode = :write, db: nil, timeout: nil, metadata: nil, &block)
+      def async_run_transaction(mode = :write, db: nil, timeout: nil, metadata: nil, &)
         # Ensure we are in an async task, otherwise the behavior is undefined.
         raise 'Cannot run an async transaction outside of an Async task' unless Async::Task.current?
 
         Async do
-          _execute_transaction_block(mode, db, timeout, metadata, &block)
+          _execute_transaction_block(mode, db, timeout, metadata, &)
         end
       end
 
@@ -158,12 +159,12 @@ module ActiveCypher
         run_transaction(:read, db: db, timeout: timeout, metadata: metadata, &)
       end
 
-      def async_write_transaction(db: nil, timeout: nil, metadata: nil, &block)
-        async_run_transaction(:write, db: db, timeout: timeout, metadata: metadata, &block)
+      def async_write_transaction(db: nil, timeout: nil, metadata: nil, &)
+        async_run_transaction(:write, db: db, timeout: timeout, metadata: metadata, &)
       end
 
-      def async_read_transaction(db: nil, timeout: nil, metadata: nil, &block)
-        async_run_transaction(:read, db: db, timeout: timeout, metadata: metadata, &block)
+      def async_read_transaction(db: nil, timeout: nil, metadata: nil, &)
+        async_run_transaction(:read, db: db, timeout: timeout, metadata: metadata, &)
       end
 
       # Close the session and any active transaction.

data/lib/active_cypher/bolt/transaction.rb

@@ -5,6 +5,7 @@ module ActiveCypher
     # Manages transaction state (BEGIN/COMMIT/ROLLBACK) and runs queries within a transaction.
     class Transaction
       include Instrumentation
+
       attr_reader :bookmarks, :metadata, :connection
 
       # Initializes a new Transaction instance.
@@ -147,11 +148,7 @@ module ActiveCypher
       rescue ConnectionError
         @state = :failed
         # Mark transaction as completed in the session
-        begin
-          @session.complete_transaction(self)
-        rescue StandardError
-          nil
-        end
+        @session.complete_transaction(self)
         raise
       end
 
@@ -184,11 +181,7 @@ module ActiveCypher
         ensure
           # Always mark as rolled back and complete the transaction
           @state = :rolled_back
-          begin
-            @session.complete_transaction(self)
-          rescue StandardError
-            nil
-          end
+          @session.complete_transaction(self)
         end
       end
 

data/lib/active_cypher/connection_adapters/abstract_adapter.rb

@@ -57,34 +57,6 @@ module ActiveCypher
         raise NotImplementedError, "#{self.class} must implement #hydrate_record"
       end
 
-      # Get current adapter type for ID handling
-      # Helper for generating ID-related Cypher functions that are database-specific
-      module CypherFunction
-        # Generate ID equality clause with the ID value embedded in the query for Memgraph
-        def self.id_equals(var, id_value, adapter)
-          func = id_function(adapter)
-          "#{func}(#{var}) = #{id_value}"
-        end
-
-        # Generate ID equality clause using a parameterized ID value for Neo4j
-        def self.id_equals_param(var, param_name, adapter)
-          func = id_function(adapter)
-          "#{func}(#{var}) = $#{param_name}"
-        end
-
-        # Generate a node variable with ID predicate
-        def self.node_with_id(node_var, id_value, adapter)
-          func = id_function(adapter)
-          "#{func}(#{node_var}) = #{id_value}"
-        end
-
-        # Return ID expression
-        def self.return_id(var, as_name, adapter)
-          func = id_function(adapter)
-          "#{func}(#{var}) AS #{as_name}"
-        end
-      end
-
       # Turns rows into symbols, because Rubyists fear strings.
       # @param rows [Array<Hash>] The rows to process
       # @return [Array<Hash>] The processed rows

data/lib/active_cypher/connection_adapters/abstract_bolt_adapter.rb

@@ -10,6 +10,7 @@ module ActiveCypher
     # It's like ActiveRecord::ConnectionAdapter, but for weirdos like me who use graph databases.
     class AbstractBoltAdapter < AbstractAdapter
       include Instrumentation
+
       attr_reader :connection
 
       # Returns the raw Bolt connection object
@@ -71,7 +72,7 @@ module ActiveCypher
       # Clean disconnection. Resets the internal state.
       def disconnect
         instrument_connection(:disconnect) do
-          @connection&.close
+          @connection.close if @connection
           @connection = nil
           true
         end

data/lib/active_cypher/connection_adapters/memgraph_adapter.rb

@@ -11,8 +11,6 @@ module ActiveCypher
       def schema_catalog
         rows = run('SHOW SCHEMA')
         parse_schema(rows)
-      rescue StandardError
-        introspect_fallback
       end
 
       # Use id() for Memgraph instead of elementId()
@@ -198,6 +196,7 @@ module ActiveCypher
 
       module Persistence
         include PersistenceMethods
+
         module_function :create_record, :update_record, :destroy_record
       end
 

data/lib/active_cypher/connection_adapters/neo4j_adapter.rb

@@ -33,8 +33,6 @@ module ActiveCypher
 
         Schema::Catalog.new(indexes: idx_defs, constraints: con_defs,
                             node_types: [], edge_types: [])
-      rescue StandardError
-        Schema::Catalog.new(indexes: [], constraints: [], node_types: [], edge_types: [])
       end
 
       # Use elementId() for Neo4j
@@ -156,6 +154,7 @@ module ActiveCypher
 
       module Persistence
         include PersistenceMethods
+
         module_function :create_record, :update_record, :destroy_record
       end
 

data/lib/active_cypher/connection_pool.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'concurrent/atomic/atomic_reference'
 require 'timeout'
 
 module ActiveCypher
@@ -24,29 +23,27 @@ module ActiveCypher
 
         # Merge the resolved config with any additional options
         @spec = resolved_config.merge(@spec.except(:url))
-
       end
 
-      @conn_ref = Concurrent::AtomicReference.new # holds the adapter instance
+      @conn_ref = nil # holds the adapter instance
       @creation_mutex = Mutex.new # prevents multiple threads from creating connections simultaneously
-      @retry_count = Concurrent::AtomicReference.new(0)
     end
 
-    # Returns a live adapter, initialising it once in a thread‑safe way.
+    # Returns a live adapter, initializing it once in a thread‑safe way.
     def connection
-      # Fast path —already connected and alive
-      conn = @conn_ref.value
+      # Fast path — already connected and alive
+      conn = @conn_ref
       return conn if conn&.active?
 
       # Use mutex for the slow path to prevent thundering herd
       @creation_mutex.synchronize do
         # Check again inside the mutex in case another thread created it
-        conn = @conn_ref.value
+        conn = @conn_ref
         return conn if conn&.active?
 
         # Create a new connection
         new_conn = build_connection
-        @conn_ref.set(new_conn)
+        @conn_ref = new_conn
         return new_conn
       end
     end
@@ -54,12 +51,12 @@ module ActiveCypher
 
     # Check if the pool has a persistent connection issue
     def troubled?
-      @retry_count.value >= @spec[:max_retries]
+      @retry_count >= @spec[:max_retries]
     end
 
     # Explicitly close and reset the connection
     def disconnect
-      conn = @conn_ref.value
+      conn = @conn_ref
       return unless conn
 
       begin
@@ -68,7 +65,7 @@ module ActiveCypher
         # Log but don't raise to ensure cleanup continues
         puts "Warning: Error disconnecting: #{e.message}" if ENV['DEBUG']
       ensure
-        @conn_ref.set(nil)
+        @conn_ref = nil
       end
     end
 
@@ -91,8 +88,8 @@ module ActiveCypher
       rescue Timeout::Error
         begin
           adapter.disconnect
-        rescue StandardError
-          nil
+        rescue StandardError => e
+          puts "Warning: Error disconnecting during timeout cleanup: #{e.message}" if ENV['DEBUG']
         end
         raise ConnectionError, "Connection timed out after #{@spec[:pool_timeout]} seconds"
       end

data/lib/active_cypher/fixtures.rb

@@ -32,11 +32,7 @@ module ActiveCypher
 
       # 5. Gather unique connections for all model classes referenced in this profile
       model_classes = dsl_context.nodes.map { |node| node[:model_class] }.uniq
-      connections = model_classes.map do |klass|
-        klass.connection
-      rescue StandardError
-        nil
-      end.compact.uniq
+      connections = model_classes.map(&:connection).compact.uniq
 
       # 6. Wipe all nodes in each relevant connection
       connections.each do |conn|
@@ -78,11 +74,7 @@ module ActiveCypher
       end
 
       # Gather unique connections from all model classes
-      connections = model_classes.map do |klass|
-        klass.connection
-      rescue StandardError
-        nil
-      end.compact.uniq
+      connections = model_classes.map(&:connection).compact.uniq
 
       # Wipe all nodes in each connection
       connections.each do |conn|
@@ -104,17 +96,13 @@ module ActiveCypher
         next unless klass < ActiveCypher::Base
         next if klass.respond_to?(:abstract_class?) && klass.abstract_class?
 
-        begin
-          conn = klass.connection
-          # Store connection details for comparison
-          model_connections[klass] = {
-            adapter: conn.class.name,
-            config: conn.instance_variable_get(:@config),
-            object_id: conn.object_id
-          }
-        rescue StandardError
-          # Skip if can't get connection
-        end
+        conn = klass.connection
+        # Store connection details for comparison
+        model_connections[klass] = {
+          adapter: conn.class.name,
+          config: conn.instance_variable_get(:@config),
+          object_id: conn.object_id
+        }
       end
 
       relationships.each do |rel|

data/lib/active_cypher/instrumentation.rb

@@ -132,7 +132,7 @@ module ActiveCypher
     # @param key [String, Symbol] The key to check
     # @return [Boolean] True if the key contains sensitive information
     def sensitive_key?(key)
-      return true if key.to_s.match?(/(^|[\-_])(?:password|token|secret|credential|key)($|[\-_])/i)
+      return true if key.to_s.match?(/(^|[-_])(?:password|token|secret|credential|key)($|[-_])/i)
 
       # Check against Rails filter parameters if available
       if defined?(Rails) && Rails.application

data/lib/active_cypher/logging.rb

@@ -14,11 +14,7 @@ module ActiveCypher
         self.backend ||= begin
           base = Logger.new($stdout)
           base.level = ENV.fetch('AC_LOG_LEVEL', 'info').upcase
-                          .then do |lvl|
-            Logger.const_get(lvl)
-          rescue StandardError
-            Logger::INFO
-          end
+                          .then { |lvl| Logger.const_get(lvl) }
           ActiveSupport::TaggedLogging.new(base).tap { |l| l.tagged! 'ActiveCypher' }
         end
       end

data/lib/active_cypher/migrator.rb

@@ -64,8 +64,6 @@ module ActiveCypher
     def existing_versions
       @connection.execute_cypher('MATCH (m:SchemaMigration) RETURN m.version AS version')
                  .map { |r| r[:version].to_s }
-    rescue StandardError
-      []
     end
 
     def ensure_schema_migration_constraint

data/lib/active_cypher/model/connection_owner.rb

@@ -23,7 +23,8 @@ module ActiveCypher
 
         # Returns the adapter class being used by this model
         def adapter_class
-          connection&.class
+          conn = connection
+          conn&.class
         end
 
         # Always dynamically fetch the connection for the current db_key

data/lib/active_cypher/relationship.rb

@@ -73,11 +73,7 @@ module ActiveCypher
 
       return @connection if defined?(@connection) && @connection
 
-      begin
-        from_class.constantize.connection
-      rescue StandardError
-        nil
-      end
+      from_class.constantize.connection
     end
 
     # --------------------------------------------------------------
@@ -301,9 +297,14 @@ module ActiveCypher
           _run(:update) { update_relationship }
         end
       end
-    rescue StandardError => e
-      log_error "Failed to save #{self.class}: #{e.class} – #{e.message}"
-      false
+    rescue ActiveCypher::RecordNotSaved, RuntimeError => e
+      # Only catch specific validation errors, let other errors propagate
+      if e.message.include?('must be persisted') || e.message.include?('creation returned no id')
+        log_error "Failed to save #{self.class}: #{e.message}"
+        false
+      else
+        raise
+      end
     end
 
     # Bang version of save - raises exception if save fails
@@ -396,9 +397,6 @@ module ActiveCypher
       @new_record = false
       changes_applied
       true
-    rescue StandardError => e
-      log_error "Failed to save #{self.class}: #{e.class} – #{e.message}"
-      false
     end
 
     def update_relationship

data/lib/active_cypher/version.rb

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

data/lib/cyrel/ast/clause_adapter.rb

@@ -9,20 +9,14 @@ module Cyrel
 
       def initialize(ast_node)
         @ast_node = ast_node
-        @ast_node_hash = ast_node.hash
         super()
       end
 
       def render(query)
-        # Use a simple cache key based on AST node structure
-        cache_key = [@ast_node_hash, @ast_node.class.name].join(':')
-
-        SimpleCache.instance.fetch(cache_key) do
-          # Create a compiler that delegates parameter registration to the query
-          compiler = QueryIntegratedCompiler.new(query)
-          compiler.compile(ast_node)
-          compiler.output.string
-        end
+        # Create a compiler that delegates parameter registration to the query
+        compiler = QueryIntegratedCompiler.new(query)
+        compiler.compile(ast_node)
+        compiler.output.string
       end
 
       # Ruby 3.0+ pattern matching support

data/lib/cyrel/ast/compiler.rb

@@ -11,13 +11,8 @@ module Cyrel
 
       def initialize
         @output = StringIO.new
-        if defined?(Concurrent)
-          @parameters = Concurrent::Hash.new
-          @param_counter = Concurrent::AtomicFixnum.new(0)
-        else
-          @parameters = {}
-          @param_counter = 0
-        end
+        @parameters = {}
+        @param_counter = 0
         @first_clause = true
         @loop_variables = Set.new # Track loop variables that shouldn't be parameterized
       end
@@ -573,17 +568,9 @@ module Cyrel
         existing_key = @parameters.key(value)
         return existing_key if existing_key
 
-        if defined?(Concurrent) && @parameters.is_a?(Concurrent::Hash)
-          # Thread-safe parameter registration
-
-          counter = @param_counter.increment
-          key = :"p#{counter}"
-        else
-          # Non-concurrent version
-
-          @param_counter += 1
-          key = :"p#{@param_counter}"
-        end
+        # Parameter registration
+        @param_counter += 1
+        key = :"p#{@param_counter}"
         @parameters[key] = value
         key
       end

data/lib/cyrel/logging.rb

@@ -15,8 +15,6 @@ module Cyrel
 
       def resolve_log_level(log_level_str)
         Logger.const_get(log_level_str.upcase)
-      rescue StandardError
-        Logger::UNKNOWN
       end
 
       def logger

data/lib/cyrel/query.rb

@@ -15,6 +15,7 @@ module Cyrel
   class Query
     include Parameterizable
     include Logging
+
     attr_reader :parameters, :clauses # Expose clauses for merge logic
 
     def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -154,7 +154,6 @@ files:
 - lib/active_cypher/model/core.rb
 - lib/active_cypher/model/countable.rb
 - lib/active_cypher/model/destruction.rb
-- lib/active_cypher/model/inspectable.rb
 - lib/active_cypher/model/labelling.rb
 - lib/active_cypher/model/persistence.rb
 - lib/active_cypher/model/querying.rb
@@ -192,7 +191,6 @@ files:
 - lib/cyrel/ast/remove_node.rb
 - lib/cyrel/ast/return_node.rb
 - lib/cyrel/ast/set_node.rb
-- lib/cyrel/ast/simple_cache.rb
 - lib/cyrel/ast/skip_node.rb
 - lib/cyrel/ast/union_node.rb
 - lib/cyrel/ast/unwind_node.rb
@@ -265,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: OpenCypher Adapter ala ActiveRecord
 test_files: []

data/lib/active_cypher/model/inspectable.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveCypher
-  module Model
-    # @!parse
-    #   # Adds a custom inspect method for pretty-printing a compact, single-line summary of the object.
-    #   # Because nothing says "debuggable" like a string that pretends your object is more interesting than it is.
-    module Inspectable
-      # Custom object inspection method for pretty-printing a compact,
-      # single-line summary of the object. Output examples:
-      #
-      #   #<UserNode id="26" name="Alice" age=34>   => persisted object
-      #   #<UserNode (new) name="Bob">              => object not yet saved
-      #
-      def inspect
-        # Put 'internal_id' first like it's the main character (even if it's nil)
-        ordered = attributes.dup
-        ordered = ordered.slice('internal_id').merge(ordered.except('internal_id'))
-
-        # Turn each attr into "key: value" because we humans fear raw hashes
-        parts = ordered.map { |k, v| "#{k}: #{v.inspect}" }
-
-        # Wrap it all up in a fake-sane object string, so you can pretend your data is organized.
-        "#<#{self.class} #{parts.join(', ')}>"
-      end
-    end
-  end
-end

data/lib/cyrel/ast/simple_cache.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
-module Cyrel
-  module AST
-    # Simple thread-safe compilation cache
-    # Because compiling the same query twice is like watching reruns
-    class SimpleCache
-      include Singleton
-
-      def initialize
-        @cache = {}
-        @mutex = Mutex.new
-        @max_size = 1000
-      end
-
-      def fetch(key)
-        @mutex.synchronize do
-          if @cache.key?(key)
-            @cache[key]
-          elsif block_given?
-            value = yield
-            store(key, value)
-            value
-          end
-        end
-      end
-
-      def clear!
-        @mutex.synchronize { @cache.clear }
-      end
-
-      def size
-        @mutex.synchronize { @cache.size }
-      end
-
-      private
-
-      def store(key, value)
-        # Simple LRU: remove oldest entries when cache is full
-        if @cache.size >= @max_size
-          # Remove half of the oldest entries
-          (@max_size / 2).times { @cache.shift }
-        end
-        @cache[key] = value
-      end
-    end
-  end
-end