arcadedb 0.3.3 → 0.5.0

data/lib/model/vertex.rb

@@ -13,45 +13,46 @@ module Arcade
     end
     ## ----------------------------------------- Class Methods------------------------------------ ##
     #                                                                                               #
+
 =begin
-    Vertex.delete fires a "delete vertex" command to the database.
+   Creates a Vertex-Instance.
+   Similar to `Vertex#insert`.
 
-    To remove all records  use  »all: true« as argument
+   Difference is the presence of a `created` property, a timestamp set to the time and date of creation.
+=end
+
+    def self.create timestamp: true, **args
+      #t= timestamp ?  ", created = Date(#{DateTime.now.to_i}) "  : ""
+      t= timestamp ?  ", created = sysdate() "  : ""
+     # db.transmit { "create VERTEX #{database_name} set #{args.map{|x,y| [x,y.to_or].join("=")}.join(', ')+t}" } &.first.allocate_model(false)
+     Api.create_document  db.database, database_name, session_id: db.session,  **args
+    end
 
-    To remove a specific rid, use  rid: "#nn:mmm" as argument
 
-    "where" parameter is optional
+=begin
+    Vertex.delete fires a "delete vertex" command to the database.
+    To remove all records  use  »all: true« as argument
+    To remove a specific rid, use  rid: "#nn:mmm" as argument
 
-     ExtraNode.delete where: { item: 67  }  == ExtraNode.delete item: 67
+    The "where" parameter is optional
 
+    Example:
+    ExtraNode.delete where: { item: 67   }  == ExtraNode.delete item: 67
 =end
     def self.delete where: {} , **args
       if args[:all] == true
         where = {}
       elsif args[:rid].present?
-        return db.execute { "delete vertex #{args[:rid]}" }.first["count"]
+        return db.transmit { "delete from #{args[:rid]}"  }.first["count"]
       else
         where.merge!(args) if where.is_a?(Hash)
         return 0 if where.empty?
       end
       # query returns [{count => n }]
-      db.execute { "delete vertex #{database_name} #{compose_where(where)}"  } &.first[:count] rescue 0
+      #  puts "delete from  #{database_name} #{compose_where(where)}"
+      db.transmit { "delete  from `#{database_name}` #{compose_where(where)}"   } &.first[:count] rescue 0
     end
 
-=begin
-   Creates a Vertex-Instance.
-   Similar to `Vertex#insert`.
-
-   Difference is the presence of a `created` property, a timestamp set to the time and date of creation.
-=end
-
-    def self.create timestamp: true, **args
-      #t= timestamp ?  ", created = Date(#{DateTime.now.to_i}) "  : ""
-      t= timestamp ?  ", created = sysdate() "  : ""
-      db.execute { "create VERTEX #{database_name} set #{args.map{|x,y| [x,y.to_or].join("=")}.join(', ')+t}" } &.first.allocate_model(false)
-    end
-
-
 ## get adjacent nodes based on a query on the actual model
 
 
@@ -59,34 +60,53 @@ module Arcade
 
       s =  Query.new from: self
       s.nodes in_or_out, via: via, **args
-      s.query.select_result
+      s.query &.select_result
     end
 
 
     #                                                                                               #
     ## ---------------------------------   Instance    Methods   --------------------------------- ##
     #
-    #  We need expand as fallback if a vertex, which is stored as link is automatically loaded
+    #  We need expand as fallback if a vertex, which is stored as link, is automatically loaded
     #
       def expand
         self
       end
-    # Supports where:  -->  Strategie.first nodes  where: {size: 10}
-    # "select  both()[ size = 10  ]  from #113:8 "
+    #  ---------------------------------   Nodes   ----------------------------------------------- #
+      #  fetches adjacet nodes
+      #  supported
+      #  nodes  in_or_out =  :in, :out, :both, :inE, :outE
+      #         depth     =  fetch the n'th node through travese
+      #         via:      =  Arcade Database Type (the ruby class)
+      #         where:    =  a condition
+      #                      inE, outE  -->  matches attributes on the edge
+      #                      in, out, both -> matches attributes on the adjacent vertex
+      #  Example  Strategie.first nodes  where: {size: 10}
+      #  "select  both()[ size = 10  ]  from #113:8 "
+      #
     def nodes in_or_out=:both, depth= 1, via: nil , execute: true, **args
