active-orient 0.6 → 0.42

data/VERSION

@@ -1 +1 @@
-0.6
+0.42

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(V.2.2) based on ActiveModel'
-  s.description = 'Persistent ORM for OrientDB(V.2.2), based on ActiveModel. Rails 5 compatible' 
+  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.5'
+  s.required_ruby_version = '>= 2.2.0'
   s.date 	= Time.now.strftime "%Y-%m-%d"
   s.test_files  = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
@@ -21,8 +21,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 'activemodel'#, "~> 4.2"
-  s.add_dependency 'rest-client'  
+  s.add_dependency 'activesupport', "~> 4.2"
+  s.add_dependency 'rest-client' , "~> 1.8"
 
 end

data/config/boot.rb

@@ -1,90 +1,6 @@
 require 'bundler/setup'
 require 'yaml'
-if RUBY_VERSION == 'java'
-  require 'orientdb'
-end
 project_root = File.expand_path('../..', __FILE__)
 require "#{project_root}/lib/active-orient.rb"
-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" }"
-ActiveOrient::Model.keep_models_without_file = true
-# lib/init.rb
-ActiveOrient::Init.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/connect.yml

@@ -1,17 +1,13 @@
 ---
 :orientdb:
- :server: localhost # 172.28.50.109 # localhost   #mailout.halfgarten-capital.de
+ :server: localhost
  :port: 2480
- :logger: stdout           # 'file' or 'stdout'
- :database: 
-   :development: GratefulDeadConcerts
-   :production: hcn_data
-   :test:  temp
+ :database: hc_database
  :admin:
    :user: hctw
-   :pass: hc
+   :pass: ++++
  :auth:
    :user: topo
-   :pass: focus
+   :pass: ++++
 
 # hfx: 101

data/examples/books.rb

@@ -5,121 +5,74 @@ 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 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.
-
+This Example demonstrates how to build a query by using OrientSupport::OrientQuery
 =end
-
  class BooksExample
 
-    def initialize  rebuild: true
+    def initialize db, rebuild: true
       if rebuild
-        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
+      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
-        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
-
+	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
-	## 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'
+	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 ]
-	puts "#{Keyword.count} keywords inserted into Database" 
       end
-
+  
     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"
-      #
-      print("\n === display_books_with » #{ desired_words.join "," } « === \n")
-      main_query =  OrientSupport::OrientQuery.new projection: 'expand( $z )'
+      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', 2 -> 'b' ...
-	       subquery = OrientSupport::OrientQuery.new from: Keyword, projection: "expand(in('has_content'))"
-	       subquery.where = { item: word  }
-               main_query.let << { symbol =>  subquery }
-	       intersects << "$#{symbol}"
+	       symbol = ( i+97 ).chr   #  convert 1 -> 'a' 
+	       query.where = { item: word  }
+               q.let << { symbol =>  query }
+	       intersects << "$#{symbol}"		 
       end
-      main_query.let <<  "$z = Intersect(#{intersects.join(', ')}) "
+      q.let <<  "$z = Intersect(#{intersects.join(', ')}) "
       puts "generated Query:"
-      puts main_query.compose
-      result = Keyword.query_database  main_query, set_from: false
-      puts '-' * 23 
+      puts q.to_s
+      result = Keyword.query_database  q, set_from: false
       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__
 
-    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'
-
+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 *search_items
-
+    b.display_books_with 'Land', 'Quartal'
 end

data/examples/streets.rb

@@ -1,6 +1,7 @@
 =begin
 Streets Example
 
+
 We load german cities from wikipedia and parse the document for cities and countries(states).
 Further we load a collection of popular streetnames from a web-side called »strassen-in-deutschland«
 
@@ -14,117 +15,115 @@ At last we print the connected cities.
 module DataImport
   def read_german_street_names
     doc = Nokogiri::HTML(open('http://www.strassen-in-deutschland.de/die-haeufigsten-strassennamen-in-deutschland.html'))
-    strassen = doc.css("td[data-header='Straßenname: '] a") # identified via css-inspector in browser
+    strassen = doc.css('#strassen-in-deutschland_main a' ) # identified via css-inspector in browser
     # search for the css and include only links, then display the text-part
     strassen.children.map( &:to_s )[3..-1]  # omit the first three (strassen in deutschland, straßenverzeichnis, straßen)
   end
 
