active-orient 0.79 → 0.80

data/graphs.txt

@@ -0,0 +1,70 @@
+Graphen
+======
+
+Die Felder `in` und   `out` bündeln die Verknüpfungen zu anderen Vertices.
+
+Die Verknüpfungen erfolgen über `Edges`, die wiederum Eigenschaften haben. Zuerst sind die `Edges` Klassen und
+unterscheiden sich üder den Namen. Zusätzlich besteht Vererbung. 
+
+Beispielgraph
+    @db.create_vertex_class  :v1 
+    @db.create_class( :v2 ){ V1 } 
+		@db.create_edge_class "e1"
+		@db.create_class( :e2 ){ E1 }
+		@db.create_class( :e3 ){ E1 }
+
+		vertices =  (1..10).map{|y| V2.create node: y}
+		E2.create from: V1.create( item: 1  ), to: vertices
+
+    v1 = V.first.to_human => "<V1[#25:0]: out: {E2=>10}, item : 1>" 
+		v2 = V.last.to_human  => "<V2[#40:0]: in: {E2=>1}, node : 8>" 
+  
+Boardmittel von ActiveOrient
+----------------------------
+    
+##  Edges anlisten
+		
+	#### Nur Links
+		
+		v1.edges  => ["#49:0", "#50:0", "#51:0", "#52:0", "#53:0", "#54:0", "#55:0", "#56:0", "#49:1", "#50:1"]
+		v2.edges  => ["#56:0"] 
+
+
+	#### Auflösung der Objekte
+
+		v2.in.map &:to_human => ["<E2: in : #<V2:0x000000000397fcb8>, out : #<V1:0x0000000002ed0060>>"] 
+
+  ####  Verfügbare Methoden
+		v2.in      v2.in_e   v2.in_e2		v2.in_e2= 	v2.in_edges 
+
+
+  ### Selektive Auswahl
+
+	Beispiel: TimeGrid
+
+	Der Vertex hat folgende Struktur
+
+		t.to_human
+		 => "<Tag[82:8927]: in: {TG::DAY_OF=>1, TG::GRID_OF=>1}, out: {ML::L_OHLC=>1, TG::GRID_OF=>1}, value : 25>" 
+
+	dann listet t.detect_edges :out, /ml/ die Edges der ML-Klassen auf:
+	 
+		t.detect_edges( :out , /ml/).to_human
+		 => ["<L_OHLC[#151:16] -i-> #161:22 {  } -o-> #82:8927>"] 
+		
+
+	#### Node
+	
+	Ein Node ist ein direkt über eine Edge verbundener Vertex
+
+		 Q =  OrientSupport::OrientQuery
+	   s= Q.new projection: "expand( outE('e1').in[node <5])"
+		 s.from = '#25:0'
+		 s.to_s => select expand( outE('v1').in[node <5]) from #25:0 
+	
+	Aufruf in OrientQuery:  Q.node Edge_class, condition
+	
+	Fügt den Node in das Porjections-Array ein.
+  
+		 
+

data/lib/active-orient.rb

@@ -31,6 +31,7 @@ require 'active_model'
 require_relative "support/orientquery.rb"
 require_relative "support/conversions.rb"
 #require_relative "support/logging.rb"
+require_relative "support/errors.rb"
 require_relative "base.rb"
 require_relative "base_properties.rb"
 require_relative "support/orient.rb"
@@ -55,6 +56,7 @@ require_relative "railtie" if defined?(Rails)
 
 module  ActiveOrient
 mattr_accessor :database
+mattr_accessor :db_pool
 mattr_accessor :database_classes
 mattr_accessor :default_server
 

data/lib/base.rb

@@ -29,6 +29,7 @@ module  ActiveOrient
   Any Change of the Object is thus synchonized to any allocated variable.
 =end
     @@rid_store = Hash.new
+		@@mutex = Mutex.new
 
     def self.display_rid
       @@rid_store
@@ -43,8 +44,14 @@ thus a string or a Model-Object is accepted
 =end
 
     def self.remove_rid obj
-      @@rid_store.delete obj.rid if obj.rid.present?
-    end
+			if obj &.rid.present?
+			@@mutex.synchronize do 
+				@@rid_store.delete obj.rid     
+			end
+			else
+				logger.error "Cache entry not removed: #{obj} "
+			end
+		end
 
     def self.get_rid rid
       rid =  rid[1..-1] if rid[0]=='#'
@@ -63,17 +70,20 @@ and the cached obj is returned
   
 =end
     def self.store_rid obj
