arcadedb 0.3.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e052fea79d83b5cd35961dcc01af0ba617e80c3e0c26d058c5b69a3733a8edc
-  data.tar.gz: 92ef4c2900fee458959b01becf8fc2789fce5e87fb39e1cfc25b0f0df1e08d20
+  metadata.gz: 1855060886e9837ef486e44f07155ae99cd242f76aceccb8a7bf4c2ab515eca0
+  data.tar.gz: d99f2a402eba561fcf851a3838b3bec7eee58f1a788ab9fc7e2ce1208c33611a
 SHA512:
-  metadata.gz: f74869fa3afe8f87250e94358b2b18a1fdcfdfa092ec0ef5a0293f970f1976b755463f070f0224aa276f4df3acd5555500d800b389c8463889347f8ef2d10ee7
-  data.tar.gz: a16c82bf62d9e30898de4e439a7fca37f470944cb92293fa11e4847146eac3a5c066447c1293d3fc73d1a078b348bdcdac21b44b10308ba9c10f141d793f17e2
+  metadata.gz: 78936dfe0069d531c1bcfd6191f0269ed84a44cd8e0321a37ef9d569048ff8a20d38d0a221d0b0b93f3e64f39d61a758d2978545beec86d27baf5836c3cdbf4a
+  data.tar.gz: 6ff4e9242c74887935074ed60810b144a08ad2dad7a6d3374bc0216f74873abb6a1b6f66428a2ed6e7fa9f49dec3ee07ebbe5cc64488744829f76eb037db286c

data/CHANGELOG.md

@@ -12,4 +12,8 @@ All notable changes to this project will be documented in this file.
 - Support for embedded Dokuments and Maps
 - iruby support 
 
+## 0.4.0 - 2023.10.28
+- completely remove pg-stuff
+- substitute typhoreous with  HTTPX
+- include dry::monards to process raw-data
 

data/Gemfile

@@ -5,17 +5,12 @@ source "https://rubygems.org"
 #git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 gem 'sdoc'
-gem  'dry-configurable'
- gem  'pry'
-#gem  'sequel'
-
-#gem  'mini_sql' #, path: '../mini_sql/'
 group :development, :test do
 	gem "awesome_print"
   gem 'pastel'
   gem 'zeitwerk'
   gem 'terminal-table'
-  gem 'rubocop'
+ # gem 'rubocop'
 	gem "rspec"
 	gem 'rspec-legacy_formatters'
 	gem 'rspec-its'
@@ -26,5 +21,5 @@ group :development, :test do
 	gem 'guard'#, :platforms => :ruby
 	gem 'guard-rspec'
 	gem 'rb-inotify'
-	gem 'pry'
+#	gem 'pry'
 end

data/Gemfile.lock

@@ -1,56 +1,63 @@
 PATH
   remote: .
   specs:
-    arcadedb (0.3.2)
+    arcadedb (0.4)
+      dry-configurable
       dry-core
+      dry-monads
       dry-schema
       dry-struct
