arcadedb 0.3.3 → 0.5.0

data/lib/arcade/errors.rb

@@ -22,6 +22,14 @@ module Arcade
   end
 
   class QueryError < RuntimeError
+    attr_reader :error, :args
+    def initialize  error: "", detail: "", exception: "", **args
+      @error = error
+#      @detail = detail
+      @args = args
+      @exception = exception
+      super detail
+    end
   end
 
   # used by Dry::Validation,  not covered by "error"

data/lib/arcade/match.rb

@@ -0,0 +1,162 @@
+module Arcade
+  class Match 
+
+    include Arcade::Support::Sql
+
+=begin
+  This is a very simple wrapper for the match statement
+
+  Initialize:  a= Arcade::Match.new type: Arcade::DatabaseType, where: { property: 'value' }, as: :alias
+  Complete:    b = a.out( Arcade::EdgeType ).node( while: true, as: item )[ .in.node ... ]
+  Inspect      b.to_s
+  Query DB     b.execute [.allocate_model]
+                         [.analyse_result]
+
+=end
+
+    def initialize type: , **args
+
+      @args = args
+      @as = []
+
+      @stack = [ "MATCH { type: #{type.database_name}, #{ assigned_parameters } }" ]
+
+      return self
+    end
+
+    # Inspect the generated match statement
+    def to_s &b
+      r = ""
+      r = "DISTINCT " if @distinct
+      r << @as.join(",")
+      r= yield(r) if block_given?
+      @stack.join("") + " RETURN #{r} "
+    end
+
+
+    # Execute the @stack
+    # generally followed by `select_result` to convert json-hashes  to arcade objects
+    #
+    # The optional block  modifies the result-statement
+    # i.e
+    # TG::TimeGraph.grid( 2023, 2..9  ).out(HasPosition)
+    #                                  .node( as: :contract  )
+    #                                  .execute { "contract.symbol"  }
+    #                                  .select_result
+    # gets all associated contracts connected to the month-grid
+    def execute &b
+      Arcade::Init.db.query( to_s( &b ) )
+    end
+
+
+    # todo : metaprogramming!
+    def out edge=""
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".out(#{edge.is_a?(Class) ? edge.database_name.to_or : ''})"
+      return self
+    end
+    def in edge=""
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".in(#{edge.is_a?(Class) ? edge.database_name.to_or : ''})"
+      return self
+    end
+    def both edge=""
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".both(#{edge.is_a?(Class) ? edge.database_name.to_or : ''})"
+      return self
+    end
+
+    # add conditions on  edges to the match statement
+    def inE edge="", **args
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".inE(#{edge.is_a?(Class) ? edge.database_name.to_or : ''}) #{assigned_parameters}.outV()"
+      return self
+    end
+    def outE edge="", **args
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".outE(#{edge.is_a?(Class) ? edge.database_name.to_or : ''}) #{assigned_parameters}.inV()"
+      return self
+    end
+    def bothE edge="", **args
+      raise "edge must be a Database-class"  unless edge.is_a?(Class) || edge.empty?
+      @stack << ".bothE(#{edge.is_a?(Class) ? edge.database_name : ''}) #{assigned_parameters}.bothV()"
+      return self
+    end
+
+
+    # general declation of a node (ie. vertex)
+    def node **args
+      @args = args
+      @stack << if args.empty?
+       "{}"
+              else
+       "{ #{ assigned_parameters } }"
+              end
+      return self
+    end
+
+
+
+    ### ---------------- end of public api ---------------------------------------------------------------- ### 
+    private
+
+
+    def assigned_parameters
+      @args.map do | k, v |
+      #  unless k == :while  #  mask ruby keyword
+        send k, v
+      #  else
+      #   the_while v
+      #  end
+      end.compact.join(', ')
+
+    end
+
+    ##  Metastatement     ----------  last  --------------------
+    ##
+    ## generates a node declaration  for fetching the last element of a traversal on the previous edge
+    ##
+    ## ie:    Arcade::Match.new( type: self.class, where: { symbol: symbol  } ).out( Arcade::HasContract  )
+    #                                                                          .node( as:  :c, where: where  )
+    #                                                                          .in( Arcade::IsOrder  )
+    #                                                                          .node( last: true, as: :o  )
+    #
+    #  --> ... }.in('is_order'){ while: (in('is_order').size() > 0), where: (in('is_order').size() == 0), as: o  }
+    def last  arg
+      in_or_out = @stack[-1][1..-1]   # use the last statement
+      "while: ( #{in_or_out}.size() > 0  ), where: (#{in_or_out}.size() == 0)"
+    end
+
+    def distinct arg
+      @distinct = true
+    end
+
+
+    def where arg
+      "where: ( #{ generate_sql_list( arg  )  } )" unless arg.empty?
+    end
+
+    def while arg
+      if arg.is_a? TrueClass
+         "while: ( true )"
+       else
+       "while: ( #{ generate_sql_list( arg  ) } )"
+       end
+    end
+
+    def maxdepth arg
+      "maxDepth: #{arg}"
+    end
+
+    def as arg
+      @as << arg
+      "as: " + arg.to_s
+    end
+
+    def type klassname
+      raise "type must be a Database-class"  unless klassname.is_a? Class
+      "type: #{klassname.database_name}"
+    end
+
+  end
+end

