orientdb4r 0.2.6 → 0.2.7

data/README.rdoc

@@ -18,10 +18,12 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
   client.connect :database => 'temp', :user => 'admin', :password => 'admin'
 
-  client.create_class(CLASS) do |c|
-    c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
-    c.property 'prop2', :string, :mandatory => true
-    c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
+  unless client.class_exists? CLASS
+    client.create_class(CLASS) do |c|
+      c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
+      c.property 'prop2', :string, :mandatory => true
+      c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
+    end
   end
 
   admin = client.query("SELECT FROM OUser WHERE name = 'admin'")[0]

data/changelog.txt

@@ -0,0 +1,8 @@
+0.3.0 07/x/12
+===============
+- 'rest-client' replaced by 'excon' for HTTP communication with Keep-Alive
+- introduced support for distributed server
+
+0.3.0 07/07/12
+- changed design to support distributed server
+- added method Client#class_exists?

data/lib/orientdb4r/client.rb

@@ -6,6 +6,7 @@ module Orientdb4r
     # Server version used if no concrete version identified.
     DEFAULT_SERVER_VERSION = '1.0.0--'
 
+    # # Regexp to validate format of providet version.
     SERVER_VERSION_PATTERN = /^\d+\.\d+\.\d+/
 
     attr_reader :server_version
@@ -13,6 +14,7 @@ module Orientdb4r
     ###
     # Constructor.
     def initialize
+      @nodes = []
       @connected = false
     end
 
@@ -75,7 +77,7 @@ module Orientdb4r
       rslt = true
       begin
         get_database options
-      rescue NotFoundError
+      rescue OrientdbError
         rslt = false
       end
       rslt
@@ -137,6 +139,19 @@ module Orientdb4r
     end
 
 
+    ###
+    # Checks existence of a given class.
+    def class_exists?(name)
+      rslt = true
+      begin
+        get_class name
+      rescue NotFoundError
+        rslt = false
+      end
+      rslt
+    end
+
+
     ###
     # Removes a class from the schema.
     def drop_class(name, options={})
@@ -146,8 +161,8 @@ module Orientdb4r
       opt_pattern = { :mode => :nil }
       verify_options(options, opt_pattern)
       if :strict == options[:mode]
-        response = @resource["connect/#{@database}"].get
-        connect_info = process_response(response, :mode => :strict)
+        response = a_node.request(:method => :get, :uri => "connect/#{@database}") # TODO there cannot be REST
+        connect_info = process_response response
         children = connect_info['classes'].select { |i| i['superClass'] == name }
         unless children.empty?
           raise OrientdbError, "class is super-class, cannot be deleted, name=#{name}"
@@ -221,6 +236,11 @@ module Orientdb4r
 
     protected
 
+      def a_node
+        @nodes[0]
+      end
+
+
       ###
       # Asserts if the client is connected and raises an error if not.
       def assert_connected

data/lib/orientdb4r/node.rb

@@ -0,0 +1,36 @@
+module Orientdb4r
+
+  ###
+  # This class represents a single sever/node
+  # in the Distributed Multi-Master Architecture.
+  class Node
+    include Utils
+
+    attr_reader :host, :port # they are immutable
+
+    ###
+    # Constructor.
+    def initialize(host, port)
+      raise ArgumentError, 'host cannot be blank' if blank? host
+      raise ArgumentError, 'port cannot be blank' if blank? port
+      @host = host
+      @port = port
+    end
+
+
+    ###
+    # Cleans up resources used by the node.
+    def cleanup
+      raise NotImplementedError, 'this should be overridden by subclass'
+    end
+
+
+    ###
+    # Gets URL of the remote node.
+    def url
+      raise NotImplementedError, 'this should be overridden by subclass'
+    end
+
+  end
+
+end

data/lib/orientdb4r/rest/client.rb

@@ -3,24 +3,21 @@ module Orientdb4r
   class RestClient < Client
     include Aop2
 