-      typhoeus
+      httpx
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     awesome_print (1.9.2)
+    base64 (0.1.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    dry-configurable (0.15.0)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
     dry-initializer (3.1.1)
-    dry-logic (1.2.0)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.10.6)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.2)
-      dry-types (~> 1.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    ffi (1.15.5)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    ffi (1.16.3)
     formatador (1.1.0)
     given_core (3.8.2)
       sorcerer (>= 0.3.7)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -64,44 +71,54 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    http-2-next (1.0.1)
+    httpx (1.0.2)
+      http-2-next (>= 1.0.1)
     ice_nine (0.11.2)
-    listen (3.7.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
+    lumberjack (1.2.9)
     method_source (1.0.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.1.1.1)
+      stringio
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.3.3)
-    regexp_parser (2.4.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-collection_matchers (1.2.0)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-context-private (0.0.1)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-given (3.8.2)
       given_core (= 3.8.2)
       rspec (>= 2.14.0)
@@ -110,34 +127,36 @@ GEM
       rspec-expectations (>= 3.0.0)
     rspec-legacy_formatters (1.0.2)
       rspec (~> 3.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.29.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.57.1)
+      base64 (~> 0.1.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    sdoc (2.3.1)
-      rdoc (>= 5.0, < 6.4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    sdoc (2.6.1)
+      rdoc (>= 5.0)
     shellany (0.0.1)
     sorcerer (2.0.1)
+    stringio (3.0.8)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    thor (1.3.0)
     tty-color (0.6.0)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.4)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-linux
@@ -146,7 +165,6 @@ DEPENDENCIES
   arcadedb!
   awesome_print
   bundler (~> 2)
-  dry-configurable
   guard
   guard-rspec
   pastel

data/arcade.yml

@@ -1,8 +1,4 @@
 ---
-## absolute path to the oetl-script
-:pg:
- :host: 10.247.8.109  # hierdevel
- :port: 5432
 :environment:
   :test:
     dbname: playground

data/arcadedb.gemspec

@@ -23,13 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 4.0"
-  #	'activesupport', '>= 6.0'
-#	spec.add_dependency 'activemodel'
-  spec.add_dependency "typhoeus" 
+  spec.add_dependency "httpx"
   spec.add_dependency 'dry-schema'
   spec.add_dependency 'dry-struct'
   spec.add_dependency 'dry-core'
-  ## Database-Access via Postgres is not implemented
-#	spec.add_dependency 'pg'
-#	spec.add_dependency 'mini_sql'
+  spec.add_dependency 'dry-configurable'
+#  spec.add_dependency 'dry-monads'  # future use
 end

data/bin/console

@@ -11,7 +11,7 @@ require 'terminal-table'
 require 'zeitwerk'
 require 'pastel'
 require 'arcade'
-require 'pry'
+#require 'pry'
 #begin
 
 
@@ -118,9 +118,9 @@ DB = Arcade::Init.connect e
 require 'irb'
 ARGV.clear
 #begin
-#IRB.start(__FILE__)
+IRB.start(__FILE__)
 #rescue ArgumentError => e
 #  puts e
 ##  retry
 #end
-Pry.start(__FILE__)
+#Pry.start(__FILE__)

data/lib/arcade/api/operations.rb

@@ -1,5 +1,6 @@
 module Arcade
  module  Api
+   extend Primitives
 =begin
   This is a simple admin interface
 
@@ -22,44 +23,53 @@ module Arcade
 
 =end
 
+    # ------------------------------ Service methods  ------------------------------------------------- #
+    # ------------------------------                  ------------------------------------------------- #
+    # ------------------------------ databases        ------------------------------------------------- #
+    #  returns an array of databases present on the database-server                                     #
 
     def self.databases
       get_data 'databases'
     end
 
+    # ------------------------------ create database  ------------------------------------------------- #
+    #  creates a database if not present                                                                #
     def self.create_database name
-      unless databases.include?( name.to_s )
-      payload = { "command" => "create database #{name}" }.to_json
-        post_data  "server", { body: payload }.merge( auth ).merge( json )
-      end
-    rescue QueryError => e
+      return if databases.include?( name.to_s )
+      payload = { "command" => "create database #{name}" }
+        post_data  "server", payload
+    rescue HTTPX::HTTPError => e
       logger.fatal "Create database #{name} through \"POST create/#{name}\" failed"
       logger.fatal  e
       raise
     end
 
+    # ------------------------------  drop  database  ------------------------------------------------- #
+    #  deletes the given database                                                                       #
     def self.drop_database name
-      if databases.include?( name.to_s )
-      payload = { "command" => "drop database #{name}" }.to_json
-        post_data  "server", { body: payload }.merge( auth ).merge( json )
-      end
+      return unless databases.include?( name.to_s )
+      payload = {"command" => "drop database #{name}" }
+       post_data  "server",  payload
+    rescue HTTPX::HTTPError => e
+      logger.fatal "Drop database #{name} through \"POST drop database/#{name}\" failed"
+      raise
     end
     # ------------------------------  create document ------------------------------------------------- #
-    # adds a document to the database
+    # adds a document to the specified database table
     #
     # specify database-fields as hash-type parameters
     #
     # i.e   Arcade::Api.create_document 'devel', 'documents',  name: 'herta meyer', age: 56, sex: 'f'
     #
     # returns the rid of the inserted dataset
-    # 
+    #
     def self.create_document database, type, **attributes
-      payload = { "@type" => type }.merge( attributes ).to_json
+      payload = { "@type" => type }.merge( attributes )
       logger.debug "C: #{payload}"
       options = if session.nil?
-                  { body: payload }.merge( auth ).merge( json )
+         payload
                 else
-        { body: payload }.merge( auth ).merge( json ).merge( headers: { "arcadedb-session-id" => session })
+        payload.merge headers: { "arcadedb-session-id" => session }
                 end
       post_data "document/#{database}", options
     end
@@ -71,32 +81,22 @@ module Arcade
     #
     # returns an Array of results (if propriate)
     # i.e
-    # Arcade::Api.execcute( "devel" ) { 'select from test  ' }
+    # Arcade::Api.execute( "devel" ) { 'select from test  ' }
     #  =y [{"@rid"=>"#57:0", "@type"=>"test", "name"=>"Hugo"}, {"@rid"=>"#60:0", "@type"=>"test", "name"=>"Hubert"}]
     #
-    def self.execute database, query=nil
+    def self.execute database, query=nil, session_id= nil
       pl = query.nil? ? provide_payload(yield) : provide_payload(query)
-      options =   { body: pl }.merge( auth ).merge( json )
-      unless session.nil?
-        options = options.merge( headers: { "arcadedb-session-id" => session })
+      if session_id.nil? && session.nil?
+        post_data "command/#{database}" , pl
+      else
+        post_transaction "command/#{database}" , pl, session_id || session
       end
-      post_data "command/#{database}" , options
-    rescue Arcade::QueryError => e
-#        puts e.methods
-        #puts e.exception
-       # puts e.full_message
-        if   e.message =~ /retry/
-          retry
-        else
-          raise   e.message
-        end
     end
 
     # ------------------------------  query           ------------------------------------------------- #
     # same for idempotent queries
     def self.query database, query
-      options = { body: provide_payload(query)  }.merge( auth ).merge( json )
-      post_data   "query/#{database}" , options
+      post_data   "query/#{database}" , provide_payload(query)
     end
 
     # ------------------------------  get_record      ------------------------------------------------- #
@@ -114,7 +114,7 @@ module Arcade
       if rid.rid?
       get_data  "document/#{database}/#{rid}"
       else
-        raise Arcade::Error "Get requires a rid input"
+        raise Error "Get requires a rid input"
       end
     end
 
@@ -136,10 +136,11 @@ module Arcade
       begin_transaction database
       success = args.map do | name, format |
         r= execute(database) {" create property #{type.to_s}.#{name.to_s} #{format.to_s} " } &.first
+        puts "R: #{r.inspect}"
         if r.nil?
           false
         else
-          r.keys == [ :propertyName, :typeName, :operation ] && r[:operation] == 'create property'
+          r[:operation] == 'create property'
         end
       end.uniq
       if success == [true]
@@ -155,45 +156,20 @@ module Arcade
     # ------------------------------ index            ------------------------------------------------- #
     def self.index database, type,  name ,  *properties
       properties = properties.map( &:to_s )
-      unique_requested = "unique" if properties.delete("unique")  
+      unique_requested = "unique" if properties.delete("unique")
       unique_requested = "notunique" if  properties.delete("notunique" )
       automatic = true if
       properties << name  if properties.empty?
-  #    puts " create index  #{type.to_s}[#{name.to_s}] on #{type} ( #{properties.join(',')} ) #{unique_requested}" 
+ #    puts " create index  #{type.to_s}[#{name.to_s}] on #{type} ( #{properties.join(',')} ) #{unique_requested}"
       #    VV 22.10: providing an index-name raises an  Error (  Encountered " "(" "( "" at line 1, column 44. Was expecting one of:     <EOF>      <SCHEMA> ...     <NULL_STRATEGY> ...     ";" ...     "," ...   )) )
       #    named  indices droped for now
-      success = execute(database) {" create index   on #{type} ( #{properties.join(',')} ) #{unique_requested}" } &.first
+      success = execute(database) {" create index IF NOT EXISTS on #{type} (#{properties.join(', ')}) #{unique_requested}" } &.first
 #      puts "success: #{success}"
-      success && success.keys == [ :totalIndexed, :name, :operation ] &&   success[:operation] == 'create index' 
-
-    end
-
-
-    # ------------------------------ transaction      ------------------------------------------------- #
-    #
-    def self.begin_transaction database
-      result  = Typhoeus.post Arcade::Config.base_uri + "begin/#{database}", auth
-      @session_id = result.headers["arcadedb-session-id"]
+       success[:operation] == 'create index'
 
-      # returns the session-id 
     end
 
 
-    # ------------------------------ commit           ------------------------------------------------- #
-    def self.commit database
-    options =  auth.merge( headers: { "arcadedb-session-id" => session })
-      post_data  "commit/#{database}", options
-      @session_id =  nil
-    end
-
-    # ------------------------------ rollback         ------------------------------------------------- #
-    def  self.rollback database, publish_error=true
-      options =  auth.merge( headers: { "arcadedb-session-id" => session })
-      post_data  "rollback/#{database}", options
-      @session_id =  nil
-      raise Arcade::RollbackError "A Transaction has been rolled back"   if publish_error
-    end
-
     private
 
      def self.logger
@@ -235,37 +211,15 @@ module Arcade
                                       [ :language,  value.to_sym ]
                                     end
                                   end # case
-                                end .to_h ).to_json # map
-    end
-
-    def self.get_data command, options = auth
-      result  = Typhoeus.get Arcade::Config.base_uri + command, options
-      analyse_result(result, command)
+                                end .to_h ) # map
     end
 
 
-    def self.post_data command, options = auth
-   #   puts "Post DATA #{command} #{options}"   # debug
-      i = 0; a=""
-      loop do
-        result  = Typhoeus.post Arcade::Config.base_uri + command, options
-        #  Code: 503 – Service Unavailable
-        if result.response_code.to_i == 503  #  retry two times
-          i += 1
-          raise Arcade::QueryError, JSON.parse( result.response_body, symbolize_names: true )[:result] if i > 3
-          sleep 0.1
-        else
-         a= analyse_result(result, command )
-          break
-        end
-      end
-      a
-    end
 
-    # returns the json-response
+    # returns the json-response   ## retiered
     def self.analyse_result r, command
       if r.success?
-          return nil  if r.response_code == 204  # no content
+          return nil  if r.status == 204  # no content
           result = JSON.parse( r.response_body, symbolize_names: true )[:result]
           if result == [{}]
            []
@@ -273,14 +227,14 @@ module Arcade
             result
           end
         elsif r.timed_out?
-          raise Arcade::Error "Timeout Error", caller
+          raise Error "Timeout Error", caller
           []
         elsif r.response_code > 0
           logger.error  "Execution Failure – Code: #{ r.response_code } – #{r.status_message} "
           error_message = JSON.parse( r.response_body, symbolize_names: true )
           logger.error  "ErrorMessage:  #{ error_message[:detail]} "
           if error_message[:detail] =~ /Duplicated key/
-            raise Arcade::IndexError, error_message[:detail]
+            raise IndexError, error_message[:detail]
           else
           # available fields:  :detail, :exception, error
             puts  error_message[:detail]
@@ -290,16 +244,13 @@ module Arcade
     end
     def self.auth
        @a ||= { httpauth: :basic,
-         username: Arcade::Config.admin[:user],
-         password: Arcade::Config.admin[:pass] }
+         username: Config.admin[:user],
+         password: Config.admin[:pass] }
     end
 
