active-orient 0.5 → 0.6

data/lib/other.rb

@@ -2,17 +2,36 @@
 
 class Array
   def to_orient
-    map &:to_orient
+    map( &:to_orient) # .join(',')
   end
 
   def from_orient
     map &:from_orient
   end
 
-  def method_missing(method)
-    unless method == :to_hash || method == :to_str
-      return self.map{|x| x.public_send(method)}
+  def method_missing(method, *key)
+    #if method == :to_int
+    #  return self.first 
+    #else 
+
+    unless method == :to_hash || method == :to_str #|| method == :to_int
+      return self.map{|x| x.public_send(method, *key)}
+   # end
+    end
+  end
+  # used to enable 
+  # def abc *key
+  # where key is a Range, an comma separated List or an item
+  # aimed to support #compose_where
+  def analyse
+    if first.is_a?(Range) 
+     first
+    elsif size ==1
+      first
+    else
+      self
     end
+
   end
 end
 
@@ -22,6 +41,20 @@ end
 #  end
 #end
 if RUBY_PLATFORM == 'java'
+
+## JavaMath:.BigDecimal does not premit mathematical operations
+## We convert it to RubyBigDecimal to represent it (if present in the DB) and upon loading from the DB
+
+class Java::JavaMath::BigDecimal
+  def to_f
+    BigDecimal.new self.to_s 
+  end
+
+  def from_orient
+    BigDecimal.new self.to_s
+  end
+  
+end
   class Java::ComOrientechnologiesOrientCoreDbRecordRidbag::ORidBag
     def from_orient
       to_a.from_orient
@@ -108,6 +141,9 @@ class Symbol
   def from_orient
     self
   end
+  def to_a
+    [ self ]
+  end
 end
 class FalseClass
   def from_orient
@@ -165,6 +201,7 @@ class NilClass
   def from_orient
     nil
   end
+
 end
 
 class Numeric
@@ -179,6 +216,10 @@ class Numeric
   def to_or
    "#{self.to_s}"
   end
+
+  def to_a
+    [ self ]
+  end
 end
 
 class String
@@ -186,6 +227,12 @@ class String
     self.sub(/^(.)/) { $1.capitalize }
   end
 
+  def where **args
+    if rid?
+      from_orient.where **args
+    end
+  end
+
   def from_orient
 	  if rid?
 	    ActiveOrient::Model.autoload_object self
@@ -233,7 +280,10 @@ class String
   def to_or
    quote
   end
-
+  
+  def to_a
+    [ self ]
+  end
 
     def quote
       str = self.dup

data/lib/rest/change.rb

@@ -51,11 +51,24 @@ Both set and where take multiple attributes
 Returns the JSON-Response.
 =end
 
-  def update_records o_class, set:, where: {}
-    url = "UPDATE #{classname(o_class)} SET #{generate_sql_list(set)} #{compose_where(where)}"
-    response = @res[URI.encode("/command/#{ActiveOrient.database}/sql/" << url)].post ''
+  def update_records o_class, set:{}, where: {}, remove: nil
+    logger.progname = 'RestChange#UpdateRecords'
+    url = if set.present?
+      "UPDATE #{classname(o_class)} SET #{generate_sql_list(set)} #{compose_where(where)}"
+    elsif remove.present?
+      "UPDATE #{classname(o_class)} remove #{remove} #{compose_where(where)}"
+    end
+    r = @res[URI.encode("/command/#{ActiveOrient.database}/sql/" << url)].post ''
+    count_of_updated_records = (JSON.parse( r))['result'].first['value']
+     ## remove all records of the class from cache
+    ActiveOrient::Base.display_rid.delete_if{|x,y| y.is_a? o_class } if count_of_updated_records > 0 && o_class.is_a?(Class)
+    count_of_updated_records # return_value
+    rescue Exception => e
+         logger.error{e.message}
+     nil
+
+    
   end
-  alias update_documents update_records
 
 # Lazy Updating of the given Record.
 

data/lib/rest/create.rb

@@ -8,24 +8,24 @@ module RestCreate
   Returns the name of the working-database
 =end
 
-  def create_database type: 'plocal', database: nil
+  def create_database type: 'plocal', database: 
     logger.progname = 'RestCreate#CreateDatabase'
-  	old_d = ActiveOrient.database
-  	ActiveOrient.database_classes = []
-  	ActiveOrient.database = database if database.present?
-  	begin
+    old_d = ActiveOrient.database
+    ActiveOrient.database_classes = []
+    ActiveOrient.database = database 
+    begin
       response = @res["database/#{ActiveOrient.database}/#{type}"].post ""
       if response.code == 200