-  def read_german_cities_from_wikipedia
-    # we extract <li> -elements and use the text until "("
+  def read_german_cities_from_wikipedia 
+    # we extract <li> -elements and use the text until "(" 
     #doc.xpath("//li").at(80)
-    # => #<Nokogiri::XML::Element:0x1ba551c name="li" children=[#<Nokogiri::XML::Element:0x1ba533c name="a" attributes=[#<Nokogiri::XML::Attr:0x1ba52d8 name="href" value="/wiki/Angerm%C3%BCnde">, #<Nokogiri::XML::Attr:0x1ba52c4 name="title" value="Angermünde">] children=[#<Nokogiri::XML::Text:0x1ba4c84 "Angermünde">]>, #<Nokogiri::XML::Text:0x1ba4ae0 " (Brandenburg)">]>
+    # => #<Nokogiri::XML::Element:0x1ba551c name="li" children=[#<Nokogiri::XML::Element:0x1ba533c name="a" attributes=[#<Nokogiri::XML::Attr:0x1ba52d8 name="href" value="/wiki/Angerm%C3%BCnde">, #<Nokogiri::XML::Attr:0x1ba52c4 name="title" value="Angermünde">] children=[#<Nokogiri::XML::Text:0x1ba4c84 "Angermünde">]>, #<Nokogiri::XML::Text:0x1ba4ae0 " (Brandenburg)">]> 
 
     doc = Nokogiri::HTML(open('https://en.wikipedia.org/wiki/List_of_cities_and_towns_in_Germany'))
-    print doc
     doc.xpath("//li").map{|x| x.text[0 .. x.text.index('(')-2] if x.text.index('(').present? }.compact
   end
 
-  def read_german_cities_and_states_from_wikipedia
+  def read_german_cities_and_states_fom_wikipedia
     doc =
-    Nokogiri::HTML(open('https://en.wikipedia.org/wiki/List_of_cities_and_towns_in_Germany'))
-    doc.xpath("//li").map do |x|
-      if x.text.index('(').present?
-        [ x.text[0 .. x.text.index('(')-2] , x.text[ x.text.index('(')+1 .. x.text.index(')')-1] ]
+      Nokogiri::HTML(open('https://en.wikipedia.org/wiki/List_of_cities_and_towns_in_Germany'))
+    doc.xpath("//li").map do |x| 
+      if x.text.index('(').present? 
+	[ x.text[0 .. x.text.index('(')-2] , x.text[ x.text.index('(')+1 .. x.text.index(')')-1] ]
       end
     end.compact
-  end
+  end 
 
 end # module
 
-class StreetExample
-
-  include  DataImport
-  def initialize db, rebuild: true
-    if rebuild
-      db.delete_class :State
-      db.delete_class :City
-      db.delete_class :Street
-      db.delete_class :CONNECTS
-      db.create_vertex_class :State
-      db.create_vertex_class :City
-      db.create_vertex_class :Street
-      db.create_edge_class :CONNECTS
-      ActiveOrient::Model::State.create_property( :name, type: :string, index: :unique )
-      ActiveOrient::Model::City.create_properties(  { name: { type: :string },
-      state: { type: :link, :linked_class => 'State' } }
-      ) do
-        { citi_idx: :unique }
+ class StreetExample
+
+   include  DataImport
+    def initialize db, rebuild: true
+      if rebuild
+	ActiveOrient::OrientDB.logger.progname = "StreetsExample#Initialize"
+	db.delete_class :state
+	db.delete_class :city
+	db.delete_class :street
+	db.delete_class :connects
+	db.create_vertex_class :state 
+	db.create_vertex_class :city
+	db.create_vertex_class :street
+	db.create_edge_class :connects
+	ActiveOrient::Model::State.create_property( :name, type: :string, index: :unique )
+	ActiveOrient::Model::City.create_properties(  { name: { type: :string },
+			    state: { type: :link, :linked_class => 'State' } } 
+			      ) do
+				{ citi_idx: :unique } 
+			      end
+	ActiveOrient::Model::Street.create_property :name , type: :string, index: :notunique 
+	ActiveOrient::Model::Connects.create_property :distance, type: :integer, index: :notunique 
+	ActiveOrient::OrientDB.logger.info { "Vertex- and Edge-Classes rebuilded" }
       end