-      s =  Query.new from: rid
-      s.nodes in_or_out, via: via, **args
-      if execute
-         s.query.select_result
-       else
-         s  #  just return the query
-       end
+      if depth <= 1
+        s= query.nodes in_or_out, via: via, **args
+        execute ? s.query &.select_result : s
+      else
+       travese in_or_out, depth: depth, start_at: depth-1, via: via, execute: execute, where: args[:where]
+      end
     end
 
     # Supports where: { where condition for edges }
-    def edges in_or_out = :both, depth= 1, via: nil , execute: true, **args
-      in_or_out = in_or_out.to_s + "E"
-      nodes in_or_out, depth, via: via , execute: execute, **args
+    def edges in_or_out = :both, depth= 1, via: nil , execute: true
+
+      v = in_or_out.to_s.delete_suffix 'E'
+      e = v + 'E'
+      edge_name = via.nil? ? "" : resolve_edge_name( via )
+      argument =  "#{e}(#{edge_name})"
+      q= if depth > 1
+            repeated_argument = Array.new(depth -1 , "#{v}(#{edge_name})").join(".")
+            query.projection repeated_argument + "." + argument
+         else
+            query.projection  argument
+         end
+      execute ?  q.execute &.allocate_model : q
     end
 
 
@@ -120,17 +140,17 @@ module Arcade
 
     # get via-type-edges  through in
     def inE count=1, via:nil
-      nodes :inE,  count, via: via
+      edges :in,  count, via: via
     end
     #
     # get via-type-edges  through  out
     def outE count=1, via:nil
-      nodes :outE, count,  via: via
+      edges :out, count,  via: via
     end
 
     # get  all via-type-edges
     def bothE  count=1, via:nil
-      nodes :bothE, count, via: via
+      edges :both, count, via: via
     end
 
 
@@ -158,34 +178,33 @@ module Arcade
 			the_query.where where if where.present?
 			the_query.while "$depth < #{depth} " unless depth <=0
 			outer_query = Query.new from: the_query, where: "$depth >= #{start_at}"
-			if execute
-        outer_query.execute.allocate_model
-				else
-		#			the_query.from self  #  complete the query by assigning self
-					the_query            #  returns the Query  -traverse object
-				end
+			execute ?  outer_query.execute.allocate_model :  the_query # return only the traverse part
 		end
 
 =begin
 Assigns another Vertex via an EdgeClass. If specified, puts attributes on the edge.
 
+`Vertex.assign via: Edge to: Vertex`
+
 Returns the reloaded assigned vertex
 
 Wrapper for
-  Edge.create in: self, out: a_vertex,  some: attributes.  on: the,  edge: type }
+  Edge.create from: self, to: a_vertex,  some: attributes.  on: the,  edge: type }
 
 returns the assigned vertex, thus enabling to chain vertices through
 
-    Vertex.assign() via: E , vertex: VertexClass.create()).assign( via: E, ... )
+    Vertex.assign() via: E , to: VertexClass.create()).assign( via: E, ... )
 or
 	  (1..100).each{|n| vertex = vertex.assign(via: E2, vertex: V2.create(item: n))}
 =end
 
-  def assign vertex: , via:   , **attributes
+  def assign vertex: nil , via: Arcade::Edge   , **attributes
+    vertex = attributes[:to] if attributes.has_key? :to
+    raise "vertex not provided" if vertex.nil?
 
     via.create from: self, to: vertex,  **attributes
 
-    db.get vertex.rid  # return the assigned vertex
+    db.get vertex.rid unless vertex.is_a? Array # return the assigned vertex
   rescue IndexError => e
     db.logger.error "Edge not created, already present."
     vertex  #  return the vertex (for chaining)
@@ -205,12 +224,12 @@ Format: < Classname: Edges, Attributes >
 =end
 	def to_human
 
-    in_and_out = -> { "{#{self.in.count}->}{->#{self.out.count }}, " }
+    in_and_out =  "{#{inE.count}->}{->#{outE.count }}, "
 
 		#Default presentation of Arcade::Base::Model-Objects
 
-		"<#{self.class.to_s.snake_case}[#{rid}]: "  +
-      in_and_out[] +
+		"<#{self.class.to_s.snake_case}[#{rid}]:"  +
+      in_and_out +
       invariant_attributes.map do |attr, value|
 			v= case value
 				 when  Class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcadedb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Hartmut Bischoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides access to ArcadeDB from ruby
 email: topofocus@gmail.com
 executables: []