-        logger.info{"Database #{ActiveOrient.database} successfully created and stored as working database"}
+	logger.info{"Database #{ActiveOrient.database} successfully created and stored as working database"}
       else
-        ActiveOrient.database = old_d
-        logger.error{"Database #{name} was NOT created. Working Database is still #{ActiveOrient.database}"}
+	logger.error{"Database #{ActiveOrient.database} was NOT created. Working Database is still #{ActiveOrient.database}"}
+	ActiveOrient.database = old_d
       end
     rescue RestClient::InternalServerError => e
+      logger.error{"Database #{ActiveOrient.database} was NOT created. Working Database is still #{ActiveOrient.database}"}
       ActiveOrient.database = old_d
-      logger.error{"Database #{name} was NOT created. Working Database is still #{ActiveOrient.database}"}
     end
-    ActiveOrient.database
+    ActiveOrient.database  # return_value
   end
 
   ######### CLASS ##########
@@ -86,7 +86,7 @@ creates a vertex-class, too, returns the Hash
 #and assign to this existing one.
 =end
   def create_classes *classes, &b
-    returt if classes.empty?
+    return if classes.empty?
 
     classes =  classes.pop if classes.size == 1
     consts = allocate_classes_in_ruby( classes , &b )
@@ -218,6 +218,7 @@ creates a vertex-class, too, returns the Hash
     attributes = yield if attributes.empty? && block_given?
     # @class must not quoted! Quote only attributes(strings)
     post_argument = {'@class' => classname(o_class)}.merge(attributes.to_orient)
+   # puts post_argument.inspect
     begin
       response = @res["/document/#{ActiveOrient.database}"].post post_argument.to_json
       data = JSON.parse(response.body)
@@ -227,10 +228,22 @@ creates a vertex-class, too, returns the Hash
       ActiveOrient::Model.orientdb_class(name: data['@class'], superclass: :find_ME).new data
       end
     rescue RestClient::InternalServerError => e
-      response = JSON.parse(e.response)['errors'].pop
-      logger.error{response['content'].split(':')[1..-1].join(':')}
-      logger.error{"No Object allocated"}
-      nil # return_value
+      sentence=  JSON.parse( e.response)['errors'].last['content']
+      puts sentence.to_s
+      if sentence =~ /found duplicated key/
+	rid = sentence.split("#").last
+	logger.info{ "found duplicated Key --> loaded #{rid} instead of creating "}
+	## reading database content -- maybe update attributes?
+	get_record rid
+      else
+	response = JSON.parse(e.response)['errors'].pop
+	logger.error{response['content'].split(':')[1..-1].join(':')}
+	logger.error{"No Object allocated"}
+	nil # return_value
+       end
+    rescue Errno::EADDRNOTAVAIL => e
+      sleep(2)
+      retry
     end
   end
   alias create_document create_record
@@ -312,6 +325,7 @@ The method returns the included or the updated dataset
 #   if what ==  :update
 #   do stuff with update
 # end
+# returns nil if no insert and no update was made, ie. the dataset is identical to the given attributes
 =end
   def upsert o_class, set: {}, where: {}   # :nodoc:   use Model#Upsert instead
     logger.progname = 'RestCreate#Upsert'
@@ -323,14 +337,12 @@ The method returns the included or the updated dataset
       specify_return_value =  block_given? ? "" : "return after @this"
       set.merge! where if where.is_a?( Hash ) # copy where attributes to set 
       command = "Update #{classname(o_class)} set #{generate_sql_list( set ){','}} upsert #{specify_return_value}  #{compose_where where}" 
-
-
-      #  puts "COMMAND: #{command} "
+    #    puts "COMMAND: #{command} "
       result = execute  tolerated_error_code: /found duplicated key/, raw: true do # To execute commands
 	[ { type: "cmd", language: 'sql', command: command}]
       end 
       result =result.pop if result.is_a? Array
-    #  puts "RESULT: #{result.inspect}, #{result.class}"
+      if result.is_a? Hash 
 	if result.has_key?('@class')
 	  if o_class.is_a?(Class) && o_class.new.is_a?(ActiveOrient::Model)
 	    o_class.new result
@@ -352,8 +364,10 @@ The method returns the included or the updated dataset
 	  logger.error{ "Unexpected result form Query \n  #{command} \n Result: #{result}" }
 	  raise ArgumentError
 	end
-
-      end
+      else
+	logger.debug{ "No Insert or Update nessesary \n #{command} " }
+    end
+    end
   end
   ############### PROPERTIES #############
 
