active-orient 0.4 → 0.5

data/VERSION

@@ -1 +1 @@
-0.4
+0.5

data/active-orient.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Pure ruby client for OrientDB based on ActiveModel'
   s.description = 'Persistent ORM for OrientDB, based on ActiveModel' 
   s.platform	= Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.2.5'
   s.date 	= Time.now.strftime "%Y-%m-%d"
   s.test_files  = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   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_dependency 'activemodel', "~> 4.2"
+  s.add_dependency 'rest-client'  
 
 end

data/bin/active-orient-console

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+## loads the active-orient environment 
+## and starts an interactive shell
+## Parameter:  production (p)
+##	       development (d)  [default]
+##	       test (t)
+require 'logger'
+LogLevel = Logger::WARN
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+  
+ require 'orientdb' if RUBY_PLATFORM == 'java'
+ require 'yaml'
+
+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 '-'* 35
+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 "Allocated Classes (Hierarchy) ( Modelclasses are Camelized ):"
+puts '-'* 35
+
+puts ORD.class_hierarchy.to_yaml
+
+
+include OrientDB
+
+require 'irb'
+ARGV.clear
+IRB.start(__FILE__)

data/config/boot.rb

@@ -1,24 +1,92 @@
 require 'bundler/setup'
 require 'yaml'
+if RUBY_VERSION == 'java'
+  require 'orientdb'
+end
 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
+require "#{project_root}/lib/active-orient.rb"
+# mixin for define_namespace 
+include ActiveOrient::Init
+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 => e
+  ActiveOrient::Base.logger = Logger.new('/dev/stdout')
+  ActiveOrient::OrientDB.logger.error{ "config/connectyml not present"  }
+  ActiveOrient::OrientDB.logger.error{ "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"
+
+ActiveOrient::Model.model_dir =  "#{project_root}/#{ configyml.present? ? configyml[:model_dir] : "model" }"
+
+# lib/init.rb
+define_namespace yml: configyml, namespace: @namespace
+
+
+log_file =   if config_file.present?
+	       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}->#{progname}:..:#{msg}\n"
+end
+ActiveOrient::Base.logger =  logger
 ActiveOrient::OrientDB.logger =  logger
 
+if connectyml.present? and connectyml[:user].present? and connectyml[:pass].present?
+  ActiveOrient.default_server= { user: connectyml[:user], password: connectyml[:pass] ,
+				 server: 'localhost', port: 2480  }
+  ActiveOrient.database = @configDatabase.presence || databaseyml[env.to_sym]
+
+  ORD = ActiveOrient::OrientDB.new  preallocate: @do_not_preallocate.present? ? false : true
+  if RUBY_PLATFORM == 'java'
+    DB =  ActiveOrient::API.new   preallocate: false
+  else
+    DB = ORD
+  end
+#  ActiveOrient::Init.vertex_and_edge_class
+
+      ORD.create_classes 'E', 'V'
+      E.ref_name = 'E'
+      V.ref_name = 'V'
+  # require model files after initializing the database
+  require "#{project_root}/lib/model/edge.rb"
+  require "#{project_root}/lib/model/vertex.rb"
+## attention: if the Egde- or Vertex-Base-Class is deleted (V.delte_class) the model-methods are gone.
+## After recreating the BaseClass by ORD.create_class('V'), the model-classes have to be loaded manually (require does not work))
+else
+  ActiveOrient::Base.logger = Logger.new('/dev/stdout')
+  ActiveOrient::OrientDB.logger.error{ "config/connectyml is  misconfigurated" }
+  ActiveOrient::OrientDB.logger.error{ "Database Server is NOT available"} 
+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: 'model'
+

data/config/connect.yml

@@ -1,8 +1,12 @@
 ---
 :orientdb:
- :server: localhost
+ :server: localhost # 172.28.50.109 # localhost   #mailout.halfgarten-capital.de
  :port: 2480
- :database: hc_database
+ :logger: stdout           # 'file' or 'stdout'
+ :database: 
+   :development: DEV
+   :production: hcn_data
+   :test:  tempera
  :admin:
    :user: hctw
    :pass: hc