-    def self.json
-      { headers: { "Content-Type" => "application/json"} }
-    end
 #  not tested
     def self.delete_data command
-      result  = Typhoeus.delete Arcade::Config.base_uri + command, auth
+      result  = HTTPX.delete Config.base_uri + command, auth
       analyse_result(result, command)
     end
   end

data/lib/arcade/api/primitives.rb

@@ -0,0 +1,98 @@
+module Arcade
+ module  Api
+   module Primitives
+
+  # This module handles the interaction with the database through HTTPX
+  #
+   # ------------------------------  http ------------------------------------------------------------ #
+   # persistent http handle to the database
+
+    def http
+      break_on = -> (response) { response.status == 500  }
+      @http ||= HTTPX.plugin(:basic_auth).basic_auth(auth[:username], auth[:password])
+                  .plugin(:persistent)
+                  .plugin(:circuit_breaker)
+   #               .plugin(:circuit_breaker, circuit_breaker_break_on: break_on)
+    end
+
+    # ------------------------------  get data -------------------------------------------------------- #
+    def get_data command
+      response = http.get( Config.base_uri + command )
+      response.raise_for_status
+
+      JSON.parse( response.body, symbolize_names: true )[:result]
+      #      alternative to `raise for status `
+#      case response = http.basic_auth(auth[:username], auth[:password]).get( Config.base_uri + command )
+#      in { status: 200..203, body:  }
+#        puts "success: #{JSON.parse(body, symbolize_names: true)[:result]}"
+#      in { status: 400..499, body:  }
+#        puts "client error: #{body.json}"
+#      in { status: 500.., body:  }
+#          puts "server error: #{body.to_s}"
+#      in { error: error  }
+#          puts "error: #{error.message}"
+#      else
+#          raise "unexpected: #{response}"
+#      end
+#      puts "result : #{response}"
+#      puts "code: #{response.status}"
+#      analyse_result(response, command)
+    end
+
+    # ------------------------------ post data -------------------------------------------------------- #
+    def post_data command,  payload
+#      http = HTTPX.plugin(:basic_auth)
+ #                 .basic_auth(auth[:username], auth[:password])
+      response = http.post( Config.base_uri + command, json:  payload )
+      response.raise_for_status
+      JSON.parse( response.body, symbolize_names: true )[:result]
+    end
+
+    # ------------------------------ transaction      ------------------------------------------------- #
+    #
+    def begin_transaction database
+      result  = http.post Config.base_uri + "begin/#{database}"
+      @session_id = result.headers["arcadedb-session-id"]
+      # returns the session-id
+    end
+
+    # ------------------------------ post transaction ------------------------------------------------- #
+    def post_transaction command, params, session_id= @session_id
+     # http = HTTPX.plugin(:basic_auth)
+     #             .basic_auth(auth[:username], auth[:password])
+     #             .with( headers: { "arcadedb-session-id"=>session }, debug_level: 1)
+      http_a = http.with(  headers: { "arcadedb-session-id" => session_id } , debug_level: 1)
+      response = http_a.post( Config.base_uri + command, json:  params )
+      response.raise_for_status
+      JSON.parse( response.body, symbolize_names: true )[:result]
+
+    end
+
+    # ------------------------------ commit           ------------------------------------------------- #
+    def commit database, session_id = @session_id
+      http_a = http.with(  headers: { "arcadedb-session-id" => session_id } , debug_level: 1)
+      response = http_a.post( Config.base_uri + "commit/#{database}" )
+      response.raise_for_status
+      @session_id =  nil
+      response.status  #  returns 204 --> success
+                       #          403 --> incalid credentials
+                       #          500 --> Transaction  not begun
+
+    end
+
+    # ------------------------------ rollback         ------------------------------------------------- #
+    def rollback database, session_id = @session_id, publish_error=true
+    #  http = HTTPX.plugin(:basic_auth)
+    #              .basic_auth(auth[:username], auth[:password])
+    #              .with( headers: { "arcadedb-session-id"=>session_id }, debug_level: 1)
+      http_a = http.with(  headers: { "arcadedb-session-id" => session_id } , debug_level: 1)
+      response = http_a.post( Config.base_uri + "rollback/#{database}" )
+      response.raise_for_status
+      @session_id =  nil
+      logger.error  "A Transaction has been rolled back"  # if publish_error
+      response.status
+    end
+  end
+ end
+end
+