@@ -402,8 +416,8 @@ The method returns the included or the updated dataset
     if block_given?# && count == all_properties_in_a_hash.size
       index = yield
       if index.is_a?(Hash)
-	  puts "index_class: #{o_class}"
-	  puts "index: "+index.inspect
+	 # puts "index_class: #{o_class}"
+	 # puts "index: "+index.inspect
 	if index.size == 1
 	  create_index o_class, name: index.keys.first, on: all_properties_in_a_hash.keys, type: index.values.first
 	else
@@ -448,7 +462,7 @@ The method returns the included or the updated dataset
     logger.progname = 'RestCreate#CreateIndex'
     begin
       c = classname o_class
-      puts "CREATE INDEX: class: #{c.inspect}"
+    #  puts "CREATE INDEX: class: #{c.inspect}"
       execute transaction: false do
     	  command = if on == :automatic
     		  "CREATE INDEX #{c}.#{name} #{type.to_s.upcase}"

data/lib/rest/delete.rb

@@ -47,9 +47,10 @@ module RestDelete
 	ActiveOrient.database_classes.delete(cl)
       end
     rescue RestClient::InternalServerError => e
-      if get_database_classes(requery: true).include?(cl)
+      sentence=  JSON.parse( e.response)['errors'].last['content']
+      if database_classes(requery: true).include?(cl)
 	logger.error{"Class #{cl} still present."}
-	logger.error{e.inspect}
+	logger.error{ sentence }
 	false
       else
 	logger.error{e.inspect}

data/lib/rest/operations.rb

@@ -24,32 +24,38 @@ module RestOperations
     result.first['COUNT'] rescue  0  # return_value
   end
 