-      if obj.rid.present? && obj.rid.rid?
-	 if @@rid_store[obj.rid].present?
-		    @@rid_store[obj.rid].transfer_content from: obj
-	  else
-		 @@rid_store[obj.rid] =   obj
-	  end
-	 @@rid_store[obj.rid] 
-      else
-	nil 
-      end
-    end
+
+			@@mutex.synchronize do 
+				if obj.rid.present? && obj.rid.rid?
+					if @@rid_store[obj.rid].present?
+						@@rid_store[obj.rid].transfer_content from: obj
+					else
+						@@rid_store[obj.rid] =   obj
+					end
+					@@rid_store[obj.rid] 
+				else
+					obj 
+				end
+			end
+		end
 
 
     # rails compatibility
@@ -91,7 +101,7 @@ The model instance fields are then set automatically from the opts Hash.
 		def initialize attributes = {}, opts = {}
 			logger.progname = "ActiveOrient::Base#initialize"
 			@metadata = Hash.new # HashWithIndifferentAccess.new
-			@d =  nil
+			@d =  nil if RUBY_PLATFORM == 'java' && attributes.is_a?( Document )
 			run_callbacks :initialize do
 				if RUBY_PLATFORM == 'java' && attributes.is_a?( Document )
 					@d = attributes
@@ -201,7 +211,17 @@ The model instance fields are then set automatically from the opts Hash.
 
 			iv = attributes[key]
 			if my_metadata( key: key) == "t"
-				iv =~ /00:00:00/ ? Date.parse(iv) : DateTime.parse(iv)
+				# needed in case of 
+				#  obj.date =  {some-date}
+				#  --> perfrom an action on the date without saving prior
+				case iv
+				when String
+				iv =~ /00:00:00/ ? Date.parse(iv) : DateTime.parse(iv) 
+				when Date, DateTime
+			    iv
+				else
+				raise "incompatable type used: #{iv} (#{iv.class}) -- Date or DateTime required"	 
+				end
 			elsif my_metadata( key: key) == "x"
 				iv = ActiveOrient::Model.autoload_object iv
 			elsif iv.is_a? Array
@@ -227,9 +247,9 @@ The model instance fields are then set automatically from the opts Hash.
 															 when Array
 																 if val.first.is_a?(Hash)
 																	 v = val.map{ |x| x }
-																	 OrientSupport::Array.new(work_on: self, work_with: v )
+																	 OrientSupport::Array.new(work_on: self, work_with: v ){ key_to_sym }
 																 else
-																	 OrientSupport::Array.new(work_on: self, work_with: val )
+																	 OrientSupport::Array.new(work_on: self, work_with: val ){ key_to_sym }
 																 end
 															 when Hash
 																 if val.keys.include?("@class" )
@@ -280,6 +300,7 @@ The model instance fields are then set automatically from the opts Hash.
 #    end
 #
 =begin
+(Experimental)
 Exclude some properties from loading via get, reload!, get_document, get_record
 =end
     def self.exclude_the_following_properties *args

data/lib/base_properties.rb

@@ -8,19 +8,19 @@ module ActiveOrient
 
 # Default presentation of ActiveOrient::Model-Objects
 
-    def to_human
-      "<#{self.class.to_s.demodulize}: " + content_attributes.map do |attr, value|
-	v= case value
-	   when ActiveOrient::Model
-	     "< #{self.class.to_.demodulize} : #{value.rrid} >"
-		 when OrientSupport::Array
-			 value.rrid #.to_human #.map(&:to_human).join("::")
-	   else
-	     value.from_orient
-	   end
-        "%s : %s" % [ attr, v]  unless v.nil?
-      end.compact.sort.join(', ') + ">".gsub('"' , ' ')
-    end
+		def to_human
+			"<#{self.class.to_s.demodulize}: " + content_attributes.map do |attr, value|
+				v= case value
+					 when ActiveOrient::Model
+						 "< #{self.class.to_.demodulize} : #{value.rrid} >"
+					 when OrientSupport::Array
+						 value.rrid #.to_human #.map(&:to_human).join("::")
+					 else
+						 value.from_orient
+					 end
+				"%s : %s" % [ attr, v]  unless v.nil?
+			end.compact.sort.join(', ') + ">".gsub('"' , ' ')
+		end
 
 # Comparison support
 
@@ -30,8 +30,9 @@ module ActiveOrient
         attr.to_s =~ /(_count)\z/ || attr.to_s =~ /^in_/ || attr.to_s =~ /^out_/ || [:created_at, :updated_at, :type, :id, :order_id, :contract_id].include?(attr.to_sym)
       end]
     end
-
 # return a string ready to include as embedded document
+# used by Model.to_or 
+#
 		def embedded
 			{ "@type" => 'd', "@class" => self.class.ref_name }
 			            .merge(content_attributes)

data/lib/class_utils.rb

@@ -3,6 +3,8 @@ module ClassUtils
 
 =begin
   Returns a valid database-class name, nil if the class does not exists
