activecypher 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfba386d94660c96cf6078ac0a7d370d2dd5670e9316a3de2ee917f409f227ab
-  data.tar.gz: e2e70d29dc99279b51f810363d50749e470556481e80c8c8276fc80ba612b7d4
+  metadata.gz: cb2fe676154a99ad8fc54cfe88731a1c7ce4759235e5103e0d87662c4cd450c2
+  data.tar.gz: 8982b47d70418c6fcc2ec6e4e8a4bd9513df9ac94ab9c8d14b19f0b9af699c22
 SHA512:
-  metadata.gz: 1fbe83583d2cdb4a7ea898e8ce5876cfd6907af332ffd7b77643473026ac5fd0d3714bcf037876d2c8ebd8722594a9e5635ae0b3c816c4a98ed9f49dad99e523
-  data.tar.gz: bc13b5392ce91d0247bd4166310e8967676763b9d11f3156206f7a8e3b004f3158b5341dfbadfec82677fc887ef6aedfc8fe51081ea722d847cce60eb155f1d0
+  metadata.gz: 1d227c0f135e4203eee987c763b3d6bb2e61e4b24fbc3a5737166bbe1288d042d42d5cc2c83172f2df6d68f42480f76e8260a4571eee533cb53ce68c93f73228
+  data.tar.gz: 2d47c7787d443326b89d8f734107f4492a2cc34f7930ae0c46fbd9e7fda3d1249ea0840376d3653218872ece6434151a557db7b430167a690824981abe54f523

data/lib/active_cypher/associations/collection_proxy.rb

@@ -37,7 +37,10 @@ module ActiveCypher
         load_target unless @records
         @records.each(&)
       end
-      alias to_a each
+
+      def to_a
+        each.to_a
+      end
 
       # Returns the size, because counting things is the only certainty in life.
       #

data/lib/active_cypher/associations.rb

@@ -114,14 +114,20 @@ module ActiveCypher
 
           # Resolve the target node class
           target_class = target_class_name.constantize
-          a_alias = :start
-          b_alias = :target
 
-          # Pattern nodes (immutable)
-          a_node = Cyrel::Pattern::Node.new(a_alias, labels: self.class.label_name)
-          b_node = Cyrel::Pattern::Node.new(b_alias, labels: target_class.label_name)
+          owner_alias   = :start
+          related_alias = :target
+
+          # owner = the node we're querying from (self)
+          # related = the node we want to fetch
+          owner_node   = Cyrel::Pattern::Node.new(owner_alias,   labels: self.class.label_name)
+          related_node = Cyrel::Pattern::Node.new(related_alias, labels: target_class.label_name)
 
-          # Relationship pattern with correct direction
+          # The relationship token renders the arrow direction itself:
+          #   :out  → -[:TYPE]->   e.g. (start:Person)-[:ENJOYS]->(target:Activity)
+          #   :in   → <-[:TYPE]-   e.g. (start:Activity)<-[:ENJOYS]-(target:Person)
+          #   :both → -[:TYPE]-    e.g. (start)-[:TYPE]-(target)
+          # Node order is always [owner, rel, related] — never swapped.
           rel_direction = case direction
                           when :out  then Cyrel::Direction::OUT
                           when :in   then Cyrel::Direction::IN
@@ -133,17 +139,13 @@ module ActiveCypher
             direction: rel_direction
           )
 
-          # Build undirected / outgoing / incoming path
-          path = case direction
-                 when :in then Cyrel::Pattern::Path.new([b_node, rel_node, a_node])
-                 else Cyrel::Pattern::Path.new([a_node, rel_node, b_node])
-                 end
+          path = Cyrel::Pattern::Path.new([owner_node, rel_node, related_node])
 
           # Compose query  MATCH – WHERE – RETURN
           query = Cyrel::Query.new
                               .match(path)
-                              .where(Cyrel.node_id(a_alias).eq(internal_id))
-                              .return_(b_alias)
+                              .where(Cyrel.node_id(owner_alias).eq(internal_id))
+                              .return_(related_alias)
 
           base_relation = Relation.new(target_class, query)
 

data/lib/active_cypher/base.rb

@@ -13,7 +13,7 @@ module ActiveCypher
   class Base
     # @!attribute [rw] connects_to_mappings
     #   @return [Hash] Because every base class needs a mapping it will never use directly.