-
-  def manipulate_relation record,  method, array, items  # :nodoc: #
-    execute_array = Array.new
-    method =  method.to_s.upcase
-
-    add_2_execute_array = -> (it) do
-      command = "UPDATE ##{record.rid} #{method} #{array} = #{it.to_orient } " #updating}"
-      command.gsub!(/\"/,"") if it.is_a? Array
-      #puts "COMMAND:: #{command}"
-      execute_array << {type: "cmd", language: "sql", command: command}
-    end
-
-    items.each{|x| add_2_execute_array[x] }
-    r= execute{ execute_array }
-
-    if r.present?
-      case  method
-      when 'ADD'
-	items.each{|x| record.attributes[array] << x}
-      when 'REMOVE'
-	items.map{|x| record.attributes[array].delete x.is_a?(ActiveOrient::Model) ? x.rid : x}
-      else
-      end
-      record.increment_version
-    end
-  end
+## historic method 
+#  def manipulate_relation record,  method, array, items  # :nodoc: #
+#    execute_array = Array.new
+#    method =  method.to_s.upcase
+#
+#    add_2_execute_array = -> (it) do
+#      command = "UPDATE ##{record.rid} #{method} #{array} = #{it.to_or } " #updating}"
+#      command.gsub!(/\"/,"") if it.is_a? Array
+#      puts "COMMAND:: #{command}"
+#      execute_array << {type: "cmd", language: "sql", command: command}
+#    end
+#
+#    items.to_a.each{|x| add_2_execute_array[x] }
+##    puts "******************"
+##    puts record.inspect
+##    puts "-----"
+##    puts execute_array.join('\n')
+#    r= execute{ execute_array }
+#    puts record.inspect
+#    puts r.inspect
+##    puts "******************"
+#    if r.present?
+#      case  method
+#      when 'ADD'
+#	items.each{|x| record.attributes[array] << x}
+#      when 'REMOVE'
+#	items.map{|x| record.attributes[array].delete x}
+#      else
+#      end
+#      record.increment_version
+#    end
+#  end
 =begin
 Executes a list of commands and returns the result-array (if present)
 
@@ -90,6 +96,7 @@ Multible statements are transmitted at once if the Block provides an Array of st
   def execute transaction: true, tolerated_error_code: nil, process_error: true, raw: nil # Set up for classes
     batch = {transaction: transaction, operations: yield}
     logger.progname= "Execute"
+#    puts "batch: #{batch[:operations]}"
     unless batch[:operations].blank?
       batch[:operations] = {:type=>"cmd", :language=>"sql", :command=> batch[:operations]} if batch[:operations].is_a? String
       batch[:operations] = [batch[:operations]] unless batch[:operations].is_a? Array
@@ -122,10 +129,13 @@ Multible statements are transmitted at once if the Block provides an Array of st
 	    raise
 	  end
 	end 
+      rescue Errno::EADDRNOTAVAIL => e
+	sleep(2)
+	retry
       end
       if response.present? && response.code == 200
         if response.body['result'].present?
-          result= JSON.parse(response.body)['result']
+          result=JSON.parse(response.body)['result']
 	  return result if raw.present?
           result.map do |x|
             if x.is_a? Hash

data/lib/rest/read.rb

@@ -113,8 +113,8 @@ module RestRead
     begin
       logger.progname = 'RestRead#GetRecords'
   	  url = "/query/#{ActiveOrient.database}/sql/" + query.compose(destination: :rest) + "/#{query.get_limit}"
-#	  puts "URL"
-#	  puts query.compose( destination: :rest).to_s
+	 # puts "REST_READ#GET_RECORDS.URL"
+	 # puts query.compose( destination: :rest).to_s
 #	  puts url.to_s
   	  response = @res[URI.encode(url)].get
 	  JSON.parse(response.body)['result'].map do |record|

data/lib/rest/rest.rb

@@ -53,7 +53,7 @@ A Sample:
   initialises the Database-Connection and publishes the Instance to any ActiveOrient::Model-Object
 =end
 
-    def initialize database: nil, connect: true, preallocate: true
+    def initialize database: nil, connect: true, preallocate: true, model_dir: nil
       self.logger = Logger.new('/dev/stdout') unless logger.present?
     #  self.default_server = {
     #    :server => 'localhost',
@@ -70,7 +70,8 @@ A Sample:
       database_classes # initialize @classes-array
       ActiveOrient::Model.orientdb = self 
       ActiveOrient::Model.db = self 
-      preallocate_classes  if preallocate
+      ActiveOrient::Model.keep_models_without_file ||= nil
+      preallocate_classes(model_dir)  if preallocate
 
     end
 
@@ -99,7 +100,7 @@ A Sample:
         if first_tentative
   	      logger.info{"Database #{database} NOT present --> creating"}
   	      first_tentative = false
-  	      create_database
+  	      create_database database: database
   	      retry
         else
   	      Kernel.exit

data/lib/support.rb

@@ -41,8 +41,12 @@ designs a list of "Key =  Value" pairs combined by "and" or the fillword provide
 		"#{key} = #{value.rrid}"
 	      when Numeric
           "#{key} = #{value}"
-	      when Array
-		"#{key}= #{value.to_orient}"
+	      when ::Array
+		"#{key} in [#{value.to_orient}]"
+	      when Range
+		"#{key} between #{value.first} and #{value.last} " 
+	      when DateTime
+		"#{key} = date(\'#{value.strftime("%Y%m%d%H%M%S")}\',\'yyyyMMddHHmmss\')"
 	      when Date
 		"#{key} = date(\'#{value.to_s}\',\'yyyy-MM-dd\')"
 	      else #  String, Symbol, Time, Trueclass, Falseclass ...
@@ -304,15 +308,17 @@ end
     def from arg = nil
       if arg.present?
 	@database = case arg
-		    when ActiveOrient::Model
+		    when ActiveOrient::Model   # a single record
 		      arg.rrid
-		    when OrientQuery
+		    when OrientQuery	      # result of a query
 		      ' ( '+ arg.to_s + ' ) '
+		    when Class
+		      arg.ref_name
 		    else
-		      if arg.to_s.rid?
+		      if arg.to_s.rid?	  # a string with "#ab:cd"
 			arg
-		      else
-			ORD.classname(arg)
+		      else		  # a databas-class-name
+			arg.to_s  
 		      end
 		    end
 	compose  # return the complete query
@@ -360,15 +366,12 @@ end
     end
 
     def distinct d
-  	  @projection << case d
+  	  @projection <<  case d
   		when String, Symbol
   		  "distinct( #{d.to_s} )"
-  		when Array
-  		  "distinct( #{d.first} ) as #{d.last}"
-  		when Hash
-  		  "distinct( #{d.first.first} ) as #{d.first.last}"
-  		else
-  		  ""
+		else
+		  dd= d.to_a.flatten
+  		  "distinct( #{dd.first.to_s} ) as #{dd.last}"
   		end
   	  compose  # return the hole query
     end
@@ -419,8 +422,6 @@ end
       unless @order.empty?
 	# the [@order] is nessesary to enable query.order= "..." oder query.order= { a: :b }
 	"order by " << [@order].flatten.map do |o|
-	  #puts "CLASS : "+o.class.to_s
-	  #puts o.to_s
 	  case o
 	  when String, Symbol, Array
 	    o.to_s