-    # Name of cookie that represents a session.
-    SESSION_COOKIE_NAME = 'OSESSIONID'
 
     before [:query, :command], :assert_connected
     before [:create_class, :get_class, :drop_class, :create_property], :assert_connected
     before [:create_document, :get_document, :update_document, :delete_document], :assert_connected
     around [:query, :command], :time_around
 
-    attr_reader :host, :port, :ssl, :user, :password, :database, :session_id
+    attr_reader :user, :password, :database
 
 
     def initialize(options) #:nodoc:
       super()
       options_pattern = { :host => 'localhost', :port => 2480, :ssl => false }
       verify_and_sanitize_options(options, options_pattern)
-      @host = options[:host]
-      @port = options[:port]
-      @ssl = options[:ssl]
+
+      @nodes << RestClientNode.new(options[:host], options[:port], options[:ssl])
     end
 
 
@@ -33,40 +30,35 @@ module Orientdb4r
       @user = options[:user]
       @password = options[:password]
 
-
+      node = a_node
       begin
-        response = ::RestClient::Request.new(:method => :get, :url => "#{url}/connect/#{@database}", \
-            :user => user, :password => password).execute
-        @session_id = response.cookies[SESSION_COOKIE_NAME]
-        rslt = process_response(response, :mode => :strict)
-
-        # resource used for all request
-        @resource = ::RestClient::Resource.new(url, \
-            :user => user, :password => password, :cookies => { SESSION_COOKIE_NAME => session_id})
-
-        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
-        raise OrientdbError, "bad version format, version=#{server_version}" unless server_version =~ SERVER_VERSION_PATTERN
-        Orientdb4r::logger.debug "successfully connected to server, version=#{server_version}, session=#{session_id}"
-
-        @connected = true
-        @session_id = response.cookies[SESSION_COOKIE_NAME]
+        response = node.oo_request(:method => :get, :uri => "connect/#{@database}", :user => user, :password => password)
       rescue
         @connected = false
-        @session_id = nil
         @server_version = nil
         @user = nil
         @password = nil
         @database = nil
-        @resource = nil
+        @nodes.each { |node| node.cleanup }
         raise ConnectionError
       end