-    class_attribute :connects_to_mappings, default: {}
+    class_attribute :connects_to_mappings, default: { reading: :primary, writing: :primary }
 
     # Rails/ActiveModel foundations
     include Logging
@@ -30,6 +30,7 @@ module ActiveCypher
     include Model::Querying
     include Model::Abstract
     include Model::Attributes
+    include Model::ConnectionHandling
     include Model::ConnectionOwner
     include Model::Persistence
     include Model::Destruction
@@ -44,7 +45,7 @@ module ActiveCypher
         # Determine the current role (e.g., :writing, :reading)
         # ActiveCypher::RuntimeRegistry.current_role defaults to :writing
         # Only use db_key for pool lookup
-        mapping = connects_to_mappings if respond_to?(:connects_to_mappings)
+        mapping = connects_to_mappings
         role = ActiveCypher::RuntimeRegistry.current_role || :writing
         # Debug guardrails removed in release code; rely on role/shard registry.
 
@@ -81,6 +82,17 @@ module ActiveCypher
       # Wrap it all up in a fake-sane object string, so you can pretend your data is organized.
       "#<#{self.class} #{parts.join(', ')}>"
     end
+    
+    def internal_id
+      working_id = super
+      return working_id if working_id.nil?
+
+      if connection.respond_to?(:id_type_conversion)
+        connection.id_type_conversion(working_id)
+      else
+        working_id
+      end
+    end
 
     # Because Rails needs to feel included, too.
     ActiveSupport.run_load_hooks(:active_cypher, self)

data/lib/active_cypher/connection_adapters/memgraph_adapter.rb

@@ -63,6 +63,10 @@ module ActiveCypher
         self.class
       end
 
+      def id_type_conversion(incoming)
+        return incoming.to_i
+      end
+
       # Memgraph uses different constraint syntax than Neo4j
       def ensure_schema_migration_constraint
         execute_ddl(<<~CYPHER)

data/lib/active_cypher/model/connection_owner.rb

@@ -7,7 +7,6 @@ module ActiveCypher
     module ConnectionOwner
       extend ActiveSupport::Concern
       include ActiveCypher::Logging
-      include ActiveCypher::Model::ConnectionHandling
 
       def self.db_key_for(mapping, role)
         return nil unless mapping.is_a?(Hash)
@@ -66,7 +65,7 @@ module ActiveCypher
         # Always dynamically fetch the connection for the current db_key
         def connection
           handler = connection_handler
-          mapping = connects_to_mappings if respond_to?(:connects_to_mappings)
+          mapping = connects_to_mappings
           role = ActiveCypher::RuntimeRegistry.current_role || :writing
           db_key = ConnectionOwner.db_key_for(mapping, role)
           db_key = db_key.to_sym if db_key.respond_to?(:to_sym)

data/lib/active_cypher/model/core.rb

@@ -36,6 +36,16 @@ module ActiveCypher
           clear_changes_information
         end
       end
+      
+      def ==(other)
+        # Compares by class and internal graph id only.
+        # Note: an unsaved modification will still compare equal to the persisted version.
+        return false unless other.instance_of?(self.class)
+
+        internal_id == other.internal_id
+      end
+
+
     end
   end
 end

data/lib/active_cypher/railtie.rb

@@ -44,8 +44,8 @@ module ActiveCypher
       # Find all abstract node base classes with connects_to mappings
       ObjectSpace.each_object(Class) do |klass|
         next unless klass < ActiveCypher::Base
-        next unless klass.respond_to?(:abstract_class?) && klass.abstract_class?
-        next unless klass.respond_to?(:connects_to_mappings) && klass.connects_to_mappings.present?
+        next unless klass.abstract_class?
+        next if klass.connects_to_mappings.empty?
 
         # Register pools for each role in connects_to mapping
         klass.connects_to_mappings.each_value do |conn_name|

data/lib/active_cypher/relation.rb

@@ -164,8 +164,8 @@ module ActiveCypher
         # 1. Pull out the node payload and the elementId string
         # ------------------------------------------------------------
         if row.is_a?(Hash)
