activecypher 0.7.3 → 0.8.0

data/lib/cyrel.rb

@@ -3,6 +3,18 @@
 module Cyrel
   module_function
 
+  # Cyrel DSL helper: creates a new query.
+  # Example: Cyrel.query.match(pattern)
+  def query
+    Query.new
+  end
+
+  # Cyrel DSL helper: alias for node creation.
+  # Example: Cyrel.n(:person, :Person, name: 'Alice')
+  def n(alias_name = nil, *labels, **properties)
+    Pattern::Node.new(alias_name, labels: labels, properties: properties)
+  end
+
   # Cyrel DSL helper: creates a CALL clause for a procedure.
   # Example: Cyrel.call('db.labels')
   def call(procedure)
@@ -16,11 +28,123 @@ module Cyrel
   end
 
   # Cyrel DSL helper: creates a node pattern.
-  # Example: Cyrel.node(:n, labels: ['Person'], properties: {name: 'Alice'})
-  def node(alias_name, labels: [], properties: {})
+  # Example: Cyrel.node(:n, :Person, name: 'Alice')
+  def node(alias_name = nil, *labels, **properties)
     Pattern::Node.new(alias_name, labels: labels, properties: properties)
   end
 
+  # Cyrel DSL helper: creates a relationship pattern.
+  # Example: Cyrel.rel(:r, :KNOWS, since: 2020)
+  def rel(alias_name = nil, *types, **properties)
+    length = properties.delete(:length)
+    Pattern::Relationship.new(alias_name: alias_name, types: types, properties: properties, length: length)
+  end
+
+  # Cyrel DSL helper: creates a path pattern with a DSL block.
+  # Example: Cyrel.path { node(:a) > rel(:r) > node(:b) }
+  def path(&)
+    builder = PathBuilder.new
+    builder.instance_eval(&)
+    Pattern::Path.new(builder.elements)
+  end
+
+  # Path builder DSL for constructing path patterns
+  class PathBuilder
+    attr_reader :elements
+
+    def initialize
+      @elements = []
+      @pending_direction = nil
+    end
+
+    def node(alias_name = nil, *labels, **properties)
+      # If there's a pending direction, we need to add a relationship first
+      if @pending_direction && @elements.any? && @elements.last.is_a?(Cyrel::Pattern::Node)
+        @elements << Cyrel::Pattern::Relationship.new(types: [], direction: @pending_direction)
+        @pending_direction = nil
+      end
+
+      n = Cyrel::Pattern::Node.new(alias_name, labels: labels, properties: properties)
+      @elements << n
+      self
+    end
+
+    def rel(alias_name = nil, *types, **properties)
+      length = properties.delete(:length)
+
+      # Check if we need to replace the last element (an anonymous relationship)
+      if @elements.last.is_a?(Cyrel::Pattern::Relationship) && @elements.last.types.empty?
+        # Replace the anonymous relationship with specified one, keeping direction
+        direction = @elements.last.direction
+        @elements.pop
+      else
+        direction = @pending_direction || :both
+      end
+
+      r = Cyrel::Pattern::Relationship.new(alias_name: alias_name, types: types, properties: properties, length: length, direction: direction)
+      @elements << r
+      @pending_direction = nil
+      self
+    end
+
+    def >(_other)
+      # When called like: node(:a) > rel(:r) > node(:b)
+      # The rel(:r) is evaluated first, then > is called
+      # So we need to modify the last relationship that was just added
+      if @elements.last.is_a?(Cyrel::Pattern::Relationship)
+        # Replace the last relationship with one that has the correct direction
+        last_rel = @elements.pop
+        new_rel = Cyrel::Pattern::Relationship.new(
+          alias_name: last_rel.alias_name,
+          types: last_rel.types,
+          properties: last_rel.properties,
+          length: last_rel.length,
+          direction: :outgoing
+        )
+        @elements << new_rel
+      else
+        @pending_direction = :outgoing
+      end
+      self
+    end
+
+    def <(_other)
+      # Same logic as > but for incoming direction
+      if @elements.last.is_a?(Cyrel::Pattern::Relationship)
+        last_rel = @elements.pop
+        new_rel = Cyrel::Pattern::Relationship.new(
+          alias_name: last_rel.alias_name,
+          types: last_rel.types,
+          properties: last_rel.properties,
+          length: last_rel.length,
+          direction: :incoming
+        )
+        @elements << new_rel
+      else
+        @pending_direction = :incoming
+      end
+      self
+    end
+
+    def -(_other)
+      # Same logic as > but for bidirectional
+      if @elements.last.is_a?(Cyrel::Pattern::Relationship)
+        last_rel = @elements.pop
+        new_rel = Cyrel::Pattern::Relationship.new(
+          alias_name: last_rel.alias_name,
+          types: last_rel.types,
+          properties: last_rel.properties,
+          length: last_rel.length,
+          direction: :both
+        )
+        @elements << new_rel
+      else
+        @pending_direction = :both
+      end
+      self
+    end
+  end
+
   # Cyrel DSL helper: starts a CREATE query.
   # Example: Cyrel.create(pattern)
   def create(pattern)
@@ -44,6 +168,12 @@ module Cyrel
   # Example: Cyrel.node_id(:n)
   def node_id(...) = Functions.node_id(...)
 
+  # Cyrel DSL helper: creates a function call expression.
+  # Example: Cyrel.function(:count, :*)
+  def function(name, *args)
+    Expression::FunctionCall.new(name, args)
+  end
+
   # Cyrel DSL helper: Cypher count() aggregation.
   # Example: Cyrel.count(:n)
   def count(...) = Functions.count(...)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -171,6 +171,33 @@ files:
 - lib/active_cypher/version.rb
 - lib/activecypher.rb
 - lib/cyrel.rb
+- lib/cyrel/ast/call_node.rb
+- lib/cyrel/ast/clause_adapter.rb
+- lib/cyrel/ast/clause_node.rb
+- lib/cyrel/ast/compiler.rb
+- lib/cyrel/ast/create_node.rb
+- lib/cyrel/ast/delete_node.rb
+- lib/cyrel/ast/expression_node.rb
+- lib/cyrel/ast/foreach_node.rb
+- lib/cyrel/ast/limit_node.rb
+- lib/cyrel/ast/literal_node.rb
+- lib/cyrel/ast/load_csv_node.rb
+- lib/cyrel/ast/match_node.rb
+- lib/cyrel/ast/merge_node.rb
+- lib/cyrel/ast/node.rb
+- lib/cyrel/ast/optimized_nodes.rb
+- lib/cyrel/ast/order_by_node.rb
+- lib/cyrel/ast/pattern_node.rb
+- lib/cyrel/ast/query_integrated_compiler.rb
+- 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
+- lib/cyrel/ast/where_node.rb
+- lib/cyrel/ast/with_node.rb
 - lib/cyrel/call_procedure.rb
 - lib/cyrel/clause.rb
 - lib/cyrel/clause/call.rb
@@ -185,6 +212,7 @@ files:
 - lib/cyrel/clause/return.rb
 - lib/cyrel/clause/set.rb
 - lib/cyrel/clause/skip.rb
+- lib/cyrel/clause/unwind.rb
 - lib/cyrel/clause/where.rb
 - lib/cyrel/clause/with.rb
 - lib/cyrel/direction.rb