data/lib/arcade/base.rb

@@ -5,7 +5,7 @@ module Arcade
     # schema schema.strict    #  -- throws an error if  specified keys are missing
     transform_keys{ |x|  x[0] == '@' ? x[1..-1].to_sym : x.to_sym }
     # Types::Rid -->  only accept  #000:000,  raises an Error, if rid is not present
-    attribute :rid, Types::Rid
+    attribute :rid?, Types::Rid
     # maybe there are edges   ## removed in favour of instance methods
 #    attribute :in?, Types::Nominal::Any
 #    attribute :out?, Types::Nominal::Any
@@ -41,12 +41,7 @@ module Arcade
           if the_class.respond_to?(:demodulize)
             if [ 'Document','Vertex', 'Edge'].include?(the_class.demodulize)
               if  the_class == superclass  # no inheritance
-                ## we have to use demodulize as the_class actually is Arcade::Vertex, ...
-                unless parent_present[ to_s.snake_case ]
                   db.create_type the_class.demodulize, to_s.snake_case
-                else
-                  db.logger.warn "Type #{ to_s.snake_case } is present, process skipped"
-                end
               else
                 if superclass.is_a? Class  #  maybe its a module.
                    extended = superclass.to_s.snake_case
@@ -75,7 +70,7 @@ module Arcade
           db.execute { the_command }
         end unless custom_setup.nil?
 