+      rslt = process_response response
+      node.post_connect(user, password, 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
+
+      Orientdb4r::logger.debug "successfully connected to server, version=#{server_version}, session=#{node.session_id}"
+      @connected = true
       rslt
     end
 
@@ -75,35 +67,31 @@ module Orientdb4r
       return unless @connected
 
       begin
-        response = @resource['disconnect'].get
-      rescue ::RestClient::Unauthorized
+        a_node.request(:method => :get, :uri => 'disconnect')
         # https://groups.google.com/forum/?fromgroups#!topic/orient-database/5MAMCvFavTc
         # Disconnect doesn't require you're authenticated.
         # It always returns 401 because some browsers intercept this and avoid to reuse the same session again.
       ensure
         @connected = false
         @server_version = nil
-        @session_id = nil
         @user = nil
         @password = nil
         @database = nil
-        @resource = nil
+        @nodes.each { |node| node.cleanup }
         Orientdb4r::logger.debug 'disconnected from server'
       end
     end
 
 
     def server(options={}) #:nodoc:
-      # 'server' does NOT use the RestClient Resource to construct the HTTP request
-
       options_pattern = { :user => :optional, :password => :optional }
       verify_options(options, options_pattern)
 
       u = options.include?(:user) ? options[:user] : user
       p = options.include?(:password) ? options[:password] : password
-      resource = ::RestClient::Resource.new(url, :user => u, :password => p)
       begin
-        response = resource['server'].get
+        # uses one-off request because of additional authentication to the server
+        response = a_node.oo_request :method => :get, :user => u, :password => p, :uri => 'server'
       rescue
         raise OrientdbError
       end
@@ -122,9 +110,10 @@ module Orientdb4r
 
       u = options.include?(:user) ? options[:user] : user
       p = options.include?(:password) ? options[:password] : password
-      resource = ::RestClient::Resource.new(url, :user => u, :password => p)
       begin
-        response = resource["database/#{options[:database]}/#{options[:type]}"].post ''
+        # uses one-off request because of additional authentication to the server
+        response = a_node.oo_request :method => :post, :user => u, :password => p, \
+            :uri => "database/#{options[:database]}/#{options[:type]}"
       rescue
         raise OrientdbError
       end
@@ -146,9 +135,10 @@ module Orientdb4r
 
       u = options.include?(:user) ? options[:user] : user
       p = options.include?(:password) ? options[:password] : password
-      resource = ::RestClient::Resource.new(url, :user => u, :password => p)
       begin
-        response = resource["database/#{options[:database]}"].get
+        # uses one-off request because of additional authentication to the server
+        response = a_node.oo_request :method => :get, :user => u, :password => p, \
+            :uri => "database/#{options[:database]}"
       rescue
         raise NotFoundError
       end
@@ -166,7 +156,11 @@ module Orientdb4r
 
       limit = ''
       limit = "/#{options[:limit]}" if !options.nil? and options.include?(:limit)
-      response = @resource["query/#{@database}/sql/#{CGI::escape(sql)}#{limit}"].get
+      begin
+        response = a_node.request(:method => :get, :uri => "query/#{@database}/sql/#{CGI::escape(sql)}#{limit}")
+      rescue
+        raise NotFoundError
+      end
       entries = process_response(response)
       rslt = entries['result']
       # mixin all document entries (they have '@class' attribute)
@@ -178,14 +172,11 @@ module Orientdb4r
     def command(sql) #:nodoc:
       raise ArgumentError, 'command is blank' if blank? sql
       begin
-#puts "REQ command/#{@database}/sql/#{CGI::escape(sql)}"
-        response = @resource["command/#{@database}/sql/#{CGI::escape(sql)}"].post ''
-        rslt = process_response(response)
-        rslt
-#puts "RESP #{response.body}"
+        response = a_node.request(:method => :post, :uri => "command/#{@database}/sql/#{CGI::escape(sql)}")
       rescue
         raise OrientdbError
       end
+      process_response(response)
     end
 
 
@@ -196,17 +187,21 @@ module Orientdb4r
 
       if compare_versions(server_version, '1.1.0') >= 0
         begin
-          response = @resource["class/#{@database}/#{name}"].get
+          response = a_node.request(:method => :get, :uri => "class/#{@database}/#{name}")
         rescue
           raise NotFoundError
         end
-        rslt = process_response(response, :mode => :strict)
+        rslt = process_response(response)
         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 = @resource["connect/#{@database}"].get
-        connect_info = process_response(response, :mode => :strict)
+        begin
+          response = a_node.request(:method => :get, :uri => "connect/#{@database}")
+        rescue
+          raise NotFoundError
+        end
+        connect_info = process_response response
 
         classes = connect_info['classes'].select { |i| i['name'] == name }
         raise NotFoundError, "class not found, name=#{name}" unless 1 == classes.size
@@ -231,7 +226,8 @@ module Orientdb4r
 
     def create_document(doc)
       begin
-        response = @resource["document/#{@database}"].post doc.to_json, :content_type => 'application/json'
+        response = a_node.request(:method => :post, :uri => "document/#{@database}", \
+            :content_type => 'application/json', :data => doc.to_json)
       rescue
         raise DataError
       end
@@ -247,7 +243,7 @@ module Orientdb4r
       rid = rid[1..-1] if rid.start_with? '#'
 
       begin
-        response = @resource["document/#{@database}/#{rid}"].get
+        response = a_node.request(:method => :get, :uri => "document/#{@database}/#{rid}")
       rescue
         raise NotFoundError
       end
@@ -266,7 +262,8 @@ module Orientdb4r
       rid = rid[1..-1] if rid.start_with? '#'
 
       begin
-        @resource["document/#{@database}/#{rid}"].put doc.to_json, :content_type => 'application/json'
+        a_node.request(:method => :put, :uri => "document/#{@database}/#{rid}", \
+            :content_type => 'application/json', :data => doc.to_json)
       rescue
         raise DataError
       end
@@ -280,8 +277,7 @@ module Orientdb4r
       rid = rid[1..-1] if rid.start_with? '#'
 
       begin
-        response = @resource["document/#{@database}/#{rid}"].delete
-        puts "DELETE '#{response}'"
+        response = a_node.request(:method => :delete, :uri => "document/#{@database}/#{rid}")
       rescue
         raise DataError
       end
@@ -292,17 +288,39 @@ module Orientdb4r
 
     private
 
-      ###
-      # Gets URL of the REST interface.
-      def url
-        "http#{'s' if ssl}://#{host}:#{port}"
+      ####
+      # Processes a HTTP response.
+      def process_response(response)
+        raise ArgumentError, 'response is null' if response.nil?
+
+        # return code
+        if 200 != response.code and 2 == (response.code / 100)
+          Orientdb4r::logger.warn "expected return code 200, but received #{response.code}"
+        elsif 401 == response.code
+          raise UnauthorizedError, '401 Unauthorized'
+        elsif 200 != response.code
+          msg = response.body.gsub("\n", ' ')
+          msg = "#{msg[0..100]} ..." if msg.size > 100
+          raise OrientdbError, "unexpected return code, code=#{response.code}, body=#{msg}"
+        end
+
+        content_type = response.headers[:content_type]
+        content_type ||= 'text/plain'
+
+        rslt = case
+          when content_type.start_with?('text/plain')
+            response.body
+          when content_type.start_with?('application/json')
+            ::JSON.parse(response.body)
+          else
+            raise OrientdbError, "unsuported content type: #{content_type}"
+          end
+
+        rslt
       end
 
-      ###
-      # ==== options
-      # * strict
-      # * warning
-      def process_response(response, options={})
+      # @deprecated
+      def process_restclient_response(response, options={})
         raise ArgumentError, 'response is null' if response.nil?
 
         # raise problem if other code than 200

data/lib/orientdb4r/rest/node.rb

@@ -0,0 +1,79 @@
+module Orientdb4r
+
+  ###
+  # This class represents a single sever/node in the Distributed Multi-Master Architecture
+  # accessible view REST API.
+  class RestNode < Node
+
+    # Name of cookie that represents a session.
+    SESSION_COOKIE_NAME = 'OSESSIONID'
+
+    attr_reader :ssl
+
+    ###
+    # Constructor.
+    def initialize(host, port, ssl)
+      super(host, port)
+      raise ArgumentError, 'ssl flag cannot be blank' if blank?(ssl)
+      @ssl = ssl
+    end
+
+
+    def url #:nodoc:
+      "http#{'s' if ssl}://#{host}:#{port}"
+    end
+
+
+    # ----------------------------------------------------------- RestNode Stuff
+
+    ###
+    # Initializes a long life connection with credentials and session ID
+    # after successful connect.
+    def post_connect(user, password, http_response)
+      raise NotImplementedError, 'this should be overridden by subclass'
+
+# excon
+#      cookies = CGI::Cookie::parse(http_response.headers['Set-Cookie'])
+#      @session_id = cookies[SESSION_COOKIE_NAME][0]
+    end
+
+
+    ###
+    # Sends an one-off request to the remote server.
+    def oo_request(options)
+      raise NotImplementedError, 'this should be overridden by subclass'
+    end
+
+
+    ###
+    # Sends a request to the remote server
+    # based on a connection object which is reusable across multiple requests.
+    def request(options)
+      raise NotImplementedError, 'this should be overridden by subclass'
+    end
+
+
+    ###
+    # Gets value of the Basic Auth header.
+    def basic_auth_header(user, password)
+      b64 = Base64.encode64("#{user}:#{password}").delete("\r\n")
+      "Basic #{b64}"
+    end
+
+
+# excon   ###
+#    # Get request headers prepared with session ID and Basic Auth.
+#    def headers
+#      {'Authorization' => @basic_auth, 'Cookie' => "#{SESSION_COOKIE_NAME}=#{session_id}"}
+#    end
+
+# excon   ###
+#    # Gets a connection object which is reusable across multiple requests.
+#    def connection
+#      @connection = Excon.new(url) if @connection.nil?
+#      @connection
+#    end
+
+  end
+
+end

data/lib/orientdb4r/rest/restclient_node.rb

@@ -0,0 +1,70 @@
+module Orientdb4r
+
+  ###
+  # This class represents a single sever/node in the Distributed Multi-Master Architecture
+  # accessible view REST API and 'rest-client' library on the client side.
+  class RestClientNode < RestNode
+
+    attr_reader :session_id
+
+
+    def oo_request(options) #:nodoc:
+      begin
+        options[:url] = "#{url}/#{options[:uri]}"
+        options.delete :uri
+        response = ::RestClient::Request.new(options).execute
+      rescue ::RestClient::Unauthorized
+        # fake the response object
+        response = "401 Unauthorized"
+        def response.code
+          401
+        end
+      end
+      response
+    end
+
+
+    def request(options) #:nodoc:
+      raise OrientdbError, 'long life connection not initialized' if @resource.nil?
+
+      data = options[:data]
+      options.delete :data
+      data = '' if data.nil? and :post == options[:method] # POST has to have data
+      begin
+        # e.g. @resource['disconnect'].get
+        if data.nil?
+          response = @resource[options[:uri]].send options[:method].to_sym
+        else
+          response = @resource[options[:uri]].send options[:method].to_sym, data
+        end
+      rescue ::RestClient::Unauthorized
+        # fake the response object
+        response = "401 Unauthorized"
+        def response.code
+          401
+        end
+      end
+
+      response
+    end
+
+
+    def post_connect(user, password, http_response) #:nodoc:
+      @basic_auth = basic_auth_header(user, password)
+      @session_id = http_response.cookies[SESSION_COOKIE_NAME]
+
+      @resource = ::RestClient::Resource.new(url, \
+            :user => user, :password => password, \
+            :cookies => { SESSION_COOKIE_NAME => session_id})
+    end
+
+
+    def cleanup #:nodoc:
+      @session_id = nil
+      @basic_auth = nil
+      @resource = nil
+    end
+
+  end
+
+end

data/lib/orientdb4r/utils.rb

@@ -37,7 +37,7 @@ module Orientdb4r
     ###
     # Checks if a given string is either 'nil' or empty string.
     def blank?(str)
-      str.nil? or str.strip.empty?
+      str.nil? or (str.is_a? String and str.strip.empty?)
     end
 
     ###

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.2.7', '2012-07-07', "Added method Client#class_exists?"],
     ['0.2.6', '2012-07-03', "BF #8, BF #6"],
     ['0.2.5', '2012-07-01', "Added 'get_database' into database CRUD"],
     # v-- https://groups.google.com/forum/?fromgroups#!topic/orient-database/5MAMCvFavTc

data/lib/orientdb4r.rb

@@ -1,6 +1,7 @@
 require 'json'
-require 'rest_client'
+require 'base64'
 require 'logger'
+require 'rest_client'
 require 'orientdb4r/version'
 
 
@@ -14,6 +15,9 @@ module Orientdb4r
   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'
 
 
   class << self
@@ -21,14 +25,16 @@ module Orientdb4r
     ###
     # Gets a new database client or an existing for the current thread.
     # === options
-    #  * :force => true
+    #  * :instance => :new
     def client options={}
       if :new == options[:instance]
         options.delete :instance
         return RestClient.new options
       end
 
-      Thread.current[:orientdb_client] ||= RestClient.new options
+      Thread.exclusive {
+        Thread.current[:orientdb_client] ||= RestClient.new options
+      }
     end
 
     ###
@@ -48,6 +54,10 @@ module Orientdb4r
     include ChainedError
   end
 
+  ###
+  # Error indicating that access to the resource requires user authentication.
+  class UnauthorizedError < OrientdbError; end
+
   ###
   # Error indicating problems with communicating with the database.
   class ConnectionError < OrientdbError; end
@@ -72,5 +82,6 @@ Orientdb4r::logger.info \
   "Orientdb4r #{Orientdb4r::VERSION}, running on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 
 
+#Orientdb4r::logger.level = Logger::DEBUG
 #client = Orientdb4r.client
 #client.connect :database => 'temp', :user => 'admin', :password => 'admin'

data/test/readme_sample.rb

@@ -6,10 +6,12 @@
 
   client.connect :database => 'temp', :user => 'admin', :password => 'admin'
 
-  client.create_class(CLASS) do |c|
-    c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
-    c.property 'prop2', :string, :mandatory => true
-    c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
+  unless client.class_exists? CLASS
+    client.create_class(CLASS) do |c|
+      c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
+      c.property 'prop2', :string, :mandatory => true
+      c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
+    end
   end
 
   admin = client.query("SELECT FROM OUser WHERE name = 'admin'")[0]

data/test/test_database.rb

@@ -23,13 +23,13 @@ class TestDatabase < Test::Unit::TestCase
     assert rslt.size > 0
     assert rslt.include? 'classes'
 
-    assert_equal 'localhost', @client.host
-    assert_equal 2480, @client.port
-    assert_equal false, @client.ssl
+    #assert_equal 'localhost', @client.host # TODO moved to Node; mock?
+    #assert_equal 2480, @client.port
+    #assert_equal false, @client.ssl
     assert_equal 'admin', @client.user
     assert_equal 'admin', @client.password
     assert_equal 'temp', @client.database
-    assert_not_nil @client.session_id
+    #assert_not_nil @client.session_id
     assert_not_nil @client.server_version
 
     # connection refused
@@ -39,11 +39,11 @@ class TestDatabase < Test::Unit::TestCase
     end
 
     # bad DB name
-    assert_raise Orientdb4r::ConnectionError do
+    assert_raise Orientdb4r::UnauthorizedError do
       @client.connect :database => 'unknown_db', :user => 'admin', :password => 'admin'
     end
     # bad credentials
-    assert_raise Orientdb4r::ConnectionError do
+    assert_raise Orientdb4r::UnauthorizedError do
       @client.connect :database => 'temp', :user => 'admin1', :password => 'admin'
     end
   end
@@ -59,13 +59,13 @@ class TestDatabase < Test::Unit::TestCase
     # unable to query after disconnect
     assert_raise Orientdb4r::ConnectionError do @client.query 'SELECT FROM OUser'; end
 
-    assert_equal 'localhost', @client.host
-    assert_equal 2480, @client.port
-    assert_equal false, @client.ssl
+    #assert_equal 'localhost', @client.host # TODO moved to Node; mock?
+    #assert_equal 2480, @client.port
+    #assert_equal false, @client.ssl
     assert_nil @client.user
     assert_nil @client.password
     assert_nil @client.database
-    assert_nil @client.session_id
+    #assert_nil @client.session_id
     assert_nil @client.server_version
   end
 
@@ -75,7 +75,9 @@ class TestDatabase < Test::Unit::TestCase
   # Temporary disabled because of unknown way how to drop a new created datatabse.
   def xtest_create_database
     @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
-    assert_nothing_thrown do @client.get_database 'UniT'; end
+    assert_nothing_thrown do
+      @client.get_database :database => 'UniT', :user => 'admin', :password => 'admin'
+    end
     # creating an existing DB
     assert_raise Orientdb4r::OrientdbError do
       @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
@@ -110,7 +112,7 @@ class TestDatabase < Test::Unit::TestCase
     assert @client.database_exists?(:database => 'temp') # use credentials of logged in user
 
     # bad databases
-    assert_raise Orientdb4r::NotFoundError do @client.get_database :database => 'UnknownDB'; end
+    assert_raise Orientdb4r::UnauthorizedError do @client.get_database :database => 'UnknownDB'; end
     assert_raise Orientdb4r::NotFoundError do @client.get_database :database => 'temp/admin'; end
     assert !@client.database_exists?(:database => 'UnknownDB')
     assert !@client.database_exists?(:database => 'temp/admin')

data/test/test_ddo.rb

@@ -54,13 +54,18 @@ class TestDdo < Test::Unit::TestCase
     assert_nil prop.min
     assert_nil prop.min
     assert prop.kind_of? Orientdb4r::Property
+
+    assert @client.class_exists?('OUser')
+    assert !@client.class_exists?('UnknownClass')
   end
 
 
   ###
   # CREATE CLASS
   def test_create_class
+    assert !@client.class_exists?(CLASS)
     assert_nothing_thrown do @client.create_class(CLASS); end
+    assert @client.class_exists?(CLASS)
     assert_nothing_thrown do @client.get_class(CLASS); end # raises an Error if no class found
     # already exist
     assert_raise Orientdb4r::OrientdbError do @client.create_class(CLASS); end

data/test/test_dmo.rb

@@ -51,6 +51,17 @@ class TestDmo < Test::Unit::TestCase
     end
     assert_equal urids.size, @client.query("SELECT FROM #{CLASS} WHERE prop2 = 'linkset'")[0]['friends'].size
 
+    # table doesn't exist
+    assert_raise Orientdb4r::OrientdbError do
+      @client.command "INSERT INTO #{CLASS}x (prop1, prop2, friends) VALUES (1, 'linkset', [#{urids.join(',')}])"
+    end
+    # bad syntax
+    assert_raise Orientdb4r::OrientdbError do
+      @client.command 'xxx'
+    end
+
+    # used for SELECT
+    assert_equal @client.query('SELECT FROM OUser'), @client.command('SELECT FROM OUser')['result']
   end
 
 
@@ -81,6 +92,19 @@ class TestDmo < Test::Unit::TestCase
     assert_equal 1, gr.select { |e| e if e['@class'] == CLASS }.size
     assert_equal 1, gr.select { |e| e if e['@class'] == 'OUser' }.size
     assert_equal 1, gr.select { |e| e if e['@class'] == 'ORole' }.size
+
+    # table doesn't exist
+    assert_raise Orientdb4r::NotFoundError do
+      @client.query 'SELECT FROM OUserX'
+    end
+    # bad syntax
+    assert_raise Orientdb4r::NotFoundError do
+      @client.query 'xxx'
+    end
+    # used for INSERT
+    assert_raise Orientdb4r::NotFoundError do
+      @client.query "INSERT INTO #{CLASS} (prop1, prop2, friends) VALUES (0, 'string0', [])"
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -40,11 +40,15 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- changelog.txt
 - lib/orientdb4r.rb
 - lib/orientdb4r/chained_error.rb
 - lib/orientdb4r/client.rb
+- lib/orientdb4r/node.rb
 - lib/orientdb4r/rest/client.rb
 - lib/orientdb4r/rest/model.rb
+- lib/orientdb4r/rest/node.rb
+- lib/orientdb4r/rest/restclient_node.rb
 - lib/orientdb4r/utils.rb
 - lib/orientdb4r/version.rb
 - orientdb4r.gemspec
@@ -76,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby binding for Orient DB.