data/create_project

@@ -0,0 +1,19 @@
+#  create a dir bin
+# and move bin/activeorient-console.sh into that dir
+
+# create a dir config
+# and create a sample connect.yml 
+# and copy  boot.rb 
+
+# create a schema dir
+# and put stuff to administrate the database-structure there
+
+# create a dir model
+# and put a sample model-file into it
+# create model-files according to the database-schema
+
+# create a dir spec
+# and copy spec-helper.rb into it
+
+# create a Guard and a Gemfile in the root-directory
+

data/examples/books.rb

@@ -5,74 +5,121 @@ 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
+
  class BooksExample
 
-    def initialize db, rebuild: true
+    def initialize  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 )
+        print "\n === REBUILD === \n"
+	## check wether the database tables exist. Then delete Database-Class and preallocated ruby-Object
+	database_classes = [ :book, :keyword, :has_content ]
+	puts "allocated-database-classes: #{ORD.database_classes.join(" , ")} "
+	if database_classes.map{|c|  ORD.database_classes.include?( c.to_s ) ? c : nil }.compact.size == 3
+	print " deleting database tables \n"
+	database_classes.each{ | c | d_class=  c.to_s.classify.constantize  # works if namespace=Object
+				     d_class.delete_class if d_class.present? }
+	else
+	  puts " omitting deletion of database-classes "
+	end
+	print " creating Book and  Keyword as Vertex; HasContent as Edge \n"
+	ORD.create_classes( { V: [:book, :keyword], E: :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"
+	HasContent.uniq_index
       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 
+        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 |
+	    Keyword.upsert where: { item: word } do | new_keyword |
+	          HasContent.create from: this_book, to: new_keyword 
+	    end
+	  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'
+	## 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
-  
+
     def display_books_with *desired_words
-      query = OrientSupport::OrientQuery.new  from: Keyword, projection: "expand(in('HasContent'))"
-      q =  OrientSupport::OrientQuery.new projection: 'expand( $z )'
+
+      ## 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"
+      #
+      print("\n === display_books_with » #{ desired_words.join "," } « === \n")
+      main_query =  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}"		 
+	       symbol = ( i+97 ).chr   #  convert 1 -> 'a', 2 -> 'b' ...
+	       subquery = OrientSupport::OrientQuery.new from: Keyword, projection: "expand(in('has_content'))"
+	       subquery.where = { item: word  }
+               main_query.let << { symbol =>  subquery }
+	       intersects << "$#{symbol}"
       end
-      q.let <<  "$z = Intersect(#{intersects.join(', ')}) "
+      main_query.let <<  "$z = Intersect(#{intersects.join(', ')}) "
       puts "generated Query:"
-      puts q.to_s
-      result = Keyword.query_database  q, set_from: false
+      puts main_query.compose
+      result = Keyword.query_database  main_query, set_from: false
+      puts '-' * 23 
       puts "found books: "
-      puts result.map( &:title ).join("; ") 
+      puts result.map( &:title ).join("; ")
       puts " -- None -- " if result.empty?
+      puts '-_' * 23 
+      puts "that's it folks"
     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
-   
+    search_items =  ARGV.empty? ? ['China', 'aus', 'Flaute'] : ARGV
+    ARGV = [ 'd' ]  # development-mode
+    @configDatabase =  'BookTest'
+
+    require '../config/boot'
+
+   # search_items =  ARGV.empty? ? ['China', 'aus', 'Flaute'] : ARGV
+    b = BooksExample.new  rebuild:  true
+
+    ORD.create_classes([ "Book", "Keyword" ]){ "V" }
+    ORD.create_edge_class 'has_content'
+
     b.read_samples if Keyword.count.zero?
-    b.display_books_with 'Land', 'Quartal'
+    b.display_books_with *search_items
+
 end

data/examples/createTime.rb

@@ -0,0 +1,91 @@
+if $0 == __FILE__
+  puts "the time-graph example is completely rewritten"
+  puts "changing into the directory and starting the demo in 10 sec."
+  sleep 10
+  print %x{ cd #{File.expand_path(File.dirname(__FILE__))}/time_graph ; ruby  createTime.rb }
+  
+  Kernel.exit
+end
+#require 'time'
+require '../config/boot'
+
+## historic stuff 
+
+def create1month
+
+	database_classes = [:hour, :day, :month, :time_base,  :time_of ]
+	puts "allocated-database-classes: #{ORD.database_classes.join(" , ")} "
+	puts database_classes.map{|c| ORD.database_classes.include?( c.to_s ) ? c : nil }.compact.size 
+	if database_classes.map{|c|  ORD.database_classes.include?( c.to_s ) ? c : nil }.compact.size <= 5
+	print " deleting database tables \n"
+	database_classes.each{ | c | d_class=  c.to_s.classify.constantize  # works if namespace=Object
+				     d_class.delete_class if d_class.present? }
+	else
+	  puts " omitting deletion of database-classes "
+	end
+	ORD.create_vertex_class :time_base
+	ORD.create_classes( :hour, :day, :month ){ :time_base } # create three vertex classes
+	TimeBase.create_property :value_string, type: :string  
+	TimeBase.create_property :value, type: :string  
+	ORD.create_edge_class :time_of 
+	ORD.create_edge_class :day_of 
+
+
+#  hour_class   = r.create_vertex_class "Hour", properties: {value_string: {type: :string}, value: {type: :integer}}
+#  hour_class.alter_property property: "value", attribute: "MIN", alteration: 0
+#  hour_class.alter_property property: "value", attribute: "MAX", alteration: 23
+#
+#  day_class    = r.create_vertex_class "Day", properties: {value_string: {type: :string}, value: {type: :integer}}
+#  day_class.alter_property property: "value", attribute: "MIN", alteration: 1
+#  day_class.alter_property property: "value", attribute: "MAX", alteration: 31
+#
+#  month_class  = r.create_vertex_class "Month", properties: {value_string: {type: :string}, value: {type: :integer}}
+#  month_class.alter_property property: "value", attribute: "MIN", alteration: 1
+#  month_class.alter_property property: "value", attribute: "MAX", alteration: 12
+#
+
+#  timeof_class = r.create_edge_class "TIMEOF"
+
+  timestamp = DateTime.new 2016,2,29 # or strptime "1456704000",'%s' 
+  month_vertex =Month.create value_string: "March", value: 3
+  for day in 1..31
+    day_vertex = Day.create value_string: "March #{timestamp.day}", value: day
+    for hour in 0..23
+      print "#{timestamp.year} #{timestamp.month} #{timestamp.day} #{timestamp.hour} \n"
+      hour_vertex = Hour.create value_string: "March #{timestamp.day} #{timestamp.hour}:00", value: hour
+      TimeOf.create_edge from: day_vertex, to: hour_vertex
+      timestamp += Rational(1,24)  # + 1 hour
+    end
+    DayOf.create_edge from: month_vertex, to: day_vertex
+  end
+end
+
+
+create1month
+
+print "1 #{Month.all} \n \n"
+
+firstmonth = Month.first
+print "2 #{firstmonth.to_human} \n \n"
+print "2.5 #{firstmonth.value} \n \n"
+
+puts firstmonth.inspect
+days = firstmonth.out_day_of
+print "3 #{days.to_human} \n \n"
+
+first_day = firstmonth.out_day_of[0].in
+print "4 #{first_day.to_human} \n \n"
+
+puts Month.first.out_day_of[0].in.out_time_of[12].inspect
+thirteen_hour = firstmonth.out_day_of[0].in.out_time_of[12].in
+print "5 #{thirteen_hour.value} \n \n"
+print "6 #{thirteen_hour.to_human} \n \n"
+
+test2 = firstmonth["out_day_of"].map{|x| x["in"]}
+print "7 #{test2} \n \n"
+
+mon.add_edge_link name: "days", direction: "out", edge: "time_of"
+print "8 #{firstmonth.days.map{|x| x.value}} \n \n"
+
+print "9 #{firstmonth.days.value_string} \n \n"
+