-        rescue Arcade::RollbackError => e
+        rescue RollbackError => e
           db.logger.warn e
         rescue RuntimeError => e
           db.logger.warn e
@@ -134,10 +129,10 @@ module Arcade
       #  ( depreciated )
 
       def  create **attributes
-        Api.begin_transaction db.database
+        s = Api.begin_transaction db.database
         attributes.merge!( created: DateTime.now ) if timestamps
         record = insert **attributes
-        Api.commit db.database
+        Api.commit db.database, s
         record
       rescue QueryError => e
         db.logger.error "Dataset NOT created"
@@ -222,8 +217,7 @@ module Arcade
       # Finds the first matching record providing the parameters of a `where` query
       #  Strategie.find symbol: 'Still'
       #  is equivalent to
-      #  Strategie.all.find{|y| y.symbol == 'Still'
-      #  }
+      #  Strategie.all.find{|y| y.symbol == 'Still' }
       def find **args
         f= where(**args).first
         f= where( "#{ args.keys.first } like #{ args.values.first.to_or }" ).first if f.nil? || f.empty?
@@ -278,14 +272,14 @@ module Arcade
                     end
         result= query( **( { kind: :upsert  }.merge statement ) ).execute do | answer|
           z=  answer[:"$current"] &.allocate_model(false)  #  do not autoload modelfiles