+
+	works on the cached hash (ActiveOrient.database_classes)
 =end
 
   def classname name_or_class  # :nodoc:
@@ -21,9 +23,11 @@ module ClassUtils
 	     end
 	   end
   end
-	def allocate_class_in_ruby db_classname, &b
-		# retrieve the superclass recursively
 
+	# Updates ActiveOrient.database_classes
+	def allocate_class_in_ruby db_classname, &b
+		 
+		#  first retrieve the superclass recursively
 		unless ActiveOrient.database_classes[ db_classname ].is_a? Class
 
 			s = get_db_superclass( db_classname )
@@ -46,10 +50,9 @@ module ClassUtils
 									elsif ActiveOrient::Model.namespace.send( :const_get, classname).ancestors.include?( ActiveOrient::Model )
 										ActiveOrient::Model.namespace.send( :const_get, classname)
 									else
-										t= ActiveOrient::Model.send :const_set, classname, Class.new( superclass )
-										logger.warn{ "Unable to allocate class #{classname} in Namespace #{ActiveOrient::Model.namespace}"}
-										logger.warn{ "Allocation took place with namespace ActiveOrient::Model" }
-										t
+										logger.error{ "Unable to allocate class #{classname} in Namespace #{ActiveOrient::Model.namespace}"}
+										logger.error{ "Allocation took place with namespace ActiveOrient::Model" }
+										ActiveOrient::Model.send :const_set, classname, Class.new( superclass )
 									end
 			the_class.ref_name = db_classname
 			keep_the_dataset = block_given? ? yield( the_class ) : true
@@ -70,7 +73,7 @@ module ClassUtils
 				nil  # return-value
 			end
 		else
-			# return previosly allocated ruby-class
+			# return previously allocated ruby-class
 			ActiveOrient.database_classes[db_classname] 
 		end
 	end
@@ -161,60 +164,18 @@ Creates one or more edge-classes and allocates the provided properties to each c
     r = name.map{|n| create_class( n.to_s, properties: properties){ E  } }
     r.size == 1 ? r.pop : r  # returns the created classes as array if multible classes are provided
   end
-=begin
-
-creates a vertex
-
-=end
-  def create_vertex( o_class, attributes:{} )
-
-		begin
-			response = execute(transaction: false, tolerated_error_code: /found duplicated key/) do
-				"CREATE VERTEX #{classname(o_class)} CONTENT #{attributes.to_orient.to_json}"
-			end
-			if response.is_a?(Array) && response.size == 1
-				response.pop # RETURN_VALUE
-			else
-				response  # return value (the normal case)
-			end
-		rescue ArgumentError => e
-			puts "CreateVertex:ArgumentError "
-			puts e.inspect
-		end  # begin
-
-	end
 
-=begin
-Deletes the specified vertices and unloads referenced edges from the cache
-=end
-  def delete_vertex *vertex
-    create_command =  -> do
-      { type: "cmd",
-	  language: 'sql',
-	  command: "DELETE VERTEX #{vertex.map{|x| x.to_orient }.join(',')} "
-		      }
-      end
-
-    vertex.each{|v| v.edges.each{| e | remove_record_from_hash e} }
-    execute{ create_command[] }
-  end
 
 =begin
 Deletes the specified edges and unloads referenced vertices from the cache
 =end
   def delete_edge *edge
-    create_command =  -> do
-      { type: "cmd",
-	  language: 'sql',
-	  command: "DELETE EDGE #{edge.map{|x| x.to_orient }.join(',')} "
-		      }
-      end
 
     edge.each do |r|
       [r.in, r.out].each{| e | remove_record_from_hash e}
       remove_record_from_hash r
     end
-    execute{ create_command[] }
+	  execute{ "DELETE EDGE #{edge.map{|x| x.to_orient }.join(',')} "}
   end
 
   private

data/lib/database_utils.rb

@@ -13,7 +13,7 @@ if abstract: true is given, only basic classes (Abstact-Classes) are returend
 		## "ORid" dropped in V2.2
 		extended = ["OIdentity","ORole",  "OUser", "OFunction", "_studio"]
 		v3 = ["OGeometryCollection", "OLineString", "OMultiLineString", "OMultiPoint", "OMultiPolygon",
-		"OPoint", "OPolygon", "ORectangle", "OShape"] ## added in Orentdb 3.0
+		"OPoint", "OPolygon", "ORectangle", "OShape", 'OSecurityPolicy'] ## added in Orentdb 3.0 and 3.1
 		if abstract
 			basic
 		else
@@ -33,7 +33,7 @@ To retrieve the class hierarchy from Objects avoid calling `ORD.classname (obj)`
 =end
 
 	def class_hierarchy base_class: '',  system_classes: nil
