active-orient 0.5 → 0.6

data/lib/model/the_record.rb

@@ -45,10 +45,15 @@ ActiveOrient::Model-Object or an Array of Model-Objects as result.
   def query query
     
     sql_cmd = -> (command) {{ type: "cmd", language: "sql", command: command }}
-    orientdb.execute do
+    result = orientdb.execute do
       sql_cmd[query.to_s]
     end
-  end
+    if result.is_a? Array
+      OrientSupport::Array.new work_on: self, work_with: result
+    else
+      result
+    end  # return value
+   end
 
 =begin
 queries the database starting with the current model-record.
@@ -97,7 +102,6 @@ Returns the result-set, ie. a Query-Object which contains links to the addressed
   def update_item_property method, array, item = nil, &ba # :nodoc:
  #   begin
       logger.progname = 'ActiveOrient::Model#UpdateItemToProperty'
-      #self.attributes[array] = OrientSupport::Array.new(self) unless attributes[array].present?
       self.attributes[array] = Array.new unless attributes[array].present?
 
       items = if item.present?
@@ -106,10 +110,6 @@ Returns the result-set, ie. a Query-Object which contains links to the addressed
 		yield
 	      end
       db.manipulate_relation self, method, array, items
-      #rescue RestClient::InternalServerError => e
-#	logger.error{"Duplicate found in #{array}"}
-#	logger.error{e.inspect}
-#      end
     end
 =begin
 Add Items to a linked or embedded class
@@ -156,36 +156,42 @@ If only single Items are to insert, use
 
 =end
 
-  def add_item_to_property array, item = nil, &b
-    items = block_given? ? yield : nil
-    update_item_property "ADD", array, item, &b
-    self # return_value
+  def add_item_to_property array, *item
+       item =  yield if block_given?
+	if attributes.keys.include? array.to_s
+	  item.each{|x| self.attributes[array].push x.to_orient }
+	  update
+	else
+	  update array=> item 
+	end	
+#  rescue NoMethodError
+    #undefined method `<<' for nil:NilClass
+
   end
-#  alias add_items_to_property add_item_to_property
-  ## historical aliases
-#  alias update_linkset  add_item_to_property
-#  alias update_embedded  add_item_to_property
 
-  def set_item_to_property array, item = nil, &b
-    update_item_property "SET", array, item, &b
+
+  def set_item_to_property array, *item
+      update  array.to_s => item
   end
 
-  def remove_item_from_property array, item = nil, &b
-    update_item_property "REMOVE", array, item, &b
-    if block_given?
-        items =  yield
-        items.each{|x| self.attributes[array].delete(x)}
-    elsif item.present?
-        a = attributes
-        a.delete item
-        self.attributes[array].delete(item)
+  def remove_position_from_property array, *pos
+      if attributes[array].is_a? Array
+        pos.each{|x| self.attributes[array].delete_at( x )}
+	update
+      end
+  end
+  def remove_item_from_property array, *item 
+      if attributes[array].is_a? Array
+        item.each{|x| self.attributes[array].delete( x.to_orient )}
+	update
+      else
+	logger.error  "Wrong attribute: #{attributes[array]}"
       end
-    self # return_value
   end
 
   ############# DELETE ###########
 
-#  Removes the Model-Instance from the databasea
+#  Removes the Model-Instance from the database
 #  todo:  overloaded in vertex and edge
 
 def remove 
@@ -193,8 +199,6 @@ def remove
   ActiveOrient::Base.remove_rid self ##if is_edge? # removes the obj from the rid_store
 end
 
-## delete works for any model-class
-## it calls delete_record and does not check for dependencies
 alias delete remove
 
 ########### UPDATE ############
@@ -207,23 +211,41 @@ alias delete remove
     obj = ActiveOrient::Model::Contracts.first
     obj.name =  'new_name'
     obj.update set: { yesterdays_event: 35 }
+
+ ** note: The keyword »set« is optional
 =end
 