@@ -130,17 +144,27 @@ files:
 - examples/relation_1__1.rb
 - examples/relation_1__n.rb
 - examples/relation_n_n.rb
+- iruby/.ipynb_checkpoints/01-start-and-end-of-datarows-checkpoint.ipynb
+- iruby/01-start-and-end-of-datarows.ipynb
+- iruby/db-console.rb
 - lib/arcade.rb
 - lib/arcade/api/operations.rb
-- lib/arcade/api/version.rb
+- lib/arcade/api/primitives.rb
 - lib/arcade/base.rb
+- lib/arcade/config.rb
 - lib/arcade/database.rb
 - lib/arcade/errors.rb
+- lib/arcade/init.rb
 - lib/arcade/logging.rb
+- lib/arcade/match.rb
+- lib/arcade/query.rb
+- lib/arcade/support/class.rb
+- lib/arcade/support/conversions.rb
+- lib/arcade/support/model.rb
+- lib/arcade/support/object.rb
+- lib/arcade/support/sql.rb
+- lib/arcade/support/string.rb
 - lib/arcade/version.rb
-- lib/config.rb
-- lib/init.rb
-- lib/match.rb
 - lib/model/basicdocument.rb
 - lib/model/basicedge.rb
 - lib/model/basicvertex.rb
@@ -148,13 +172,6 @@ files:
 - lib/model/edge.rb
 - lib/model/vertex.rb
 - lib/models.rb
-- lib/query.rb
-- lib/support/class.rb
-- lib/support/conversions.rb
-- lib/support/model.rb
-- lib/support/object.rb
-- lib/support/sql.rb
-- lib/support/string.rb
 - rails.md
 - rails/arcade.rb
 - rails/config.yml

data/lib/arcade/api/version.rb

@@ -1,5 +0,0 @@
-module Arcade
-  module Api
-    VERSION = 0.1
-  end
-end

data/lib/match.rb