-		@actual_class_hash = get_classes('name', 'superClass') #if requery || @all_classes.blank?
+#		@actual_class_hash = get_classes('name', 'superClass') #if requery || @all_classes.blank?
 		fv = ->( s )	{ 	@actual_class_hash.find_all{|x| x['superClass']== s}.map{|v| v['name']} }
 		fx = ->( v )  {		fv[v.strip].map{|x| ar = fx[x]; ar.empty? ? x : [x, ar]} }
 		if system_classes.present?
@@ -45,13 +45,15 @@ To retrieve the class hierarchy from Objects avoid calling `ORD.classname (obj)`
 
 
 =begin
-Returns an array with all names of the classes of the database. Uses a cached version if possible.
+
+Returns an array with all names of the classes of the database.
+
+Reads the database-structure and updates the @actual_class_hash (used by class_hierachy and get_db_superclass )
   
-Parameters: system_classes: false|true, requery: false|true
 =end
 
-  def database_classes system_classes: nil, requery: false
-    class_hierarchy system_classes: system_classes #requery: true
+  def database_classes system_classes: nil
+		@actual_class_hash = get_classes('name', 'superClass') 
     all_classes = get_classes('name').map(&:values).sort.flatten
     all_user_classes =  all_classes - system_classes()
 
@@ -65,8 +67,8 @@ Service-Method for Model#OrientdbClass
 =end
 
   def get_db_superclass name   #:nodoc:
-    @actual_class_hash = get_classes( 'name', 'superClass') if @actual_class_hash.nil? 
-   z= @actual_class_hash.find{|x,y|  x['name'] == name.to_s }
+#    @actual_class_hash = get_classes( 'name', 'superClass') if @actual_class_hash.nil? 
+   z= @actual_class_hash.find{|x,y|  x['name'] == name.to_s } 
    z['superClass'] unless z.nil?
   end
 
@@ -74,24 +76,23 @@ Service-Method for Model#OrientdbClass
 preallocate classes reads any class from the  @classes-Array and allocates adequat Ruby-Objects
 =end
 	def preallocate_classes   from_model_dir= nil  # :nodoc:
-		# always scan for E+V model-file and include
+		# always scan for E+V model-files and include
 		[E,V].each{|y| y.require_model_file(from_model_dir) }
 
 		ActiveOrient.database_classes.each do | db_name, the_class |
 			allocate_class_in_ruby( db_name ) do |detected_class|
-			keep_the_dataset =  true
-			# keep the class if it is already noted in database_classes 
-		 if	![E,V].include?(detected_class) &&
-				!ActiveOrient.database_classes.key( detected_class) && 
-				!detected_class.require_model_file(from_model_dir) &&
-			  !ActiveOrient::Model.keep_models_without_file  
-	
-				logger.info{ "#{detected_class.name} -->  Class NOT allocated"}
-				ActiveOrient.database_classes[ detected_class.ref_name ] = "no model file"
-				keep_the_dataset = false 
-			end
-			keep_the_dataset # return_value
-		end  # block
+				# keep the class if it is already noted in database_classes 
+        if [E,V].include?(detected_class) ||
+						 ActiveOrient.database_classes.key( detected_class) || 
+						 detected_class.require_model_file(from_model_dir) ||
+						 ActiveOrient::Model.keep_models_without_file  
+					true	#  return_value
+				else
+					logger.info{ "#{detected_class.name} -->  Class NOT allocated"}
+					ActiveOrient.database_classes[ detected_class.ref_name ] = "no model file"
+					false 	#  return_value
+				end
+			end  # block
 		end  # each iteration
 	end	# def
 

data/lib/init.rb

@@ -37,7 +37,7 @@ returns the active OrientDB-Instance
 		def self.connect **defaults
 				define_namespace  namespace: :object 
 				ActiveOrient::OrientDB.configure_logger defaults[:logger]
-        ao = ActiveOrient::OrientDB.new  defaults.merge preallocate: false
+        ao = ActiveOrient::OrientDB.new  **(defaults.merge( preallocate: false))
 				ao.create_class 'E'
 				ao.create_class 'V'
 				ao  # return client instance
@@ -45,7 +45,8 @@ returns the active OrientDB-Instance
 =begin
 Parameters: 
  yml: hash from config.yml , 
- namespace: Class to use as Namespace
+ namespace: Class to use as Namespace, one of [ :self, :object, :active_orient ]
+
 
 A custom Constant can be provided via Block
 
@@ -55,7 +56,7 @@ i.e.
   #or
   ActiveOrient.Init.define_namespace namespace: :self | :object | :active_orient
 	#or
-	module IBi; end # first declare the Module-Const
+	module IB; end # first declare the Module-Const
   # then assign to the namespace
   ActiveOrient.Init.define_namespace { IB }