data/lib/{query.rb → arcade/query.rb}

@@ -104,18 +104,22 @@ module Arcade
 			elsif @q[:database].present?
 				the_argument =  @q[:database]
 				case @q[:database]
-									when Arcade::Base   # a single record
+									when Base   # a single record
 										the_argument.rid
 									when self.class	      # result of a query
 										' ( '+ the_argument.compose + ' ) '
 									when Class
 										the_argument.database_name
-									else
+                  when Arcade::Match
+                    '(' + the_argument.to_s + ')'
+                  when String
 										if the_argument.to_s.rid?	  # a string with "#ab:cd"
 											the_argument
-										else		  # a database-class-name
+                    else
+                      '(' + the_argument + ')'
+                    end
+                  else		  # a database-class-name
 											the_argument.to_s
-										end
 									end
 			else
 				raise "cannot complete until a target is specified"
@@ -311,27 +315,39 @@ end # class << self
 			self
     end
 
-		# connects by adding {in_or_out}('edgeClass')
-		def connect_with in_or_out, via: nil
-			 argument = " #{in_or_out}(#{via.to_or if via.present?})"
-		end
+#		# connects by adding {in_or_out}('edgeClass')
+#		def connect_with in_or_out, via: nil
+#			 argument = " #{in_or_out}(#{via.to_or if via.present?})"
+#		end
+
 		# adds a connection
-		#  in_or_out:  :out --->  outE('edgeClass').in[where-condition]
-		#              :in  --->  inE('edgeClass').out[where-condition]
+		#  in_or_out:  :out  --->  out('edgeClass')[where-condition]
+		#              :in   --->  in('edgeClass')[where-condition]
+    #              :inE  --->  inE('edgeClass')[where-condition].outV()
+    #              :outE --->  outE('edgeClass')[where-condition].inV()
+    #
+    #  via:        Edge-Class
+    #  where:      Condition to be applied on the targed vertex (in_or_out = :in, :out, :both)
+    #                                or on the intermitted edge (in_or_out =  :inE, :outE, :bothE)
+    #              Condition is inserted as "in_or_out[ condition ]"
+    #  Attention: ranges have to be included as array, ie [ 2..4 ]
+    #
 
 		def nodes in_or_out = :out, via: nil, where: nil, expand:  false
 
 			 condition = where.present? ?  "[ #{generate_sql_list(where)} ]" : ""
        via = resolve_edge_name(via) unless via.nil?
 
-       start =  if in_or_out.is_a? Symbol
-                  in_or_out.to_s
-                elsif in_or_out.is_a? String
-                  in_or_out
-								else
-									"both"
-								end
-			 argument = " #{start}(#{via})#{condition} "
+       argument = if in_or_out.to_s[-1] == 'E'
+                    case in_or_out.to_s[0..-2]
+                    when 'in'
+                      "inE(#{via})#{condition}.outV()"
+                    when 'out'
+                      "outE(#{via})#{condition}.inV()"
+                    end
+                  else
+                    "#{in_or_out.to_s}(#{via})#{condition}"
+                  end
 
 			 if expand.present?
 				 send :expand, argument
