active-orient 0.4 → 0.80

data/VERSION

@@ -1 +1 @@
-0.4
+0.80

data/active-orient.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
   s.email       = ["topofocus@gmail.com"]
   s.homepage    = 'https://github.com/topofocus/active-orient'
   s.licenses    = ['MIT']
-  s.summary     = 'Pure ruby client for OrientDB based on ActiveModel'
-  s.description = 'Persistent ORM for OrientDB, based on ActiveModel' 
+  s.summary     = 'Pure ruby client for OrientDB(V.3) based on ActiveModel'
+  s.description = 'Persistent ORM for OrientDB(V.3), based on ActiveModel' 
   s.platform	= Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.5'
   s.date 	= Time.now.strftime "%Y-%m-%d"
   s.test_files  = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
@@ -19,9 +19,11 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
    
-  s.add_development_dependency "bundler", "~> 1.8"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_dependency 'activesupport', "~> 4.2"
-  s.add_dependency 'rest-client', "~> 2.0"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_dependency 'activesupport'#, "~> 4.2"
+  s.add_dependency 'activemodel'#, "~> 4.2"
+  s.add_dependency 'rest-client'  
+  s.add_dependency 'pond'  
 
 end

data/bin/active-orient-console

@@ -0,0 +1,97 @@
+#!/usr/bin/env ruby
+## loads the active-orient environment 
+## and starts an interactive shell
+##
+## Parameter:  
+##	       production (p)
+##	       development (d)  [default]
+##	       test (t)
+require 'bundler/setup'
+require 'yaml'
+require 'logger'
+require 'active-orient'
+begin
+config_file =  File.expand_path('../../config/connect.yml', __FILE__) 
+connectyml = if File.exist?(config_file)
+							 YAML.load_file( config_file )[:orientdb]
+						 else
+							 puts "config/connect.yml not found "
+							 puts "using defaults"
+							 {  server: 'localhost', port: 2480, 
+									database: {  development: 'demodb',
+															 production: 'hcn_data',
+															 test:  'temp'},
+								  admin:	{	user: 'root', pass: 'root' } } 
+						end
+rescue Psych::SyntaxError
+	puts "Please edit /config/connect.yml"
+	puts
+	puts "current settings:"
+	puts `cat ../config/connect.yml`
+	Kernel.exit
+end
+e=  ARGV.present? ? ARGV.last.downcase : 'development'
+env =  if e =~ /^p/
+				 :production
+			 elsif e =~ /^t/
+				 :test
+			 else
+				 :development
+			 end
+begin
+	ORD = ActiveOrient::Init.connect database: connectyml[:database][env].to_s,
+		user: connectyml[:admin][:user].to_s,
+		password: connectyml[:admin][:pass].to_s,
+		server: connectyml[:server].to_s
+	ActiveOrient::Base.logger.level = Logger::INFO
+## example for namespace support, then set »keep_models_without_file« temporary to »false«
+#	module HH; end
+#	 ActiveOrient::Init.define_namespace { HH  }
+	ActiveOrient::Model.keep_models_without_file =  true 
+	ActiveOrient::OrientDB.new  model_dir: '../lib/model' , preallocate: true
+rescue RestClient::Unauthorized
+	puts "Cannot connect to the server. Wrong credentials"
+	Kernel.exit
+rescue Errno::ECONNREFUSED
+	puts "Database Server is not running on  #{connectyml[:server]} "
+	Kernel.exit
+end
+
+ class Array
+	 # Method missing enables fancy stuff like
+	 # Jahr[2000 .. 2005].monat(5..7).value 
+	 #
+	 # its included only in the console, for inspection purposes
+
+#	 def method_missing(method, *key)
+#		 unless method == :to_hash || method == :to_str #|| method == :to_int
+#			 return self.map{|x| x.public_send(method, *key)}
+#		 end
+
+#	 end
+ end # Array
+
+
+puts "ORD points to the REST-Instance, Database: #{ActiveOrient.database}"
+#puts "DB is the API-Instance of the database, DB.db gets the DB-Api-base " if RUBY_PLATFORM == 'java'
+
+puts '-'* 45
+ns= case ActiveOrient::Model.namespace 
+  when Object
+    "No Prefix, just ClassName#CamelCase"
+    else
+     ActiveOrient::Model.namespace.to_s + "{ClassName.camelcase}"
+    end
+puts "Namespace for model-classes : #{ns}"
+puts "Present Classes (Hierarchy) "
+
+puts ORD.class_hierarchy.to_yaml
+puts ActiveOrient::show_classes
+
+include OrientDB
+
+require 'pry'
+#require 'irb'
+ARGV.clear
+#IRB.start(__FILE__)
+Pry.start(__FILE__)