-          raise Arcade::LoadError "Upsert failed"   unless z.is_a?  Arcade::Base
+          raise LoadError "Upsert failed"   unless z.is_a?  Base
           z  #  return record
         end
       end
 
 
       def query **args
-        Arcade::Query.new( **{ from: self }.merge(args) )
+        Query.new( **{ from: self }.merge(args) )
       end
 
       # immutable support
@@ -332,7 +326,7 @@ module Arcade
     end
 
     def query **args
-      Arcade::Query.new( **{ from: rid }.merge(args) )
+      Query.new( **{ from: rid }.merge(args) )
     end
 
     # to JSON  controlls the serialisation of Arcade::Base Objects for the HTTP-JSON API
@@ -364,7 +358,7 @@ module Arcade
 
 		"<#{ self.class.to_s.snake_case }" + rid? ? "[#{ rid }]: " : " " + invariant_attributes.map do |attr, value|
 			v= case value
-				 when Arcade::Base
+				 when Base
 					 "< #{ self.class.to_s.snake_case }: #{ value.rid } >"
 				 when Array
            value.map{|x| x.to_s}
@@ -375,7 +369,12 @@ module Arcade
 		end.compact.sort.join(', ') + ">".gsub('"' , ' ')
     end
 
-    alias to_s to_human
+
+    #  configure irb-output to to_human for all Arcade::Base-Objects
+    #
+    def inspect
+      to_human
+    end
 
     def to_html  # iruby
       _modul, _class =  self.class.to_s.split "::"