@@ -349,7 +365,7 @@ end # class << self
 		# returns nil if the query was not sucessfully executed
 		def execute(reduce: false, autoload: true )
 #      unless projection.nil?    || projection.empty?
-      result = db.execute { compose }
+      result = db.transmit { compose }
 			return nil unless result.is_a?(Array)
 			block_given?  ? result.map{|x| yield x }  : result
 #			return  result.first if reduce && result.size == 1
@@ -370,7 +386,7 @@ end # class << self
 		end
 :protected
 		def resolve_target
-			if @q[:database].is_a? Arcade::Query
+			if @q[:database].is_a? Query
 				@q[:database].resolve_target
 			else
 				@q[:database]

data/lib/{support → arcade/support}/conversions.rb

@@ -63,6 +63,7 @@ module Arcade
       #
 
       def select_result condition=nil
+        return [] if self.empty?
         condition = first.keys.first if condition.nil?
         map{|x| x[condition.to_sym]}.flatten.allocate_model
       end
@@ -195,7 +196,7 @@ module Arcade
                       when Symbol, String
                         k.to_s
                       else
-                        raise "not supported key: #[k} -- must a sting, symbol or number"
+                        raise "not supported key: #{k} -- must a sting, symbol or number"
                       end
           [orient_k, v.to_db]
         end.to_h

data/lib/{support → arcade/support}/model.rb

@@ -19,35 +19,42 @@ module Arcade
     #  used by array#allocate_model
       def _allocate_model response=nil, auto = Config.autoload
 
+
       if response.is_a? Hash
         # save rid to a safe place
         temp_rid = response.delete :"@rid"
+        type     = response.delete :"@type"
+        cat      = response.delete :"@cat"
 
-        return response if temp_rid.rid?.nil?
+        return response if type.nil?
+        temp_rid = "#0:0" if temp_rid.nil?
+        type = "d" if type.nil?
         # extract type infos  and convert to database-name
-        type           = response.delete :"@type"
-        cat            = response.delete :"@cat"
-        n, type_name = type.camelcase_and_namespace
-        n = self.namespace if n.nil?
+        namespace, type_name = type.camelcase_and_namespace
+        namespace = self.namespace if namespace.nil?
         # autoconvert rid's in attributes to model-records  (exclude edges!)
         if auto && !(cat.to_s =='e')
           response.transform_values! do  |x|
             case x
             when String
-              x.rid? ?  x.load_rid : x
+              x.rid? ?  x.load_rid : x                   # follow links
             when Array
+              a =[]
               x.map do| y |
-                if y.is_a?(Hash) && y.include?(:@type)   # if embedded documents are present, load them
-                  y.merge( rid: '#0:0' ).allocate_model(false)
-                elsif y.rid?                             # if links are present, load the object
-                  y.load_rid(false) # do not autoload further records, prevents from recursive locking
-                else
-                  y
-                end
+                # Thread.new do  ## thread or fiber decrease the performance significantly.
+                  if y.is_a?(Hash) && y.include?(:@type)   # if embedded documents are present, load them
+                    y.allocate_model(false)
+                  elsif y.rid?                             # if links are present, load the object
+                    y.load_rid(false) # do not autoload further records, prevents from recursive locking
+                  else
+                    y
+                  end
+               # end
               end
             when Hash
               if x.include?(:@type)
-                x.merge( rid: '#0:0' ).allocate_model(false)
+                #x.allocate_model(false)
+                _allocate_model(x,false)
               else
                 x.transform_values!{|z|  z.rid? ?  z.load_rid(false) : z }
               end
@@ -57,11 +64,11 @@ module Arcade
           end
         end
         # choose the appropriate class
-        klass=  Dry::Core::ClassBuilder.new(  name: type_name, parent:  nil, namespace:  n).call
+        klass=  Dry::Core::ClassBuilder.new(  name: type_name, parent: nil, namespace: namespace ).call
         #
       begin
         # create a new object of that  class with the appropriate attributes