data/changelog.md

@@ -0,0 +1,60 @@
+Changelog
+=========
+2020/11/27 : file: /lib/database_utils.rb
+             method: system_classes,  OrientDB 3.1 compatibility
+						 Added 'OSecurityPolicy' class to system-classes array 
+             
+
+2020/11/30 : file: /lib/model/the_class.rb
+             method: require_model_file
+						 The method now accepts an array of directories to be loaded
+
+             Thus hierarchical class-structures are initialised properly.
+						 It appeared that on reopening a base-class in a hierarchical structure
+						 the contents were not read when accessing the child-classes. 
+
+						 The change is backward compatible, the method accepts single directories as well.
+
+2020/12/01   Ruby 2.7 (3.0) Compatibiltiy
+             file: /lib/init.rb         ** Hash-notation as method parameter
+						 file: /lib/model/the_record.rb   
+
+2020/12/13   file /lib/other.rb
+             method: Array#to_orient
+						 If all members of the array respond to `rid?`  and any of them is a reference
+						 to a database-record, put it without quotes into the serialized string.
+						 This enables:  where: { contract: ['#194:0','208:0'] } => .in[ contract in [194:0, 208:0] ]
+
+2020/12/14   file /lib/other.rb
+             method: Array#orient_flatten
+						 The method flattens the Array and removes nil-values. The array itself is modified
+
+2020/12/16   file /lib/model/vertex.rb
+             method: detect_edges
+						 If no informations about edges are present, reload the vertex 
+
+						 file /example/books.rb
+						 updated together with the spec-file
+
+2020/12/17   file /lib/support/orient.rb
+             class: OrientSupport::Hash
+						 method: merge (alias << ) 
+						 calls super (Hash#merge) and stores the result in the database, reloads the record
+
+						 method: remove
+						 performs the database-operation and reloads the record
+
+2020/12/21   file /lib/rest/create.rb
+             method: create_record 
+						 Included the option: »silence«.  If set, if a duplicate index-error is fired, the 
+						 original record is loaded instead of creating a new one.
+
+						 file /lib/model/vertex.rb
+						 method: create
+						 Vertex.create uses »create_record« with »silence:true« to create records. 
+
+						 file /lib/orientquery.rb
+						 class: OrientSupport::OrientQuery
+						 method: execute
+						 If the execution of a query was not successfull, nil is returned
+

data/config/boot.rb

@@ -1,23 +1,76 @@
+#### sample boot file ####
+
+
+
 require 'bundler/setup'
 require 'yaml'
+if RUBY_VERSION == 'java'
+	require 'orientdb'
+end
+require "active-orient"
 project_root = File.expand_path('../..', __FILE__)
-require "#{project_root}/lib/support.rb"
-require "#{project_root}/lib/base.rb"
-require "#{project_root}/lib/base_properties.rb"
-
-require "#{project_root}/lib/model.rb"
-require "#{project_root}/lib/orient.rb"
-require "#{project_root}/lib/rest.rb"
-#require "#{project_root}/lib/graph.rb"
-
-# require all the models and libraries
-libs= Dir.glob(File.join( project_root, "lib",'**', "*rb")) 
-result = libs.reverse.collect { |file| [file, require( file )] }
-
-logger =  Logger.new '/dev/stdout'
-#REST::Graph.logger =  logger
-ActiveOrient::Model.logger =  logger
-ActiveOrient::OrientDB.logger =  logger
+begin
+	connect_file = File.expand_path('../../config/connect.yml', __FILE__)
+	config_file = File.expand_path('../../config/config.yml', __FILE__)
+	connectyml  = YAML.load_file( connect_file )[:orientdb][:admin] if connect_file.present?
+	configyml  = YAML.load_file( config_file )[:active_orient] if config_file.present?
+	databaseyml   = YAML.load_file( connect_file )[:orientdb][:database] if connect_file.present?
+rescue Errno::ENOENT 
+	puts "config/connectyml not present"  
+	puts "Using defaults to connect database-server"  
+end
+
+e=  ARGV.present? ? ARGV.last.downcase : 'development'
+env =  if e =~ /^p/
+				 :production
+			 elsif e =~ /^t/
+				 :test
+			 else
+				 :development
+			 end
+puts "Using #{env}-environment"
+
+log_file =   if File.exist?(config_file)
+							 dev = YAML.load_file( connect_file )[:orientdb][:logger]
+							 if dev.blank? || dev== 'stdout'
+								 '/dev/stdout'
+							 else
+								 project_root+'/log/'+env+'.log'
+							 end
+						 end
+
+
+logger = Logger.new(log_file)
+logger.level = case env
+							 when :production 
+								 Logger::ERROR
+							 when :development
+								 Logger::WARN
+							 else
+								 Logger::INFO
+							 end
+logger.formatter = proc do |severity, datetime, progname, msg|
+	"#{datetime.strftime("%d.%m.(%X)")}#{"%5s" % severity}->#{msg}\n"
+end
+
+ ORD = ActiveOrient::Init.connect database: databaseyml[env],
+														user: connectyml[:user].to_s,
+														password: connectyml[:pass].to_s,
+														server: '172.28.50.25',
+														logger: logger
+
+
+
+ ActiveOrient::Model.keep_models_without_file = true
+ ActiveOrient::Init.define_namespace yml: configyml, namespace: @namespace
+ ActiveOrient::OrientDB.new  preallocate:  true, 
+			model_dir: "#{project_root}/#{ configyml.present? ? configyml[:model_dir] : "model" }"
+
+  if RUBY_PLATFORM == 'java'
+    DB =  ActiveOrient::API.new   preallocate: false
+  else
+    DB = ORD
+  end
 
 
 

data/config/config.yml

@@ -0,0 +1,10 @@
+---
+:active_orient:
+## Namespace: Prefix of Model-Objects. :self -> ActiveOrient::Model::{name}
+##				       :object => No Prefix
+##				       :active_orient => ActiveOrient::{name}
+ :namespace: :object
+## model_dir: Path to model-files relative to the root of the application
+## ie. app/model  or model
+ :model_dir: 'lib/model'
+

data/config/connect.yml

@@ -1,13 +1,18 @@
 ---
 :orientdb:
- :server: localhost
+ :server: 10.222.148.109 
+ #:server: localhost  
  :port: 2480
- :database: hc_database
+ :logger: stdout           # 'file' or 'stdout'
+ :database: 
+   :development: devel 
+   :production: produc
+   :test:  temp
  :admin:
-   :user: hctw
-   :pass: hc
+   :user: ***w
+   :pass: ***c
  :auth:
-   :user: topo
-   :pass: focus
+   :user: root
+   :pass: ****s
 
 # hfx: 101

data/examples/books.rb

@@ -5,74 +5,163 @@ There are several Books. And there is a Table with Keywords. These are our Verte
 
 The Keywords are associated to the books, this is realized via an Edge »has_content«
 
-This Example demonstrates how to build a query by using OrientSupport::OrientQuery
+This Example demonstrates how create a simple graph:
+
+Book --> HasContent --> KeyWord
+
+and to query it dynamically using OrientSupport::OrientQuery
+
+REQUIREMENT: Configurate config/connectyml (admin/user+pass) 
+
+There are 3 default search items provided. They are used if no parameter is given.
+However, any parameter given is transmitted as serach-criteria, ie.
+  ruby books.rb Juli August
+defines two search criteria.
+
 =end
+require 'bundler/setup'
+require 'yaml'
+require 'logger'
+require 'active-orient'
+
  class BooksExample
 
-    def initialize db, rebuild: true
-      if rebuild
-      db.delete_class :book
-      db.delete_class :keyword
-      db.delete_class :has_content
-      db.create_vertex_class :book
-      db.create_vertex_class :keyword
-      db.create_edge_class :has_content
-      ActiveOrient::Model::Keyword.create_property( :item , type: :string, index: :unique )
-      ActiveOrient::Model::Book.create_property( :title, type: :string, index: :unique )
-      end
-    end
-
-
-      def read_samples
-	fill_database = ->(sentence, this_book ) do 
-	  sentence.split(' ').each do |x| 
-	    this_word = Keyword.update_or_create where: { item: x }
-	    this_edge = HC.create_edge from: this_book, to: this_word  if this_word.present?
-	  end 
-	end
-	words = 'Die Geschäfte in der Industrie im wichtigen US-Bundesstaat New York sind im August so schlecht gelaufen wie seit mehr als sechs Jahren nicht mehr Der entsprechende Empire-State-Index fiel überraschend von plus  Punkten im Juli auf minus 14,92 Zähler Dies teilte die New Yorker Notenbank Fed heut mit Bei Werten im positiven Bereich signalisiert das Barometer ein Wachstum Ökonomen hatten eigentlich mit einem Anstieg auf 5,0 Punkte gerechnet'
-	this_book =  Book.create title: 'first'
-	fill_database[ words, this_book ]
-
-	words2 = 'Das Bruttoinlandsprodukt BIP in Japan ist im zweiten Quartal mit einer aufs Jahr hochgerechneten Rate von Prozent geschrumpft Zu Jahresbeginn war die nach den USA und China drittgrößte Volkswirtschaft der Welt noch um  Prozent gewachsen Der Schwächeanfall wird auch als Rückschlag für Ministerpräsident Shinzo Abe gewertet der das Land mit einem Mix aus billigem Geld und Konjunkturprogramm aus der Flaute bringen will Allerdings wirkte sich die heutige Veröffentlichung auf die Märkten nur wenig aus da Ökonomen mit einem schwächeren zweiten Quartal gerechnet hatten'
-	this_book =  Book.create title: 'second'
-	fill_database[ words2, this_book ]
-      end
-  
-    def display_books_with *desired_words
-      query = OrientSupport::OrientQuery.new  from: Keyword, projection: "expand(in('HasContent'))"
-      q =  OrientSupport::OrientQuery.new projection: 'expand( $z )'
-
-      intersects = Array.new
-      desired_words.each_with_index do | word, i |
-	       symbol = ( i+97 ).chr   #  convert 1 -> 'a' 
-	       query.where = { item: word  }
-               q.let << { symbol =>  query }
-	       intersects << "$#{symbol}"		 
-      end
-      q.let <<  "$z = Intersect(#{intersects.join(', ')}) "
-      puts "generated Query:"
-      puts q.to_s
-      result = Keyword.query_database  q, set_from: false
-      puts "found books: "
-      puts result.map( &:title ).join("; ") 
-      puts " -- None -- " if result.empty?
-    end
+	 def initialize  rebuild: true
+		 if rebuild
+			 print "\n === REBUILD === \n"
+			 ## check wether the database tables exist. Then delete Database-Class and preallocated ruby-Object
+			 di =  database_instance =  V.db
+			 database_classes = [ :book, :keyword, :has_content ]
+			 print " creating Book and  Keyword as Vertex; HAS_CONTENT as Edge \n"
+			 V.create_class :book, :keyword
+			 E.create_class :has_content
+			 print "\n === PROPERTY === \n"
+			 Keyword.create_property  :item,  type: :string, index: :unique
+			 Book.create_property     :title, type: :string, index: :unique
+			 print "\n === Unique Edges === \n"
+			 HAS_CONTENT.uniq_index
+
+			 Keyword.delete( all: true )
+			 Book.delete :all => true 
+		 end
+	 end
+
+   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+	 #################  read samples  ##############
+	 def read_samples
+		 print "\n === READ SAMPLES === \n"
+		 ## Lambda fill databasea
+		 # Anaylse a sentence
+		 # Split into words and upsert them to Word-Class.
+		 # The Block is only performed, if a new Word is inserted. 
+		 fill_database = ->(sentence, this_book ) do
+
+			 sentence.split(' ').map do | word |
+				 this_book.assign  vertex: Keyword.create( item: word ), via: HAS_CONTENT if Keyword.where( item: word ).empty?
+			 end
+
+		 end
+		 ## Lambda end
+		 words = 'Die Geschäfte in der Industrie im wichtigen US-Bundesstaat New York sind im August so schlecht gelaufen wie seit mehr als sechs Jahren nicht mehr Der entsprechende Empire-State-Index fiel überraschend von plus  Punkten im Juli auf minus 14,92 Zähler Dies teilte die New Yorker Notenbank Fed heute mit. Bei Werten im positiven Bereich signalisiert das Barometer ein Wachstum Ökonomen hatten eigentlich mit einem Anstieg auf 5,0 Punkte gerechnet'
+		 this_book =  Book.create title: 'first'
+		 fill_database[ words, this_book ]
+
+		 words2 = 'Das Bruttoinlandsprodukt BIP in Japan ist im zweiten Quartal mit einer aufs Jahr hochgerechneten Rate von Prozent geschrumpft Zu Jahresbeginn war die nach den USA und China drittgrößte Volkswirtschaft der Welt noch um  Prozent gewachsen Der Schwächeanfall wird auch als Rückschlag für Ministerpräsident Shinzo Abe gewertet der das Land mit einem Mix aus billigem Geld und Konjunkturprogramm aus der Flaute bringen will Allerdings wirkte sich die heutige Veröffentlichung auf die Märkten nur wenig aus da Ökonomen mit einem schwächeren zweiten Quartal gerechnet hatten'
+		 this_book =  Book.create title: 'second'
+		 fill_database[ words2, this_book ]
+		 puts "#{Keyword.count} keywords inserted into Database" 
+	 end
+
+   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+	 #################  display books ##############
+	 def display_books_with *desired_words
+		 ## Each serach criteria becomes a subquery
+		 ## This is integrated into the main_query using 'let'.
+		 ## Subquery:  let ${a-y} = select expand(in('has_content')) from keyword where item = {search_word} 
+		 ## combine with intercect: $z =  Intercect( $a ... $y )
+		 ##  Main Query is just
+		 ##  select expand( $z )  followed by all let-statements and finalized by "intercect"
+		 #
+
+		  # lambda to create subqueries
+      word_query = -> (arg) do
+				 q= Keyword.query  where: arg
+    		 q.nodes :in, via: HAS_CONTENT		
+			end
+
+			## We just create "select expand($z)"
+      main_query =  OrientSupport::OrientQuery.new
+			main_query.expand( '$z' )
+
+
+		 print("\n === display_books_with » #{ desired_words.join "," } « === \n")
+
+		 intersects = Array.new
+		 ## Now, add subqueries to the main-query
+		 desired_words.each_with_index do | word, i |
+			 symbol = ( i+97 ).chr   #  convert 1 -> 'a', 2 -> 'b' ...
+			 main_query.let   symbol =>  word_query[ item: word  ]
+			 intersects << "$#{symbol}"
+		 end
+		 ## Finally add the intersects statement
+		 main_query.let   "$z = Intersect(#{intersects.join(', ')}) "
+		 puts "generated Query:"
+		 puts main_query.to_s
+		 puts "\n\n\n"
+		 result = main_query.execute
+		 puts '-' * 23 
+		 puts "found books: "
+		 puts result.map( &:title ).uniq.join("; ")
+		 if result.empty?
+			 puts " -- None -- "
+			 puts " try » ruby books.rb japan flaute «  for a positive search in one of the two sentences"
+		 else 
+			 puts '-_' * 23 
+			 puts "that's it folks"
+		 end 
+	 end
  end
 
-if $0 == __FILE__
-
-require '../config/boot'
-
-    ActiveOrient::OrientDB.default_server = { user: 'hctw', password: 'hc' }
-    ActiveOrient::OrientDB.logger.level = Logger::WARN
-    r = ActiveOrient::OrientDB.new database: 'BookTest'
-    b= BooksExample.new r, rebuild:  true 
-      
-    Book = r.open_class :book
-    Keyword = r.open_class :keyword
-    HC = r.open_class :has_content
-   
-    b.read_samples if Keyword.count.zero?
-    b.display_books_with 'Land', 'Quartal'
+ if $0 == __FILE__
+	 config_file =  File.expand_path('../../config/connect.yml', __FILE__) 
+	 connectyml = if File.exist?(config_file)
+									YAML.load_file( config_file )[:orientdb]
+								else
+									puts "config/connect.yml not found "
+									puts "using defaults"
+									{  server: 'localhost', port: 2480, 
+						database: {  development: 'temp' },
+						admin:	{	user: 'root', pass: 'root' } } 
+								end
+
+begin
+	ActiveOrient::Init.connect database: connectyml[:database][:development].to_s,
+		user: connectyml[:admin][:user].to_s,
+		password: connectyml[:admin][:pass].to_s,
+		server: connectyml[:server].to_s
+
+	ActiveOrient::Base.logger.level = Logger::INFO
+	ActiveOrient::Model.keep_models_without_file = true
+	ActiveOrient::OrientDB.new  model_dir: 'lib/model'
+rescue RestClient::Unauthorized
+	puts "Cannot connect to the server. Wrong credentials"
+	Kernel.exit
+rescue Errno::ECONNREFUSED
+	puts "Database Server is not running on  #{connectyml[:server]} "
+	Kernel.exit
+end
+
+
+	 search_items =  ARGV.empty? ? ['China', 'aus', 'Flaute'] : ARGV
+	 ARGV = [ 'd' ]  # development-mode
+
+	 # search_items =  ARGV.empty? ? ['China', 'aus', 'Flaute'] : ARGV
+	 b = BooksExample.new  rebuild:  true
+
+	 #    ORD.create_vertex_class "Book", "Keyword" 
+	 #    ORD.create_edge_class 'has_content'
+
+	 b.read_samples if Keyword.count.zero?
+	 b.display_books_with *search_items
+
 end