@@ -1,216 +0,0 @@
-#require 'active_support/inflector'
-
-module Arcade
-	######################## MatchConnection ###############################
-
-	MatchAttributes = Struct.new(:edge, :direction, :as, :count, :where, :while, :max_depth , :depth_alias, :path_alias, :optional )
-
-	# where and while can be composed incremental
-	# direction, as, connect and edge cannot be changed after initialisation
-  class MatchConnection
-    include Support::Sql
-
-    def initialize edge= nil, direction: :both, as: nil, count: 1, **args
-
-      the_edge = edge.is_a?( Class ) ?  edge.ref_name : edge.to_s   unless edge.nil? || edge == E
-			@q =  MatchAttributes.new  the_edge ,  # class
-								direction, #		  may be :both, :in, :out
-								as,				 #      a string
-								count,     #      a number 
-								args[:where],
-								args[:while],
-								args[:max_depth],
-								args[:depth_alias],      # not implemented
-								args[:path_alias],       # not implemented
-								args[:optional]          # not implemented
-    end
-
-    def direction= dir
-      @q[:direction] =  dir
-    end
-
-
-		def direction
-			fillup =  @q[:edge].present? ? @q[:edge] : ''
-			case @q[:direction]
-			when :both
-				".both(#{fillup})"
-			when :in
-				".in(#{fillup})"
-			when :out
-				".out(#{fillup})"
-      when :both_vertex, :bothV
-				".bothV()"
-			when :out_vertex, :outV
-				".outV()"
-			when :in_vertex, :inV
-				".inV()"
-     when :both_edge, :bothE
-			 ".bothE(#{fillup})"
-			when :out_edge, :outE
-				".outE(#{fillup})"
-			when :in_edge, :outE
-				".inE(#{fillup})"
-			end
-
-		end
-
-		def count c=nil
-			if c
-				@q[:count] = c
-			else
-				@q[:count]
-			end
-		end
-
-		def max_depth d=nil
-			if d.nil?
-				@q[:max_depth].present? ? "maxDepth: #{@q[:max_depth] }" : nil
-			else
-				@q[:max_depth] = d
-			end
-		end
-		def edge
-			@q[:edge]
-		end
-
-		def compose
-				where_statement =( where.nil? || where.size <5 ) ? nil : "where: ( #{ generate_sql_list( @q[:where] ) })"
-				while_statement =( while_s.nil? || while_s.size <5) ? nil : "while: ( #{ generate_sql_list( @q[:while] )})"
-
-				ministatement = "{"+ [ as, where_statement, while_statement, max_depth].compact.join(', ') + "}"
-				ministatement = "" if ministatement=="{}"
-
-     (1 .. count).map{|x| direction }.join("") + ministatement
-
-    end
-		alias :to_s :compose
-
-  end  # class
-
-
-	######################## MatchStatement ################################
-
-	MatchSAttributes = Struct.new(:match_class, :as, :where )
-  class MatchStatement
-    include Support
-    def initialize match_class, as: 0,  **args
-			reduce_class = ->(c){ c.is_a?(Class) ? c.ref_name : c.to_s }
-
-			@q =  MatchSAttributes.new( reduce_class[match_class],  # class
-								as.respond_to?(:zero?) && as.zero? ?  reduce_class[match_class].pluralize : as	,
-								args[ :where ])
-
-			@query_stack = [ self ]
-		end
-
-		def match_alias
-			"as: #{@q[:as]}"
-		end
-
-
-
-		# used for the first compose-statement of a compose-query
-		def compose_simple
-				where_statement = where.is_a?(String) && where.size <3 ?  nil :  "where: ( #{ generate_sql_list( @q[:where] ) })"
-			'{'+ [ "class: #{@q[:match_class]}",  as , where_statement].compact.join(', ') + '}'
-		end
-
-
-		def << connection
-			@query_stack << connection
-			self  # return MatchStatement
-		end
-		#
-		def compile &b
-     "match " + @query_stack.map( &:to_s ).join + return_statement( &b )
-		end
-
-
-		# executes the standard-case.
-		# returns
-		#  * as: :hash   : an array of  hashes
-		#  * as: :array  : an array of hash-values
-		#  * as  :flatten: a simple array of hash-values
-		#
-		# The optional block is used to customize the output.
-		# All previously defiend »as«-Statements are provided though the control variable.
-		#
-		# Background
-		# A match query   "Match {class aaa, as: 'aa'} return aa "
-		#
-		# returns [ aa: { result of the query, a Vertex or a value-item  }, aa: {}...}, ...] ]
-		# (The standard case)
-		#
-		# A match query   "Match {class aaa, as: 'aa'} return aa.name "
-		# returns [ aa.name: { name  }, aa.name: { name }., ...] ]
-		#
-		# Now, execute( as: :flatten){ "aa.name" }  returns
-		#  [name1, name2 ,. ...]
-		#
-		#
-		# Return statements  (examples from https://orientdb.org/docs/3.0.x/sql/SQL-Match.html)
-		#  "person.name as name, friendship.since as since, friend.name as friend"
-		#
-		#  " person.name + \" is a friend of \" + friend.name as friends"
-		#
-		#  "$matches"
-		#  "$elements"
-		#  "$paths"
-		#  "$pathElements"
-		#
-		#
-		def execute as: :hash, &b
-			r = V.db.execute{ compile &b }
-			case as
-			when :hash
-				r
-			when :array
-			 r.map{|y| y.values}
-			when :flatten
-			 r.map{|y| y.values}.orient_flatten
-			else
-				raise ArgumentError, "Specify parameter «as:» with :hash, :array, :flatten"
-		 end
-		end
-#		def compose
-#
-#			'{'+ [ "class: #{@q[:match_class]}",
-#					"as: #{@as}" , where, while_s,
-#						@maxdepth >0 ? "maxdepth: #{maxdepth}": nil  ].compact.join(', ')+'}'
-#		end
-
-		alias :to_s :compose_simple
-
-
-##  return_statement
-		#
-		# summarizes defined as-statements ready to be included as last parameter
-		# in the match-statement-stack
-		#
-		# They can be modified through a block.
-		#
-		# i.e
-		#
-		# t= TestQuery.match(  where: {a: 9, b: 's'}, as: nil ) << E.connect("<-", as: :test)
-		# t.return_statement{|y| "#{y.last}.name"}
-		#
-		# =>> " return  test.name"
-		#
-		#return_statement is always called through compile
-		#
-		# t.compile{|y| "#{y.last}.name"}
-
-    private
-		def return_statement
-			resolve_as = ->{ @query_stack.map{|s| s.as.split(':').last unless s.as.nil? }.compact }
-			" return " + statement = if block_given?
-										a= yield resolve_as[]
-										a.is_a?(Array) ? a.join(', ') :  a
-									else
-										resolve_as[].join(', ')
-									end
-		end
-	end  # class
-
-end # module