-      ActiveOrient::Model::Street.create_property :name , type: :string, index: :notunique
-      ActiveOrient::Model::CONNECTS.create_property :distance, type: :integer, index: :notunique
-      ActiveOrient::OrientDB.logger.progname = "StreetsExample#Initialize"
-      ActiveOrient::OrientDB.logger.info { "Vertex- and Edge-Classes rebuilded" }
     end
-  end
 
 
-  def read_from_web
-    read_german_cities_and_states_from_wikipedia.each do |city,state|
-      state =  State.update_or_create( where: { name: state }).first
-      City.create name: city, state: "##{state.rid}"
-    end
-    ActiveOrient::OrientDB.logger.progname = "StreetsExample#ReadFromWeb"
-    ActiveOrient::OrientDB.logger.info { "#{City.count} Cities imported from Wikipedia " }
-
-    cities_rids =  City.all.map &:rid
-    read_german_street_names.each_with_index do |street, i|
-      street_record =  Street.create name: street
-      count = i
-      cities =  Array.new
-      while  count < cities_rids.size && cities.size < 5 do
-        cities << cities_rids[count]
-        count =  count + i
+    def read_from_web
+      ActiveOrient::OrientDB.logger.progname = "StreetsExample#ReadFromWeb"
+      read_german_cities_and_states_fom_wikipedia.each do |city,state| 
+	state =  State.update_or_create( where: { name: state }).first
+	City.create name: city, state: state.link
+      end
+      ActiveOrient::OrientDB.logger.info { "#{City.count} Cities imported from Wikipedia " }
+
+      cities_rids =  City.all.map &:link
+      read_german_street_names.each_with_index do |street, i|
+	street_record =  Street.create name: street
+	count = i
+	cities =  Array.new
+	while  count < cities_rids.size && cities.size < 5 do
+	  cities << cities_rids[count] 
+	  count =  count + i 
+	end
+	C.create_edge :from => street_record,  :to => cities
       end
-      C.create_edge :from => street_record,  :to => cities
+      ActiveOrient::OrientDB.logger.info { "#{C.count} Edges between Streets and Cities created " }
     end
-    ActiveOrient::OrientDB.logger.progname = "StreetsExample#ReadFromWeb"
-    ActiveOrient::OrientDB.logger.info { "#{C.count} Edges between Streets and Cities created " }
-  end
-
-  def display_streets_per_state
-    State.all.each do |state|
-      streets= Street.all.map do |street |
-        if street.connects.in.detect{|x| x.state == state }
-          street.name + " connects " + street.connects.in.map( &:name ).join('; ')
-        end
-      end.compact
-      unless streets.empty?
-        puts "..................................."
-        puts state.name
-        puts "..................................."
-        puts streets.join("\n")
+  
+    def display_streets_per_state
+      State.all.each do |state|
+	streets= Street.all.map do |street |
+	  if street.connects.in.detect{|x| x.state == state }
+	    street.name + " verbindet " + street.connects.in.map( &:name ).join('; ')
+	  end
+	end.compact
+	unless streets.empty?
+	  puts "..................................."
+	  puts state.name
+	  puts "..................................."
+	  puts streets.join("\n")
+	end
       end
     end
-  end
-end
+ end
 
 if $0 == __FILE__
 
-  require '../config/boot'
-  require 'open-uri'
-  require 'nokogiri'
-
-  ActiveOrient::OrientDB.default_server= { user: 'root', password: 'tretretre' }
-  r = ActiveOrient::OrientDB.new database: 'StreetTest'
-  ActiveOrient::OrientDB.logger.level = Logger::INFO
-  s= StreetExample.new r, rebuild:  true
-
-  City = r.open_class :City
-  State = r.open_class :State
-  Street = r.open_class :Street
-  C = r.open_class :CONNECTS
-
-  s.read_from_web if City.count.zero?
-  s.display_streets_per_state
+require '../config/boot'
+require 'open-uri'
+require 'nokogiri'
+
+    ActiveOrient::OrientDB.default_server= { user: 'hctw', password: 'hc' }
+    r = ActiveOrient::OrientDB.new database: 'StreetTest'
+    ActiveOrient::OrientDB.logger.level = Logger::INFO
+    s= StreetExample.new r, rebuild:  true 
+      
+    City = r.open_class :city
+    State = r.open_class :state
+    Street = r.open_class :street
+    C = r.open_class :connects
+    
+    s.read_from_web if City.count.zero?
+    s.display_streets_per_state
 
 end