@@ -383,7 +382,7 @@ module Arcade
       IRuby.display IRuby.html "<b style=\"color: #50953DFF\"><#{ the_class}</b>"
       + rid? ? "[#{ rid }]: " : " " + invariant_attributes.map do |attr, value|
         v= case value
-           when Arcade::Base
+           when Base
              "< #{ self.class.to_s.snake_case }: #{ value.rid } >"
            when Array
              value.map{|x| x.to_s}
@@ -395,13 +394,13 @@ module Arcade
     end
 
     def update **args
-      Arcade::Query.new( from: rid , kind: :update, set: args).execute
+      Query.new( from: rid , kind: :update, set: args).execute
       refresh
     end
 
     # inserts or updates a embedded document
     def insert_document name, obj
-      value = if obj.is_a? Arcade::Document
+      value = if obj.is_a? Document
                 obj.to_json
               else
                 obj.to_or
@@ -417,7 +416,7 @@ module Arcade
     end
 
     def update_list list, value
-      value = if value.is_a? Arcade::Document
+      value = if value.is_a? Document
                 value.to_json
               else
                 value.to_or

data/lib/arcade/database.rb

@@ -112,8 +112,13 @@ module Arcade
       types( true )  # update cached schema
       db
 
-    rescue Arcade::QueryError
-      Arcade::Database.logger.warn "Database type #{type} already present"
+    rescue HTTPX::HTTPError => e
+#      puts "ERROR:  #{e.message.to_s}"
+      if e.status == 500 && e.message.to_s =~ /already exists/
+        Arcade::Database.logger.warn "Database type #{type} already present"
+      else
+        raise
+      end
     end
 
     alias create_class create_type
@@ -233,8 +238,18 @@ module Arcade
     # If an Error occurs, its rolled back
     #
     def execute   &block
-      Api.begin_transaction database
-      response = Api.execute database, &block
+      s = Api.begin_transaction database
+  #    begin
+      response = Api.execute database, nil, s, &block
+    #  rescue HTTPX::HTTPError => e
+    #    raise e.message
+    #    puts  e.methods
+    #    puts e.status
+    #    puts e.response
+    #    puts e.message
+    #    puts e.exception
+    #    puts e.cause
+    #  end
       # puts response.inspect  # debugging
       r= if  response.is_a? Hash
            _allocate_model res
@@ -251,11 +266,15 @@ module Arcade
          else
            response
          end
-     Api.commit database
-     r # return associated array of Arcade::Base-objects
-    rescue  Dry::Struct::Error, Arcade::QueryError => e
-      Api.rollback database
-      logger.error "Execution  FAILED --> #{e.exception}"
+     if Api.commit( database, s) == 204
+        r # return associated array of Arcade::Base-objects
+     else
+       []
+     end
+    rescue  Dry::Struct::Error, HTTPX::HTTPError, Arcade::QueryError => e
+      Api.rollback database, s
+      logger.error "Execution  FAILED -->  Status #{e.status}"
+ #     logger.error "Execution  FAILED --> #{e.exception.message}"
       []  #  return empty result
     end
 
@@ -272,7 +291,17 @@ module Arcade
 
       content = attributes.empty? ?  "" : "CONTENT #{attributes.to_json}"
       cr = ->( f, t ) do
-        edges = Api.execute( database, "create edge #{edge_class} from #{f.rid} to #{t.rid} #{content}").allocate_model(false) 
+        begin
+        edges = Api.execute( database, "create edge #{edge_class} from #{f.rid} to #{t.rid} #{content}").allocate_model(false)
+        rescue HTTPX::HTTPError => e
+         # if e.status == 503
+         #   puts e.status
+         # puts e.message
+         # puts e.message.class
+         # end
+          raise unless e.message =~ /Found duplicate key/
+         puts "#"+e.message.split("#").last[0..-3]
+        end
         #else
         #  logger.error "Could not create Edge  #{edge_class} from #{f} to #{t}"
         ##  logger.error edges.to_s