-        new = klass.new  **response.merge( rid: temp_rid || "#0:0" )  # #0:0 --> embedded model records
+        new = klass.new  **response.merge( rid: temp_rid  )
       rescue ::ArgumentError => e
         raise  "Allocation of class #{klass.to_s} failed"
       end
@@ -71,10 +78,11 @@ module Arcade
      elsif response.is_a? Array
        puts "Allocate_model..detected array"
        ## recursive behavior, just in case
-       response.map{ | y | _allocate_model y }
+       response.map{ | y | _allocate_model y, auto }
      elsif response.rid?
        # Autoload rid's
        response.load_rid
+      # auto ? response.load_rid : response
      else
        response
       end

data/lib/arcade/version.rb

@@ -1,3 +1,3 @@
 module Arcade
-  VERSION = "0.3.3"
+  VERSION = "0.5.0"
 end

data/lib/arcade.rb

@@ -2,7 +2,7 @@ module Arcade
 
 end
 
-require "arcade/api/version"
+require "arcade/version"
 require "dry/configurable"
 require "dry/struct"
 require "dry/core/class_builder"
@@ -12,28 +12,25 @@ require 'json'
 module Types
   include Dry.Types()
 end
-#require 'pg'          #  ruby postgres driver
-#require 'mini_sql'
-#require 'sequel'
-#require 'httparty'
 require 'yaml'
 require 'securerandom'
-require 'typhoeus'    #  curl library
-require_relative '../lib/arcade/errors'
-require_relative '../lib/support/object'
-require_relative '../lib/support/string'
-require_relative '../lib/support/class'
-require_relative '../lib/support/sql'
-require_relative '../lib/support/model'
-require_relative '../lib/arcade/logging'
-require_relative '../lib/config'
-require_relative '../lib/support/conversions'
+require 'httpx'
+require 'arcade/errors'
+require_relative '../lib/arcade/support/object'
+require_relative '../lib/arcade/support/string'
+require_relative '../lib/arcade/support/class'
+require_relative '../lib/arcade/support/sql'
+require_relative '../lib/arcade/support/model'
+require_relative '../lib/arcade/support/conversions'
+require_relative '../lib/arcade/api/primitives'
 require_relative '../lib/arcade/api/operations'
 require_relative '../lib/arcade/base'
+require_relative '../lib/arcade/logging'
+require_relative '../lib/arcade/config'
 require_relative '../lib/arcade/database'
-require_relative '../lib/init'
+require_relative '../lib/arcade/match'
+require_relative '../lib/arcade/query'
+require_relative '../lib/arcade/init'
 require_relative "../lib/models"
-require_relative '../lib/query'
-require_relative '../lib/match'
 require_relative '../lib/railtie'  if defined? Rails::Railtie
 

data/lib/model/document.rb

@@ -6,5 +6,27 @@ module Arcade
    # def accepted_methods
    #
    # end
+   def self.create **attributes
+     Api.create_document  db.database, database_name, session_id: db.session,  **attributes
+   end
+
+=begin
+    Document.delete fires a "delete vertex" command to the database.
+    To remove all records  use  »all: true« as argument
+
+    The "where" parameter is optional
+=end
+    def self.delete where: {} , **args
+      if args[:all] == true
+        where = {}
+      else
+        where.merge!(args) if where.is_a?(Hash)
+        return 0 if where.empty?
+      end
+      # query returns [{count => n }]
+      #  puts "delete from  #{database_name} #{compose_where(where)}"
+      db.transmit { "delete  from `#{database_name}` #{compose_where(where)}"   } &.first[:count] rescue 0
+    end
+
   end
 end

data/lib/model/edge.rb

@@ -13,6 +13,18 @@ module Arcade
     #
     def self.create  from:, to:, **attr
         db.create_edge  database_name, from: from, to: to, **attr
+    rescue Arcade::QueryError => e
+      if  e.message =~ /Duplicated key\s+.+\sfound on index/
+        if e.args.keys.first == :exceptionArgs
+          # return the  previously assigned edge
+          e.args[:exceptionArgs].split('|').last.load_rid
+        else
+          raise
+        end
+      else
+        raise
+       end
+
     end
 
     def delete