-  def update set: {}
+  def update set: {}, **args
     logger.progname = 'ActiveOrient::Model#Update'
     self.attributes.merge!(set) if set.present?
-    self.attributes['updated_at'] =  Time.new
-    updated_dataset = db.update self, attributes, @metadata[:version]
-    # if the updated dataset changed, drop the changes made siently
-    if updated_dataset.is_a? ActiveOrient::Model
-    self.version =  updated_dataset.version
-    updated_dataset # return_value
+    self.attributes.merge!(args) if args.present?
+    self.attributes['updated_at'] =  DateTime.now
+    if rid.rid?
+      updated_dataset = db.update self, attributes, @metadata[:version]
+      # if the updated dataset changed, drop the changes made siently
+      if updated_dataset.is_a? ActiveOrient::Model
+	self.version =  updated_dataset.version
+	updated_dataset # return_value
+      else
+	logger.error("Version Conflict: reloading database values")
+	reload!
+      end
     else
-    logger.error("Version Conflict: reloading database values")
-    reload!
+      save 
     end
 
   end
+
+# mocking active record, overrides the base-class-method
+  def update_attribute the_attribute, the_value
+    update set: {the_attribute => the_value }
+    super the_attribute, the_value
+  end
+
+  def update_attributes **args
+    update set: args
+  end
+
   ########## SAVE   ############
  
 =begin
@@ -237,7 +259,7 @@ def save
   if rid.rid?
     update
   else
-     db_object=  DB.create_record  self, attributes: attributes 
+     db_object=  db.create_record  self, attributes: attributes 
      @metadata[:cluster], @metadata[:record] = db_object.rid[0,db_object.rid.size].split(':').map( &:to_i)
      reload! db_object
   end
@@ -250,7 +272,7 @@ end
   def reload! updated_dataset = nil
     updated_dataset = db.get_record(rid) if updated_dataset.nil?
     @metadata[:version] = updated_dataset.version
-    attributes = updated_dataset.attributes
+    self.attributes = updated_dataset.attributes
     self  # return_value  (otherwise only the attributes would be returned)
   end
 
@@ -294,16 +316,6 @@ How to handle other calls
       raise NameError
     end
   end
-  # rescue NameError => e
-  #   logger.progname = 'ActiveOrient::Model#MethodMissing'
-  #   if args.size == 1
-  #     logger.error{"Unknown Attribute: #{args.first} "}
-  #   else
-  #     logger.error{"Unknown Method: #{args.map{|x| x.to_s}.join(" / ")} "}
-  #   end
-  #   puts "Method Missing: Args: #{args.inspect}"
-  #   print e.backtrace.join("\n")
-  #   raise
 #end
 
 

data/lib/model/vertex.rb

@@ -1,16 +1,85 @@
 class V   < ActiveOrient::Model
   ## link to the library-class
-  # create 
-  # seems not to be nessesary as its identically to the universal create
-
  
