orientdb4r 0.3.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d475ea55280ea01281cefdee2731f1441d141095
+  data.tar.gz: 59f012f6c7a58d90af9650a9c27a85a691a65c74
+SHA512:
+  metadata.gz: 2f0fb1f707050138c665237b963d64001b60ffcc460f6c6ded6009d2e2675977d504e225472399ad8ab66863adf54b68fce83df7f3687e2b2cfe3a0a6d98fd31
+  data.tar.gz: b6b538be7c8c18eb4352bec64be2b33979522f432e0a2e007d6abbb88c8eb3bf1ad654c5c7255c4d9f18f4069422c3967ff2d626b516128fa15ead84d324ae94

data/README.rdoc

@@ -1,4 +1,11 @@
-= orientdb4r - Ruby binding for Orient DB
+
+              _            _      _ _     _  _
+    ___  _ __(_) ___ _ __ | |_ __| | |__ | || |  _ __
+   / _ \| '__| |/ _ \ '_ \| __/ _` | '_ \| || |_| '__|
+  | (_) | |  | |  __/ | | | || (_| | |_) |__   _| |
+   \___/|_|  |_|\___|_| |_|\__\__,_|_.__/   |_| |_|
+
+= Ruby binding for Orient DB
 
 A Ruby client for the NoSQL Graph/Document database Orient DB (http://orientdb.org).
 
@@ -9,14 +16,19 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
   require 'orientdb4r'
 
+  DB = 'foo'
   CLASS = 'myclass'
 
   client = Orientdb4r.client  # equivalent for :host => 'localhost', :port => 2480, :ssl => false
 
-  client.database_exists? :database => 'temp', :user => 'admin', :password => 'admin'
-  => true
+  client.database_exists? :database => DB, :user => 'admin', :password => 'admin'
+  => false
+
+  client.create_database :database => DB, :type => :memory, :user => 'root', :password => 'root'
+  => false
 
-  client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+  client.connect :database => DB, :user => 'admin', :password => 'admin'
+  => true
 
   unless client.class_exists? CLASS
     client.create_class(CLASS) do |c|
@@ -53,7 +65,7 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
   client.drop_class CLASS
   client.disconnect
-
+  => ["401 Unauthorized: Logged out", 401]
 
 == INSTALL
 
@@ -72,19 +84,21 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
 == REQUIREMENTS
 
-Tested on
-* Ruby 1.9.3
-* OrientDB 1.0.0
-* OrientDB 1.0.1
-* OrientDB 1.1.0-SNAPSHOT r5913+
+* Ruby 1.9.x+
+* OrientDB 1.0.x-1.3.x for *v0.3.x*
+* OrientDB 1.4.0+ for *v0.4.x*
 
 == TESTS
-In order to run the tests you only need to:
 
-  cd /path/to/repository
-  rake test
 
-Start an instance of OrientDB (on localhost with default web port 2480 and 'admin/admin' account) before running.
+  > cd /path/to/repository
+  > rake db:setup4test  # to create the temp DB which doesn't seem to be a default since v1.5
+  > rake test
+
+Make sure before starting the tests:
+* database server is running on localhost:2480
+* there is a root account with username=root and password=root
+
 
 == AUTHOR
 

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake/testtask'
+require 'rest_client'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
@@ -6,3 +7,36 @@ end
 
 desc "Run tests"
 task :default => :test
+
+namespace :db do
+
+  DB_HOST = 'localhost'
+  DB_PORT = 2480
+  DB_NAME = 'temp'
+  DB_ROOT_USER = 'root'
+  DB_ROOT_PASS = 'root'
+
+  desc 'Check whether a test DB exists and create if not'
+  task :setup4test do
+    found = true
+    begin
+      ::RestClient::Request.new({:url=>"http://#{DB_HOST}:#{DB_PORT}/database/#{DB_NAME}", :method=>:get, :user=>DB_ROOT_USER, :password=>DB_ROOT_PASS}).execute
+    rescue Errno::ECONNREFUSED
+      fail "server seems to be closed, not running on #{DB_HOST}:#{DB_PORT}?"
+    rescue ::RestClient::Unauthorized
+      # this is expected reaction if DB does not exist
+      puts 'DB does NOT exist -> create'
+      found = false
+    rescue ::RestClient::Exception => e
+      fail "unexpected failure: #{e}"
+    end
+
+    if found
+      puts 'DB already exists'
+    else
+      ::RestClient::Request.new({:url=>"http://#{DB_HOST}:#{DB_PORT}/database/#{DB_NAME}/memory", :method=>:post, :user=>DB_ROOT_USER, :password=>DB_ROOT_PASS}).execute
+      puts 'DB created'
+    end
+  end
+
+end

data/changelog.txt

@@ -1,6 +1,15 @@
+0.4.0 2013-08-14
+- Closes gap between this driver and OrientDb v1.4.0+ which introduced some changes on REST API (connect & create_document).
+- No more backward compatible with OrientDb v1.3.x and lesser.
+- Enhancement #20 : Method 'compare_versions' accepts a block now
+- Bug Fix #25
+
+
+
 0.3.3 2012-12-16
 - Enhancement #18 : Added 'abstract' option into creating a new class
 - Enhancement #19 : Added GET - List Databases
+- Bug Fix #22
 
 0.3.2 2012-11-02
 - Enhancement #13 : configurable User-Agent request header
@@ -11,10 +20,12 @@
 - Bug Fix #14, #15
 
 0.3.0 2012-08-01
-- introduced support for cluster of distributed servers
+- Introduces support for cluster of distributed servers.
 - initial strategies for load balancing: sequence, round robin
 - Keep-Alive feature: Excon HTTP library is fully working
 
+
+
 0.2.10 2012-07-21
 - experimental support for Excon HTTP library with Keep-Alive connection
 

data/lib/orientdb4r.rb

@@ -8,20 +8,21 @@ require 'orientdb4r/version'
 # This module represents the entry point for using the Ruby OrientDB client.
 module Orientdb4r
 
-  autoload :Utils,          'orientdb4r/utils'
-  autoload :Client,         'orientdb4r/client'
-  autoload :RestClient,     'orientdb4r/rest/client'
-  autoload :BinClient,      'orientdb4r/bin/client'
-  autoload :Rid,            'orientdb4r/rid'
-  autoload :HashExtension,  'orientdb4r/rest/model'
-  autoload :OClass,         'orientdb4r/rest/model'
-  autoload :ChainedError,   'orientdb4r/chained_error'
-  autoload :Node,           'orientdb4r/node'
-  autoload :RestNode,       'orientdb4r/rest/node'
-  autoload :RestClientNode, 'orientdb4r/rest/restclient_node'
-  autoload :ExconNode,      'orientdb4r/rest/excon_node'
-  autoload :Sequence,       'orientdb4r/load_balancing'
-  autoload :RoundRobin,     'orientdb4r/load_balancing'
+  autoload :Utils,            'orientdb4r/utils'
+  autoload :Client,           'orientdb4r/client'
+  autoload :RestClient,       'orientdb4r/rest/client'
+  autoload :BinClient,        'orientdb4r/bin/client'
+  autoload :Rid,              'orientdb4r/rid'
+  autoload :HashExtension,    'orientdb4r/rest/model'
+  autoload :OClass,           'orientdb4r/rest/model'
+  autoload :ChainedError,     'orientdb4r/chained_error'
+  autoload :Node,             'orientdb4r/node'
+  autoload :RestNode,         'orientdb4r/rest/node'
+  autoload :RestClientNode,   'orientdb4r/rest/restclient_node'
+  autoload :ExconNode,        'orientdb4r/rest/excon_node'
+  autoload :Sequence,         'orientdb4r/load_balancing'
+  autoload :RoundRobin,       'orientdb4r/load_balancing'
+  autoload :DocumentMetadata, 'orientdb4r/rest/model'
 
 
   class << self

data/lib/orientdb4r/client.rb

@@ -3,16 +3,11 @@ module Orientdb4r
   class Client
     include Utils
 
-    # Server version used if no concrete version identified.
-    DEFAULT_SERVER_VERSION = '1.0.0--'
-
-    # # Regexp to validate format of providet version.
+    # # Regexp to validate format of provided version.
     SERVER_VERSION_PATTERN = /^\d+\.\d+\.\d+[-SNAPHOT]*$/
 
     # connection parameters
     attr_reader :user, :password, :database
-    # version loaded from server
-    attr_reader :server_version
     # type of connection library [:restclient, :excon]
     attr_reader :connection_library
     # type of load balancing [:sequence, :round_robin]
@@ -112,7 +107,22 @@ module Orientdb4r
     # Retrieves the available databases.
     # That is protected by the resource "server.listDatabases"
     # that by default is assigned to the guest (anonymous) user in orientdb-server-config.xml.
-    def list_databases()
+    def list_databases(options)
+      raise NotImplementedError, 'this should be overridden by concrete client'
+    end
+
+
+    ###
+    # Exports a gzip file that contains the database JSON export.
+    # Returns name of stored file.
+    def export(options)
+      raise NotImplementedError, 'this should be overridden by concrete client'
+    end
+
+
+    ###
+    # Imports a database from an uploaded JSON text file.
+    def import(options)
       raise NotImplementedError, 'this should be overridden by concrete client'
     end
 
@@ -147,15 +157,7 @@ module Orientdb4r
       sql = "CREATE CLASS #{name}"
       sql << " EXTENDS #{options[:extends]}" if options.include? :extends
       sql << " CLUSTER #{options[:cluster]}" if options.include? :cluster
-      # abstract (TODO should be block)
-      bigger_1_2 = (compare_versions(server_version, '1.2.0') > 0)
-      if options.include?(:abstract)
-        if bigger_1_2
-          sql << ' ABSTRACT'
-        else
-          Orientdb4r::logger.warn("abstract class not supported in OrientDB version #{compare_versions}")
-        end
-      end
+      sql << ' ABSTRACT' if options.include?(:abstract)
 
       drop_class name if options[:force]
 
@@ -202,7 +204,8 @@ module Orientdb4r
       rslt = true
       begin
         get_class name
-      rescue OrientdbError
+      rescue OrientdbError => e
+        raise e if e.is_a? ConnectionError and e.message == 'not connected' # workaround for AOP2 (unable to decorate already existing methods)
         rslt = false
       end
       rslt
@@ -212,15 +215,14 @@ module Orientdb4r
     ###
     # Removes a class from the schema.
     def drop_class(name, options={})
-      raise ArgumentError, "class name is blank" if blank?(name)
+      raise ArgumentError, 'class name is blank' if blank?(name)
 
       # :mode=>:strict forbids to drop a class that is a super class for other one
       opt_pattern = { :mode => :nil }
       verify_options(options, opt_pattern)
       if :strict == options[:mode]
-        response = call_server(:method => :get, :uri => "connect/#{@database}") # TODO there cannot be REST
-        connect_info = process_response response
-        children = connect_info['classes'].select { |i| i['superClass'] == name }
+        response = get_database
+        children = response['classes'].select { |i| i['superClass'] == name }
         unless children.empty?
           raise OrientdbError, "class is super-class, cannot be deleted, name=#{name}"
         end
@@ -264,7 +266,9 @@ module Orientdb4r
 
     ###
     # Create a new document.
-    # Returns the Record-id assigned.
+    # Returns the Record-id assigned for OrientDB version <= 1.3.x
+    # and the whole new document for version >= 1.4.x
+    # (see https://groups.google.com/forum/?fromgroups=#!topic/orient-database/UJGAXYpHDmo for more info).
     def create_document(doc)
       raise NotImplementedError, 'this should be overridden by concrete client'
     end

data/lib/orientdb4r/rest/client.rb

@@ -5,7 +5,7 @@ module Orientdb4r
 
 
     before [:query, :command], :assert_connected
-    before [:create_class, :get_class, :drop_class, :create_property], :assert_connected
+    before [:create_class, :get_class, :class_exists?, :drop_class, :create_property], :assert_connected
     before [:create_document, :get_document, :update_document, :delete_document], :assert_connected
     around [:query, :command], :time_around
 
@@ -88,33 +88,24 @@ module Orientdb4r
 
       @nodes.each { |node| node.cleanup } # destroy all used session <= problem in 1.3.0-SNAPSHOT
       begin
-        response = call_server(:method => :get, :uri => "connect/#{@database}")
+        http_response = call_server(:method => :get, :uri => "connect/#{@database}")
       rescue
         @connected = false
-        @server_version = nil
         @user = nil
         @password = nil
         @database = nil
         @nodes.each { |node| node.cleanup }
         raise ConnectionError
       end
-      rslt = process_response response
-      decorate_classes_with_model(rslt['classes'])
 
-      # try to read server version
-      if rslt.include? 'server'
-        @server_version = rslt['server']['version']
-      else
-        @server_version = DEFAULT_SERVER_VERSION
-      end
-      unless server_version =~ SERVER_VERSION_PATTERN
-        Orientdb4r::logger.warn "bad version format, version=#{server_version}"
-        @server_version = DEFAULT_SERVER_VERSION
-      end
+      rslt = process_response http_response
+      # no metadata in connect v1.4.0+
+      # https://groups.google.com/forum/?fromgroups=#!topic/orient-database/R0VoOfIyDng
+      #decorate_classes_with_model(rslt['classes']) unless rslt['classes'].nil?
 
-      Orientdb4r::logger.info "successfully connected to server, version=#{server_version}"
+      Orientdb4r::logger.info "successfully connected to server, code=#{rslt.code}"
       @connected = true
-      rslt
+      @connected
     end
 
 
@@ -128,7 +119,6 @@ module Orientdb4r
         # It always returns 401 because some browsers intercept this and avoid to reuse the same session again.
       ensure
         @connected = false
-        @server_version = nil
         @user = nil
         @password = nil
         @database = nil
@@ -158,12 +148,12 @@ module Orientdb4r
 
     def create_database(options) #:nodoc:
       options_pattern = {
-        :database => :mandatory, :type => 'memory',
+        :database => :mandatory, :type => :memory,
         :user => :optional, :password => :optional
       }
       verify_and_sanitize_options(options, options_pattern)
 
-      params = { :method => :post, :uri => "database/#{options[:database]}/#{options[:type]}" }
+      params = { :method => :post, :uri => "database/#{options[:database]}/#{options[:type].to_s}" }
       params[:no_session] = true # out of existing session which represents an already done authentication
 
       # additional authentication allowed, overriden in 'call_server' if not defined
@@ -198,7 +188,9 @@ module Orientdb4r
       response = call_server params
 
       # NotFoundError cannot be raised - no way how to recognize from 401 bad auth
-      process_response(response)
+      rslt = process_response response
+      decorate_classes_with_model(rslt['classes']) unless rslt['classes'].nil?
+      rslt
     end
 
 
@@ -220,12 +212,61 @@ module Orientdb4r
     end
 
 
-    def list_databases() #:nodoc:
-      response = call_server :method => :get, :uri => 'listDatabases', :no_session => true
+    #> curl --user root:root http://localhost:2480/listDatabases
+    def list_databases(options=nil) #:nodoc:
+      verify_and_sanitize_options(options, { :user => :optional, :password => :optional })
+
+      params = { :method => :get, :uri => 'listDatabases', :no_session => true }
+      # additional authentication allowed, overriden in 'call_server' if not defined
+      params[:user] = options[:user] if options.include? :user
+      params[:password] = options[:password] if options.include? :password
+
+      response = call_server params
       rslt = process_response(response)
       rslt['databases']
     end
 
+
+    def export(options=nil) #:nodoc:
+      raise ArgumentError, 'options have to be a Hash' if !options.nil? and !options.kind_of? Hash
+
+      if options.nil? or (!options.nil? and options[:database].nil?)
+        # use database from connect
+        raise ConnectionError, 'client has to be connected if no database given' unless connected?
+        options = {} if options.nil?
+        options[:database] = database
+      end
+
+      options_pattern = { :database => :mandatory, :user => :optional, :password => :optional, :file => :optional }
+      verify_options(options, options_pattern)
+
+      params = {:method => :get, :uri => "export/#{options[:database]}"}
+      params[:no_session] = true # out of existing session which represents an already done authentication
+
+      # additional authentication allowed, overriden in 'call_server' if not defined
+      params[:user] = options[:user] if options.include? :user
+      params[:password] = options[:password] if options.include? :password
+
+      response = call_server params
+      rslt = process_response(response)
+
+      filename = options[:file]
+      filename = response.headers[:content_disposition].split('filename=')[-1] if filename.nil?
+      File.open(filename, 'w') do |f|
+        f.write rslt
+      end
+
+      filename
+    end
+
+
+    def import(options=nil) #:nodoc:
+      raise NotImplementedError, 'not working via REST API, see here for more info: https://github.com/nuvolabase/orientdb/issues/1345'
+#      params = {:method => :post, :uri => 'import/'}
+#      response = call_server params
+    end
+
+
     # ---------------------------------------------------------------------- SQL
 
     def query(sql, options=nil) #:nodoc:
@@ -261,25 +302,12 @@ module Orientdb4r
     def get_class(name) #:nodoc:
       raise ArgumentError, "class name is blank" if blank?(name)
 
-      if compare_versions(server_version, '1.1.0') >= 0
-        response = call_server(:method => :get, :uri => "class/#{@database}/#{name}")
-        rslt = process_response(response) do
-          raise NotFoundError, 'class not found' if response.body =~ /Invalid class/
-        end
-
-        classes = [rslt]
-      else
-        # there is bug in REST API [v1.0.0, fixed in r5902], only data are returned
-        # workaround - use metadate delivered by 'connect'
-        response = call_server(:method => :get, :uri => "connect/#{@database}")
-        connect_info = process_response(response) do
-          raise NotFoundError, 'class not found' if response.body =~ /Invalid class/
-        end
-
-        classes = connect_info['classes'].select { |i| i['name'] == name }
-        raise NotFoundError, "class not found, name=#{name}" unless 1 == classes.size
+      response = call_server(:method => :get, :uri => "class/#{@database}/#{name}")
+      rslt = process_response(response) do
+        raise NotFoundError, 'class not found' if response.body =~ /Invalid class/
       end
 
+      classes = [rslt]
       decorate_classes_with_model(classes)
       clazz = classes[0]
       clazz.extend Orientdb4r::HashExtension
@@ -298,13 +326,15 @@ module Orientdb4r
     # ----------------------------------------------------------------- DOCUMENT
 
     def create_document(doc) #:nodoc:
-      response = call_server(:method => :post, :uri => "document/#{@database}", \
+      http_response = call_server(:method => :post, :uri => "document/#{@database}", \
           :content_type => 'application/json', :data => doc.to_json)
-      srid = process_response(response)  do
-        raise DataError, 'validation problem' if response.body =~ /OValidationException/
+      resp = process_response(http_response) do
+        raise DataError, 'validation problem' if http_response.body =~ /OValidationException/
       end
 
-      Rid.new srid
+      resp = ::JSON.parse(http_response.body) # workaround: https://groups.google.com/forum/?fromgroups=#!topic/orient-database/UJGAXYpHDmo
+      resp.extend Orientdb4r::DocumentMetadata
+      resp
     end
 
 
@@ -380,6 +410,8 @@ module Orientdb4r
         rslt = case
           when content_type.start_with?('text/plain')
             response.body
+          when content_type.start_with?('application/x-gzip')
+            response.body
           when content_type.start_with?('application/json')
             ::JSON.parse(response.body)
           else

data/lib/orientdb4r/utils.rb

@@ -59,8 +59,13 @@ module Orientdb4r
       firstv = /^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)/.match(first)[0]
       secondv = /^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)/.match(second)[0]
 
-      return 0 if firstv == secondv
-      return firstv > secondv ? 1 : -1
+      rslt = 0
+      rslt = 1 if firstv > secondv
+      rslt = -1 if firstv < secondv
+
+      yield rslt if block_given?
+
+      rslt
     end
 
     class Proxy

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.4.0',   '2013-08-14', "Closed gap between this driver and OrientDB v1.4.0+; Enh #20, BF #25"],
     ['0.3.3',   '2012-12-16', "Enh #18 ('abstract' option into creating a new class), Enh #19 (GET - List Databases)"],
     ['0.3.2',   '2012-11-02', "Enh #13 (User-Agent), Enh #16 (configurable Recover Time in Load Balancing)"],
     ['0.3.1',   '2012-08-27', "Timeout for reuse of dirty nodes in load balancing; BF #14, BF #15"],

data/test/test_client.rb

@@ -46,9 +46,11 @@ class TestClient < Test::Unit::TestCase
     assert_instance_of Orientdb4r::RestClientNode, client.nodes[0]
 
     # excon
-    client = Orientdb4r.client :connection_library => :excon, :instance => :new
-    assert_equal :excon, client.connection_library
-    assert_instance_of Orientdb4r::ExconNode, client.nodes[0]
+    if Gem::Specification::find_all_by_name('excon').any?
+      client = Orientdb4r.client :connection_library => :excon, :instance => :new
+      assert_equal :excon, client.connection_library
+      assert_instance_of Orientdb4r::ExconNode, client.nodes[0]
+    end
   end
 
   ###
@@ -68,17 +70,19 @@ class TestClient < Test::Unit::TestCase
     end
     RestClient.proxy = nil # restore no setting
 
-    # no proxy - excon
-    client = Orientdb4r.client :connection_library => :excon, :instance => :new
-    assert_nil client.proxy
-    assert_nil client.nodes[0].proxy
+    if Gem::Specification::find_all_by_name('excon').any?
+      # no proxy - excon
+      client = Orientdb4r.client :connection_library => :excon, :instance => :new
+      assert_nil client.proxy
+      assert_nil client.nodes[0].proxy
 
-    # proxy - restclient
-    client = Orientdb4r.client :connection_library => :excon, :proxy => PROXY_URL, :instance => :new
-    assert_equal PROXY_URL, client.proxy
-    assert_equal PROXY_URL, client.nodes[0].proxy
-    assert_raise Orientdb4r::ConnectionError do
-      client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+      # proxy - excon
+      client = Orientdb4r.client :connection_library => :excon, :proxy => PROXY_URL, :instance => :new
+      assert_equal PROXY_URL, client.proxy
+      assert_equal PROXY_URL, client.nodes[0].proxy
+      assert_raise Orientdb4r::ConnectionError do
+        client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+      end
     end
   end
 

data/test/test_database.rb

@@ -2,15 +2,10 @@ require 'test/unit'
 require 'orientdb4r'
 
 ###
-# This class tests following operations:
-# * CONNECT
-# * DISCONNECT
-# * CREATE DATABASE
-# * GET DATABASE
-# * DELETE DATABASE
-# * SERVER info
+# This class tests DB management.
 class TestDatabase < Test::Unit::TestCase
 
+  DB = 'temp'
   Orientdb4r::logger.level = Logger::DEBUG
 
   def setup
@@ -20,34 +15,32 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # CONNECT
   def test_connect
-    assert_nothing_thrown do @client.connect :database => 'temp', :user => 'admin', :password => 'admin'; end
-    rslt = @client.connect :database => 'temp', :user => 'admin', :password => 'admin'
-    assert_instance_of Hash, rslt
-    assert rslt.size > 0
-    assert rslt.include? 'classes'
+    assert_nothing_thrown do @client.connect :database => DB, :user => 'admin', :password => 'admin'; end
+    rslt = @client.connect :database => DB, :user => 'admin', :password => 'admin'
+    assert_instance_of TrueClass, rslt
 
     assert_equal 'admin', @client.user
     assert_equal 'admin', @client.password
-    assert_equal 'temp', @client.database
-    assert_not_nil @client.server_version
+    assert_equal DB, @client.database
 
     # connection refused
     client = Orientdb4r.client :port => 2840, :instance => :new
     assert_raise Orientdb4r::ConnectionError do
-      client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+      client.connect :database => DB, :user => 'admin', :password => 'admin'
     end
 
     # bad DB name
     assert_raise Orientdb4r::UnauthorizedError do
       @client.connect :database => 'unknown_db', :user => 'admin', :password => 'admin'
     end
-    # bad DB name with '/' => wrong REST resource
-    assert_raise Orientdb4r::ServerError do
-      @client.connect :database => 'temp/temp', :user => 'admin', :password => 'admin'
-    end
+    # !!! curl -v --user admin:adminX http://localhost:2480/connect/foo/bar
+#    # bad DB name with '/' => wrong REST resource
+#    assert_raise Orientdb4r::ServerError do
+#      @client.connect :database => 'temp/temp', :user => 'admin', :password => 'admin'
+#    end
     # bad credentials
     assert_raise Orientdb4r::UnauthorizedError do
-      @client.connect :database => 'temp', :user => 'admin1', :password => 'admin'
+      @client.connect :database => DB, :user => 'admin1', :password => 'admin'
     end
 
     # clean up
@@ -58,7 +51,7 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # DISCONNECT
   def test_disconnect
-    @client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+    @client.connect :database => DB, :user => 'admin', :password => 'admin'
     assert @client.connected?
     assert_nothing_thrown do @client.disconnect; end
     assert !@client.connected?
@@ -68,14 +61,12 @@ class TestDatabase < Test::Unit::TestCase
     assert_nil @client.user
     assert_nil @client.password
     assert_nil @client.database
-    assert_nil @client.server_version
   end
 
 
   ###
   # CREATE DATABASE
-  # Temporary disabled because of dependency to password of 'root' account
-  def xtest_create_database
+  def test_create_database
     assert_nothing_thrown do
       @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
     end
@@ -87,7 +78,7 @@ class TestDatabase < Test::Unit::TestCase
       @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
     end
     # insufficient rights
-    assert_raise Orientdb4r::OrientdbError do
+    assert_raise Orientdb4r::UnauthorizedError do
       @client.create_database :database => 'UniT1', :user => 'admin', :password => 'admin'
     end
 
@@ -104,16 +95,25 @@ class TestDatabase < Test::Unit::TestCase
   # GET DATABASE
   def test_get_database
     # not connected - allowed with additional authentication
-    assert_nothing_thrown do @client.get_database :database => 'temp', :user => 'admin', :password => 'admin' ; end
+    assert_nothing_thrown do @client.get_database :database => DB, :user => 'admin', :password => 'admin' ; end
     assert_raise Orientdb4r::ConnectionError do @client.get_database; end
     # connected
-    @client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+    @client.connect :database => DB, :user => 'admin', :password => 'admin'
     assert_nothing_thrown do @client.get_database; end # gets info about connected DB
 
     rslt = @client.get_database
     assert_not_nil rslt
     assert_instance_of Hash, rslt
+    assert !rslt.empty?
+    # server
+    assert rslt.include? 'server'
+    assert_instance_of Hash, rslt['server']
+    assert !rslt['server'].empty?
+    assert rslt['server'].include? 'version'
+    # classes
     assert rslt.include? 'classes'
+    assert_instance_of Array, rslt['classes']
+    assert !rslt['classes'].empty?
 
     # bad databases
     assert_raise Orientdb4r::UnauthorizedError do @client.get_database :database => 'UnknownDB'; end
@@ -121,8 +121,8 @@ class TestDatabase < Test::Unit::TestCase
 
 
     # database_exists?
-    assert @client.database_exists?(:database => 'temp', :user => 'admin', :password => 'admin')
-    assert @client.database_exists?(:database => 'temp') # use credentials of logged in user
+    assert @client.database_exists?(:database => DB, :user => 'admin', :password => 'admin')
+    assert @client.database_exists?(:database => DB) # use credentials of logged in user
     assert !@client.database_exists?(:database => 'UnknownDB')
     assert !@client.database_exists?(:database => 'temp/admin')
   end
@@ -130,8 +130,7 @@ class TestDatabase < Test::Unit::TestCase
 
   ###
   # DELETE DATABASE
-  # Temporary disabled because of dependency to password of 'root' account
-  def xtest_delete_database
+  def test_delete_database
     @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
 
     # deleting non-existing DB
@@ -139,7 +138,7 @@ class TestDatabase < Test::Unit::TestCase
       @client.delete_database :database => 'UniT1', :user => 'root', :password => 'root'
     end
     # insufficient rights
-    assert_raise Orientdb4r::OrientdbError do
+    assert_raise Orientdb4r::UnauthorizedError do
       @client.delete_database :database => 'UniT', :user => 'admin', :password => 'admin'
     end
 
@@ -151,7 +150,6 @@ class TestDatabase < Test::Unit::TestCase
 
   ###
   # SERVER info
-  # Temporary disabled because of dependency to password of 'root' account
   def xtest_server
     # admin/admin has not 'server.info' resource access in standard installation
     assert_raise Orientdb4r::OrientdbError do @client.server :user => 'admin', :password => 'admin'; end
@@ -168,11 +166,11 @@ class TestDatabase < Test::Unit::TestCase
   # GET List Databases
   # Retrieves the available databases.
   def test_list_databases
-    dbs = @client.list_databases
+    dbs = @client.list_databases :user => 'root', :password => 'root'
     assert_not_nil dbs
     assert_instance_of Array, dbs
     assert !dbs.empty?
-    assert dbs.include? 'temp'
+    assert dbs.include? DB
   end
 
 
@@ -183,6 +181,7 @@ class TestDatabase < Test::Unit::TestCase
     assert_raise Orientdb4r::ConnectionError do @client.query "INSERT INTO OUser(name) VALUES('x')"; end
     #BF #21 assert_raise Orientdb4r::ConnectionError do @client.create_class 'x'; end
     assert_raise Orientdb4r::ConnectionError do @client.create_property 'x', 'prop', :boolean; end
+    assert_raise Orientdb4r::ConnectionError do @client.class_exists? 'x'; end
     assert_raise Orientdb4r::ConnectionError do @client.get_class 'x'; end
     assert_raise Orientdb4r::ConnectionError do @client.drop_class 'x'; end
     assert_raise Orientdb4r::ConnectionError do @client.create_document({ '@class' => 'x', :prop => 1 }); end
@@ -197,7 +196,7 @@ class TestDatabase < Test::Unit::TestCase
   def test_session_id
     client = Orientdb4r.client :instance => :new
     assert_nil client.nodes[0].session_id
-    client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+    client.connect :database => DB, :user => 'admin', :password => 'admin'
     session_id = client.nodes[0].session_id
     assert_not_nil session_id
     client.query 'SELECT count(*) FROM OUser'
@@ -208,4 +207,40 @@ class TestDatabase < Test::Unit::TestCase
     assert_nil client.nodes[0].session_id
   end
 
+
+  ###
+  # EXPORT
+  def test_export
+    client = Orientdb4r.client :instance => :new
+
+    # export of connected database
+    client.connect :database => DB, :user => 'admin', :password => 'admin'
+    rslt = client.export
+    assert File.exist? './temp.gz'
+    assert File.file? './temp.gz'
+    assert 'temp.gz', rslt
+    File.delete './temp.gz'
+
+    # export with given file
+    given_filename = "#{Dir.tmpdir}/TEMP.gz"
+    client.export :file => given_filename
+    assert File.exist? given_filename
+    assert File.file? given_filename
+    assert given_filename, rslt
+
+    # explicit given DB
+    client.disconnect
+    assert_nothing_thrown do
+      client.export :database => DB, :user => 'admin', :password => 'admin', :file => given_filename
+    end
+    # unknow DB
+    assert_raise Orientdb4r::UnauthorizedError do
+      client.export :database => 'unknown', :user => 'admin', :password => 'admin'
+    end
+    # bad password
+    assert_raise Orientdb4r::UnauthorizedError do
+      client.export :database => DB, :user => 'admin', :password => 'unknown'
+    end
+  end
+
 end

data/test/test_ddo.rb

@@ -109,8 +109,9 @@ class TestDdo < Test::Unit::TestCase
     assert_nothing_thrown do @client.drop_class(CLASS); end
     assert_raise Orientdb4r::NotFoundError do @client.get_class(CLASS); end # no info more
     # the class is not visible in class list delivered by connect
-    rslt = @client.connect :database => DB, :user => 'admin', :password => 'admin'
-    assert rslt['classes'].select { |i| i.name == CLASS }.empty?
+    db_info = @client.get_database
+puts db_info['classes'].class
+    assert db_info['classes'].select { |i| i.name == CLASS }.empty?
 
     # CLASS extends super_class
     @client.create_class(CLASS, :extends => super_clazz);

data/test/test_dmo.rb

@@ -102,8 +102,13 @@ class TestDmo < Test::Unit::TestCase
     assert_raise Orientdb4r::ServerError do
       @client.query 'xxx'
     end
-    # record not found
-    assert_raise Orientdb4r::NotFoundError do @client.query 'SELECT FROM #4:1111'; end
+    # record not found in existing cluster
+    entries = @client.query 'SELECT FROM #0:1111'
+    assert_not_nil entries
+    assert_instance_of Array, entries
+    assert entries.empty?
+    # try to find entry in a non-existing cluster
+    assert_raise Orientdb4r::ServerError do @client.query 'SELECT FROM #111:1111'; end
     # used for INSERT
     assert_raise Orientdb4r::ServerError do
       @client.query "INSERT INTO #{CLASS} (prop1, prop2, friends) VALUES (0, 'string0', [])"

data/test/test_document_crud.rb

@@ -31,26 +31,20 @@ class TestDocumentCrud < Test::Unit::TestCase
   # CREATE
   def test_create_document
     assert_nothing_thrown do @client.create_document( { '@class' => CLASS, 'prop1' => 99, 'prop2' => 'ipsum lorem' }); end
-    rid = @client.create_document({ '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
-    assert_instance_of Orientdb4r::Rid, rid
+    doc = @client.create_document({ '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+    assert_instance_of Hash, doc
+    assert_not_nil doc.doc_rid
+    assert_instance_of Orientdb4r::Rid, doc.doc_rid
+    assert_equal CLASS, doc.doc_class
+    assert_equal 0, doc.doc_version
 
     # no effect if a define the version
-    assert_nothing_thrown do
-      @client.create_document({ '@class' => CLASS, '@version' => 2, 'prop1' => 1, 'prop2' => 'text' })
-    end
-    rid = @client.create_document({ '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
-    doc = @client.get_document rid
-    assert_equal CLASS, doc.doc_class
-    assert_equal rid, doc.doc_rid
+    doc = @client.create_document({ '@class' => CLASS, '@version' => 2, 'prop1' => 1, 'prop2' => 'text' })
     assert_equal 0, doc.doc_version
 
     # no effect if an unknown class
-    assert_nothing_thrown do
-      @client.create_document({ '@class' => 'unknown_class', 'a' => 1, 'b' => 'text' })
-    end
-    rid = @client.create_document({ '@class' => 'unknown_class', 'a' => 11, 'b' => 'text1' })
-    doc = @client.get_document rid
-    assert_nil doc.doc_class
+    doc = @client.create_document({ '@class' => 'unknown_class', 'a' => 11, 'b' => 'text1' })
+    assert_equal 'unknown_class', doc.doc_class
     assert_equal 11, doc['a']
     assert_equal 'text1', doc['b']
     # or missing class
@@ -73,11 +67,11 @@ class TestDocumentCrud < Test::Unit::TestCase
   ###
   # GET
   def test_get_document
-    rid = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+    created = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
 
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     assert_equal CLASS, doc.doc_class
-    assert_equal rid, doc.doc_rid
+    assert_equal created.doc_rid, doc.doc_rid
     assert_equal 0, doc.doc_version
     assert_equal 'd', doc.doc_type
     assert_equal 1, doc['prop1']
@@ -86,7 +80,7 @@ class TestDocumentCrud < Test::Unit::TestCase
     assert doc.kind_of? Orientdb4r::DocumentMetadata
 
     # not existing RID
-    rid1 = Orientdb4r::Rid.new("#{rid.cluster_id}:#{rid.document_id + 1}") # '#6:0' > '#6:1' or '#6:11' > '#6:12'
+    rid1 = Orientdb4r::Rid.new("#{created.doc_rid.cluster_id}:#{created.doc_rid.document_id + 1}") # '#6:0' > '#6:1' or '#6:11' > '#6:12'
     assert_raise Orientdb4r::NotFoundError do @client.get_document rid1; end
     # bad RID format
     assert_raise ArgumentError do @client.get_document('xx'); end
@@ -95,34 +89,34 @@ class TestDocumentCrud < Test::Unit::TestCase
   ###
   # UPDATE
   def test_update_document
-    rid = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
-    doc = @client.get_document rid
+    created = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+    doc = @client.get_document created.doc_rid
 
     doc['prop1'] = 2
     doc['prop2'] = 'unit'
     assert_nothing_thrown do @client.update_document doc; end
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     assert_equal 2, doc['prop1']
     assert_equal 'unit', doc['prop2']
 
     # bad version
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     doc['prop1'] = 222 # a property has to be changed to server engine sees a difference
     doc['@version'] = 2
     assert_raise Orientdb4r::DataError do @client.update_document doc; end
 
     # class cannot be changed
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     doc['@class'] = 'OUser'
     assert_nothing_thrown do @client.update_document doc; end
-    assert_equal CLASS, @client.get_document(rid).doc_class
+    assert_equal CLASS, @client.get_document(created.doc_rid).doc_class
 
     # no mandatory property
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     doc.delete 'prop2'
     assert_raise Orientdb4r::DataError do @client.update_document doc; end
     # notNull is null, or lesser/bigger
-    doc = @client.get_document rid
+    doc = @client.get_document created.doc_rid
     doc['prop1'] = nil
     assert_raise Orientdb4r::DataError do @client.update_document doc; end
   end
@@ -131,18 +125,14 @@ class TestDocumentCrud < Test::Unit::TestCase
   ###
   # DELETE
   def test_delete_document
-    rid = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
-    doc = @client.get_document rid
+    doc = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
     assert_not_nil doc
 
-    assert_nothing_thrown do @client.delete_document rid; end
-    assert_raise Orientdb4r::NotFoundError do @client.get_document rid; end
+    assert_nothing_thrown do @client.delete_document doc.doc_rid; end
+    assert_raise Orientdb4r::NotFoundError do @client.get_document doc.doc_rid; end
 
     # already deleted
-    # v1.1.0 allows call of DELETE on already deleted record (bug?!)
-    if @client.compare_versions(@client.server_version, '1.1.0') < 0
-      assert_raise Orientdb4r::NotFoundError do @client.delete_document rid; end
-    end
+    assert_raise Orientdb4r::NotFoundError do @client.delete_document doc.doc_rid; end
 
     # not existing RID
     assert_raise Orientdb4r::NotFoundError do @client.delete_document '#4:1111'; end

data/test/test_utils.rb

@@ -54,6 +54,15 @@ class TestUtils < Test::Unit::TestCase
     assert_equal -1, compare_versions('1.0.0', '1.0.1')
     assert_equal -1, compare_versions('1.0.0', '1.1.0')
     assert_equal -1, compare_versions('1.0.0', '2.0.0')
+
+    # test block
+    tmp = -100;
+    compare_versions('1.0.0', '1.0.0') { |comp| tmp = comp }
+    assert_equal 0, tmp
+    compare_versions('1.0.0', '2.0.0') { |comp| tmp = comp }
+    assert_equal -1, tmp
+    compare_versions('3.0.0', '2.0.0') { |comp| tmp = comp }
+    assert_equal 1, tmp
   end
 
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Vaclav Sykora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,28 +72,27 @@ files:
 - test/test_utils.rb
 homepage: http://github.com/veny/orientdb4r
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby binding for Orient DB.
 test_files:
 - test/readme_sample.rb