-          node_payload = row[:n] || row['n'] || row
-          element_id   = row[:internal_id] || row['internal_id']
+          node_payload = row[:n] || row['n'] || row[:target] || row['target'] || row
+          element_id   = row[:internal_id] || row['internal_id'] || node_payload&.dig(1, 0)
         else # Array row: [node, id]
           node_payload, element_id = row
         end
@@ -176,6 +176,7 @@ module ActiveCypher
         # ------------------------------------------------------------
         if node_payload.is_a?(Array) && node_payload.first == 78
           # Re‑use the adapter's private helper for consistency
+          # why is it private? This seems to be the only place it's called 
           node_payload = model_class.connection
                                     .send(:process_node, node_payload)
         end

data/lib/active_cypher/relationship.rb

@@ -29,9 +29,6 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 module ActiveCypher
   class Relationship
-    # Define connects_to_mappings as a class attribute to match ActiveCypher::Base
-    class_attribute :connects_to_mappings, default: {}
-
     # --------------------------------------------------------------
     # Mix‑ins
     # --------------------------------------------------------------
@@ -44,7 +41,6 @@ module ActiveCypher
     include Model::ConnectionOwner
     include Logging
     include Model::Abstract
-    include Model::ConnectionHandling
     include Model::Callbacks
     include Model::Countable
 
@@ -203,22 +199,24 @@ module ActiveCypher
 
         rel_type = relationship_type
 
+        id_func = connection.class::ID_FUNCTION
+
         # Build WHERE conditions for the attributes
         conditions = []
         params = {}
 
-        attributes.each_with_index do |(key, value), index|
-          param_name = :"p#{index + 1}"
-          conditions << "r.#{key} = $#{param_name}"
-          params[param_name] = value
+        if attributes.key?(:internal_id)
+          where_clause = "#{id_func}(r) = $p1"
+          params['p1'] = attributes[:internal_id]
+        else
+          attributes.each_with_index do |(key, value), index|
+            param_name = :"p#{index + 1}"
+            conditions << "r.#{key} = $#{param_name}"
+            params[param_name] = value
+          end
+          where_clause = conditions.join(' AND ')
         end
 
-        where_clause = conditions.join(' AND ')
-
-        # Determine ID function based on adapter type
-        adapter_class = connection.class
-        id_func = adapter_class.const_defined?(:ID_FUNCTION) ? adapter_class::ID_FUNCTION : 'id'
-
         cypher = <<~CYPHER
           MATCH ()-[r:#{rel_type}]-()
           WHERE #{where_clause}
@@ -234,6 +232,12 @@ module ActiveCypher
         # Extract relationship data and instantiate
         rel_data = row[:r] || row['r']
         rid = row[:rid] || row['rid']
+        from_node_id = (row[:from_node] || row['from_node'])&.dig(1, 0)
+        to_node_id   = (row[:to_node]   || row['to_node'])&.dig(1, 0)
+        
+        # this is extra queries, but easier than navigating instantiation from the row data
+        from_node = Object.const_get(self.from_class).find(from_node_id)
+        to_node = Object.const_get(self.to_class).find(to_node_id)
 
         # Extract properties from the relationship data
         # Memgraph returns relationships wrapped as [type_code, [actual_data]]
@@ -256,7 +260,7 @@ module ActiveCypher
         attrs = attrs.transform_keys(&:to_sym)
         attrs[:internal_id] = rid if rid
 
-        instantiate(attrs)
+        instantiate(attrs, from_node: from_node, to_node: to_node)
       end
 
       # Find the first relationship or raise an exception

data/lib/active_cypher/version.rb

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

data/lib/tasks/graphdb_migrate.rake

@@ -8,11 +8,13 @@ namespace :graphdb do
     puts 'GraphDB migrations complete'
   end
 
-  # bin/rails graphdb:status
-  desc 'Show graph database migration status'
-  task status: :environment do
-    ActiveCypher::Migrator.new.status.each do |m|
-      puts format('%-4<status>s %<version>s %<name>s', m)
+  namespace :migrate do
+    # bin/rails graphdb:migrate:status
+    desc 'Show graph database migration status'
+    task status: :environment do
+      ActiveCypher::Migrator.new.status.each do |m|
+        puts format('%-4<status>s %<version>s %<name>s', m)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: OpenCypher Adapter ala ActiveRecord
 test_files: []