data/lib/arcade/version.rb

@@ -1,3 +1,3 @@
 module Arcade
-  VERSION = "0.3.3"
+  VERSION = "0.4"
 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,14 +12,10 @@ 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 'httpx'
+require 'arcade/errors'
 require_relative '../lib/support/object'
 require_relative '../lib/support/string'
 require_relative '../lib/support/class'
@@ -28,6 +24,7 @@ require_relative '../lib/support/model'
 require_relative '../lib/arcade/logging'
 require_relative '../lib/config'
 require_relative '../lib/support/conversions'
+require_relative '../lib/arcade/api/primitives'
 require_relative '../lib/arcade/api/operations'
 require_relative '../lib/arcade/base'
 require_relative '../lib/arcade/database'

data/lib/config.rb

@@ -48,17 +48,19 @@ module Arcade
     setting :namespace, default:  :namespace, reader: true , constructor:  ->(v) { yml(v) }
     setting :secret, reader: true,  default: 12, constructor:  ->(v) { seed(v) }
      private
-    # if a config dir exists, use it
+     # if a config dir exists, use it.
+     # Standard:  ProjectRoot/config.yml
      def self.config_file
-       if @cd.nil?
-         ( cd =  ProjectRoot + 'arcade.yml' ).exist? ||
-         ( cd =  ProjectRoot + 'config' + 'arcade.yml' ).exist? ||
-         ( cd =  ProjectRoot + "config.yml" )
-          @cd = cd
-       else
-         @cd
+
+       configdir =  -> do
+         pr =  ProjectRoot.is_a?(Pathname)?  ProjectRoot : Pathname.new( ProjectRoot )
+         ( cd =  pr + 'arcade.yml' ).exist? || ( cd =   pr + 'config' + 'arcade.yml' ).exist? || ( cd =   pr + 'config.yml' )
+         cd
        end
+
+       @cd ||= configdir[]
      end
+
     def self.yml key=nil
       y= YAML::load_file( config_file )
       key.nil?  ?  y : y[key]

data/lib/model/vertex.rb

@@ -59,14 +59,14 @@ 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
@@ -77,7 +77,7 @@ module Arcade
       s =  Query.new from: rid
       s.nodes in_or_out, via: via, **args
       if execute
-         s.query.select_result
+         s.query &.select_result
        else
          s  #  just return the query
        end
@@ -209,7 +209,7 @@ Format: < Classname: Edges, Attributes >
 
 		#Default presentation of Arcade::Base::Model-Objects
 
-		"<#{self.class.to_s.snake_case}[#{rid}]: "  +
+		"<#{self.class.to_s.snake_case}[#{rid}]:"  +
       in_and_out[] +
       invariant_attributes.map do |attr, value|
 			v= case value

data/lib/query.rb

@@ -104,7 +104,7 @@ 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 + ' ) '
@@ -370,7 +370,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/conversions.rb

@@ -195,7 +195,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/model.rb

@@ -19,14 +19,17 @@ 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"
-
-        return response if temp_rid.rid?.nil?
-        # extract type infos  and convert to database-name
         type           = response.delete :"@type"
         cat            = response.delete :"@cat"
+
+        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
         n, type_name = type.camelcase_and_namespace
         n = self.namespace if n.nil?
         # autoconvert rid's in attributes to model-records  (exclude edges!)
@@ -38,7 +41,7 @@ module Arcade
             when Array
               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)
+                  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
@@ -47,7 +50,7 @@ module Arcade
               end
             when Hash
               if x.include?(:@type)
-                x.merge( rid: '#0:0' ).allocate_model(false)
+                x.allocate_model(false)
               else
                 x.transform_values!{|z|  z.rid? ?  z.load_rid(false) : z }
               end
@@ -61,7 +64,7 @@ module Arcade
         #
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcadedb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
 platform: ruby
 authors:
 - Hartmut Bischoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-10-25 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: []
@@ -132,7 +146,7 @@ files:
 - examples/relation_n_n.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/database.rb
 - lib/arcade/errors.rb

data/lib/arcade/api/version.rb

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