-  # to do
+=begin
+Vertex#delete fires a "delete edge" command to the database.
+The where statement can be empty ( "" or {}"), then all vertices are removed 
+
+The rid-cache is reseted, too
+=end
+  def self.delete where: 
+    db.execute { "delete vertex #{ref_name} #{db.compose_where(where)}" }
+    reset_rid_store
+  end
+
+  def detect_inherent_edge kind,  edge_name  # :nodoc:
+    ## returns a list of inherented classes
+    get_superclass = ->(e) do
+      n = ORD.get_db_superclass(e)
+      n =='E' ? e : e + ',' + get_superclass[n]
+    end
+    if edge_name.present?
+    e_name =  edge_name.is_a?( Class) ? edge_name.ref_name : edge_name.to_s
+    the_edge = @metadata[:edges][kind].detect{|y| get_superclass[y].split(',').detect{|x| x == edge_name } }
+    
+    candidate= attributes["#{kind.to_s}_#{the_edge}"]
+    candidate.present?  ? candidate.map( &:from_orient ) : []
+    else
+      edges(kind).map &:from_orient
+    end
+  end
+=begin
+»in« and »out« provide the main access to edges.
+
+If called without a parameter, all edges connected are displayed.
+
+If called with a string, symbol or class, the edge-class is resolved and even inherented 
+edges are retrieved.
+
+=end
+
+  def in edge_name= nil
+    detect_inherent_edge :in, edge_name
+  end
+	
+  def out edge_name =  nil
+    detect_inherent_edge :out, edge_name
+  end
+=begin
+retrieves  connected edges
+
+The basic ussage is to fetch all/ incomming/ outgoing edges
+
+  Model-Instance.edges :in # :out | :all
+
+One can filter specific edges by providing parts of the edge-name
+
+  Model-Instance.edges 'in_sector'
+  Model-Instance.edges /sector/
+
+returns an array of rid's 
 
-  # def delete
-  # delete an edge (as class method) 
-  # and 
-  # def remove
-  # delete an edge (as instance method)
+example:
+
+  Industry.first.attributes.keys
+   => ["in_sector_classification", "k", "name", "created_at", "updated_at"]  # edge--> in ...
+
+  Industry.first.edges :out
+    => []
+
+  Industry.first.edges :in
+  => ["#61:0", "#61:9", "#61:21", "#61:33", "#61:39", "#61:93", "#61:120", "#61:150", "#61:240", "#61:252", "#61:264", "#61:279", "#61:303", "#61:339" ...]
+  
+
+
+To fetch the associated records use the ActiveOrient::Model.autoload_object method
+  
+  ActiveOrient::Model.autoload_object Industry.first.edges( :in).first	
+  # or
+  Industry.autoload_object Industry.first.edges( /sector/ ).first
+   => #<SectorClassification:0x00000002daad20 @metadata={"type"=>"d", "class"=>"sector_classification", "version"=>1, "fieldTypes"=>"out=x,in=x", "cluster"=>61, "record"=>0},(...)
+
+=end
   
   def edges kind=:all  # :all, :in, :out 
     expression = case kind
@@ -20,11 +89,46 @@ class V   < ActiveOrient::Model
 		   /^in/ 
 		 when :out
 		   /^out/ 
-    end
+		 when String
+		   /#{kind}/
+		 when Regexp
+		   kind
+		 else
+		   return  []
+		 end
+
     edges = attributes.keys.find_all{ |x| x =~  expression }
     edges.map{|x| attributes[x]}.flatten
   end
 
+=begin
+»in_edges« and »out_edges« are shortcuts to »edges :in« and »edges :out«
+
+Its easy to expand the result:
+  tg.out( :ohlc).out.out_edges
+   => [["#102:11032", "#121:0"]] 
+   tg.out( :ohlc).out.out_edges.from_orient
+   => [[#<TG::GRID_OF:0x00000002620e38
+
+this displays the out-edges correctly
+
+whereas
+tg.out( :ohlc).out.edges( :out)
+ => [["#101:11032", "#102:11032", "#94:10653", "#121:0"]] 
+
+returns all edges. The parameter (:out) is not recognized, because out is already a nested array.
+
+this
+  tg.out( :ohlc).first.out.edges( :out)
+is a walkaround, but using in_- and out_edges is more  elegant.
+=end
+  def in_edges
+    edges :in
+  end
+  def out_edges
+    edges :out
+  end
+
   def remove
     db.delete_vertex self
   end

data/lib/orient.rb

@@ -35,11 +35,8 @@ Append the argument to the Array, changes the Array itself.
 
 The change is transmitted to the database immediately
 =end
-    def << arg
-#      print "\n <<---> #{@name}, #{arg} <--- \n"
-      if @name.present?
-	@orient.add_item_to_property(@name, arg)
-      end
+    def << *arg
+      @orient.add_item_to_property(@name, *arg) if @name.present?
       super
     end
 
@@ -54,33 +51,32 @@ The change is transmitted to the database immediately
       @orient.update set: {@name => self} if @name.present?
     end
 
-    def [] *arg
-      super
-    end
-
-    def delete_at *pos
-      if @name.present?
-        delete self[*pos]
-      else
-	      super
-      end
+#    def [] *arg
+#      #puts "ARG #{arg}"
+#      super
+#    end
+#
+=begin
+Remove_at performs Array#delete_at
+=end
+    def remove_at *pos
+      @orient.remove_position_from_property(@name,*pos) if @name.present?
     end
 
-    def delete_if
-      if @name.present?
-        delete *self.map{|y| y if yield(y)}.compact  # if the block returns true then delete the item
-      else
-	      super
-      end
-    end
+#
+#    alias :del_org :delete 
+=begin
+Remove performs Array#delete 
 
-    def delete *item
-      @orient.remove_item_from_property(@name){item} if @name.present?
+If the Array-element is a link, this is removed, the linked table is untouched
+=end
+    def remove  *item
+      @orient.remove_item_from_property(@name,*item) if @name.present?
     end
-
+###
     ## just works with Hashes as parameters
     def where *item
-      where_string = item.map{|m| where_string = compose_where m}.join(' and ')
+      where_string = item.map{|m| where_string = compose_where( m ) }.join(' and ')
        subquery= OrientSupport::OrientQuery.new from: @orient, projection: "expand( #{@name})"
        q= OrientSupport::OrientQuery.new from: subquery, where: item
 #      query = "SELECT FROM ( SELECT EXPAND( #{@name} ) FROM #{@orient.classname})  #{where_string} "
@@ -93,12 +89,11 @@ The change is transmitted to the database immediately
     end
 
     def method_missing *args
-      begin
-        map{|x| x.send args.first}
+      
+        map{|x| x.send *args }
       rescue NoMethodError => e
         logger.progname = "OrientSupport::Array#MethodMissing"
         logger.error{"Undefined method: #{e.message}"}
-      end
     end
 
   end #Class
@@ -150,10 +145,6 @@ The change is transmitted to the database immediately
 
     end
 
-#    def << 
-  
-
-#    def to_orient
 #     self
 #    end
 

data/lib/orientdb_private.rb

@@ -13,36 +13,36 @@ module OrientDbPrivate
 		end
 	end
 
-	# def property_uri this_classname
-	#   if block_given?
-	#     "property/#{@database}/#{this_classname}/" << yield
-	#   else
-	#     "property/#{@database}/#{this_classname}"
-	#   end
-	# end
-	#
-	# def self.simple_uri *names
-	#   names.each do |name|
-	#     m_name = ("#{name.to_s}_uri").to_sym
-	#     define_method(m_name) do |&b|
-	#       if b
-	#         "#{name.to_s}/#{@database}/#{b.call}"
-	#       else
-	#         "#{name.to_s}/#{@database}"
-	#       end # branch
-	#     end
-	#   end
-	# end
-	#
-	# def self.sql_uri *names
-	#   names.each do |name|
-	#     define_method(("#{name.to_s}_sql_uri").to_sym) do
-	#       "#{name.to_s}/#{@database}/sql/"
-	#     end
-	#   end
-	# end
-	#
-	# simple_uri :database, :document, :class, :batch, :function
-	# sql_uri :command, :query
+	 def property_uri this_classname
+	   if block_given?
+	     "property/#{@database}/#{this_classname}/" << yield
+	   else
+	     "property/#{@database}/#{this_classname}"
+	   end
+	 end
+	
+	 def self.simple_uri *names
+	   names.each do |name|
+	     m_name = ("#{name.to_s}_uri").to_sym
+	     define_method(m_name) do |&b|
+	       if b
+	         "#{name.to_s}/#{@database}/#{b.call}"
+	       else
+	         "#{name.to_s}/#{@database}"
+	       end # branch
+	     end
+	   end
+	 end
+	
+	 def self.sql_uri *names
+	   names.each do |name|
+	     define_method(("#{name.to_s}_sql_uri").to_sym) do
+	       "#{name.to_s}/#{@database}/sql/"
+	     end
+	   end
+	 end
+	
+	 simple_uri :database, :document, :class, :batch, :function
+	 sql_uri :command, :query
 
 end