orientdb4r 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78703fba706afeb8f80d874c8f5e32833a15839f
-  data.tar.gz: 70276305878920f38e2c926e4e7d58e02fea36e4
+  metadata.gz: ef3c2e518a837fac1f341da1ffca84fd1ee7f877
+  data.tar.gz: 20ee3236031b5646d5d78c9e7b9f791c2fd6d87a
 SHA512:
-  metadata.gz: 1731ef1553df6b55cab52710a09c1bde1cd429406715799175695bb9079c4cfd2d0786618c8eeaa00d10048569eb369fc5a85f85755b79d54513acdec72af0b2
-  data.tar.gz: 945fc1b08151705c3b0020edcb93449d78fe0d94e965c4dd4a1592777b0997b06864116b44056aafede80f97e277ccdf73bcd19ed0cec3909eb6544da647f0ac
+  metadata.gz: 846e581d9549b7e4222defcb53927b4e18f3e2ae04167d512105c98a31ae5d5fdfdfb8f3c51c6e096d1b14457bf9f6436db335a62d653f4384e9a2a5b7b7d13d
+  data.tar.gz: ba76c836fbab42889d172f26ea380ff2977fb34cf51caff38e1893fb66e6628a2ea449e53f49b546aca41a27acac26e1d0787eab5f4421cdd105a0ec166b5509

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: qXflXiEwfGyJ5xCCGo8z0xloVYmUCZoyM

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+  - 2.2.0
+
+before_script:
+  - chmod +x ./ci/initialize-ci.sh
+  - ./ci/initialize-ci.sh $ORIENTDB_VERSION
+  - bundle exec rake db:setup4test
+
+env:
+  - ORIENTDB_VERSION=2.0.4
+
+notifications:
+  email:
+    recipients:
+      - vaclav.sykora@gmail.com
+    on_success: change
+    on_failure: change

data/Gemfile

@@ -1,3 +1,9 @@
 source "https://rubygems.org"
-
 gemspec
+
+gem 'bindata', '>=2.1'
+
+group :test do
+  gem 'test-unit', '>=3.0'
+  gem 'coveralls', require: false
+end

data/README.rdoc

@@ -9,6 +9,10 @@
 
 A Ruby client for the NoSQL Graph/Document database Orient DB (http://orientdb.org).
 
+{<img src="https://badge.fury.io/rb/orientdb4r.svg" alt="Gem Version" />}[http://badge.fury.io/rb/orientdb4r]
+{<img src="https://secure.travis-ci.org/veny/orientdb4r.png" alt="Build Status" />}[http://travis-ci.org/veny/orientdb4r]
+{<img src="https://coveralls.io/repos/veny/orientdb4r/badge.svg?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/veny/orientdb4r?branch=master]
+
 == USAGE
 
 see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
@@ -75,7 +79,7 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
 === Important Upgrade Notice
 
-* see changelog.txt
+* see +changelog.txt+
 
 
 == FEATURES/PROBLEMS
@@ -98,7 +102,7 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
 Make sure before starting the tests:
 * database server is running on localhost:2480
-* there is a root account with username=root and password=root
+* there is a root account with username=root and password=root; if your password is different, specify it with an `ORIENTDB_ROOT_PASS` environment variable
 
 
 == AUTHOR
@@ -110,3 +114,11 @@ Make sure before starting the tests:
 
 * Apache License, Version 2.0, http://www.apache.org/licenses/
 * see LICENSE file for more details...
+
+== CONTRIBUTING
+
+1. Fork it ( https://github.com/veny/orientdb4r/fork )
+1. Create your feature branch ( <tt>git checkout -b my-new-feature</tt> )
+1. Commit your changes ( <tt>git commit -am 'Add some feature'</tt> )
+1. Push to the branch ( <tt>git push origin my-new-feature</tt> )
+1. Create a new Pull Request

data/Rakefile

@@ -14,7 +14,7 @@ namespace :db do
   DB_PORT = 2480
   DB_NAME = 'temp'
   DB_ROOT_USER = 'root'
-  DB_ROOT_PASS = 'root'
+  DB_ROOT_PASS = ENV['ORIENTDB_ROOT_PASS'] || 'root'
 
   desc 'Check whether a test DB exists and create if not'
   task :setup4test do

data/changelog.txt

@@ -1,6 +1,6 @@
 0.5.0 2015-03-02
 - Provides fixes to be fully compatible with OrientDb v2.x.
-- No more backward compatible with OrientDb v1.5.x and lesser.
+- No more backward compatible with OrientDb v1.5.x and lesser
 - Pull Request #31 : rest-client 1.6.7 => 1.7.x
 - Pull Request #32 : Add Gemfile & rake as a dev dependency
 - Pull Request #33 : Fix content type header for rest-client
@@ -14,7 +14,7 @@
 
 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.
+- No more backward compatible with OrientDb v1.3.x and lesser
 - Enhancement #20 : Method 'compare_versions' accepts a block now
 - Bug Fix #25
 

data/ci/initialize-ci.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+PARENT_DIR=$(dirname $(cd "$(dirname "$0")"; pwd))
+CI_DIR="$PARENT_DIR/ci/environment"
+#CI_DIR=/tmp/travis
+
+ODB_VERSION=${1:-"2.0.4"}
+ODB_DIR="${CI_DIR}/orientdb-community-${ODB_VERSION}"
+ODB_LAUNCHER="${ODB_DIR}/bin/server.sh"
+
+
+
+echo "=== Initializing CI environment ==="
+cd "$PARENT_DIR"
+mkdir -p $CI_DIR
+
+echo "--- Downloading OrientDB v${ODB_VERSION} ---"
+wget -q -O "$CI_DIR/orientdb-community-${ODB_VERSION}.tar.gz" "http://www.orientechnologies.com/download.php?email=unknown@unknown.com&file=orientdb-community-${ODB_VERSION}.tar.gz&os=linux"
+
+echo "--- Unpacking ---------------------"
+tar xf $CI_DIR/orientdb-community-${ODB_VERSION}.tar.gz -C $CI_DIR
+
+echo "--- Setting up --------------------"
+chmod +x $ODB_LAUNCHER
+chmod -R +rw "${ODB_DIR}/config/"
+ODB_ADMIN="<users><user resources=\"*\" password=\"root\" name=\"root\"/></users>"
+sed "s:^[ \t]*<users.*$:    $ODB_ADMIN:" -i ${ODB_DIR}/config/orientdb-server-config.xml
+sed "s:^[ \t]*<\/users.*$:    <!-- \/users -->:" -i ${ODB_DIR}/config/orientdb-server-config.xml
+sed "s:^handlers = .*$:handlers = java.util.logging.ConsoleHandler:" -i ${ODB_DIR}/config/orientdb-server-log.properties
+
+echo "--- Starting server ---------------"
+sh -c $ODB_LAUNCHER </dev/null &>/dev/null &
+
+# Wait a bit for OrientDB to finish the initialization phase.
+sleep 5
+printf "=== The CI environment has been initialized ===\n"

data/lib/orientdb4r.rb

@@ -31,14 +31,17 @@ module Orientdb4r
     # Gets a new database client or an existing for the current thread.
     # === options
     #  * :instance => :new
+    #  * :binary => true
+    #  * :connection_library => :restclient | :excon
     def client options={}
       if :new == options[:instance]
         options.delete :instance
-        return RestClient.new options
+        return options.delete(:binary) ? BinClient.new(options) : RestClient.new(options)
       end
 
       Thread.exclusive {
-        Thread.current[:orientdb_client] ||= RestClient.new options
+        client = options.delete(:binary) ? BinClient.new(options) : RestClient.new(options)
+        Thread.current[:orientdb_client] ||= client
         #Thread.current[:orientdb_client] ||= BinClient.new options
       }
     end

data/lib/orientdb4r/bin/client.rb

@@ -1,12 +1,14 @@
 require 'socket'
 require 'bindata'
+require 'orientdb4r/bin/constants'
+require 'orientdb4r/bin/protocol_factory'
 
 module Orientdb4r
 
   ###
   # This client implements the binary protocol.
   class BinClient < Client
-
+    include BinConstants
 
     def initialize(options) #:nodoc:
       super()
@@ -30,19 +32,28 @@ module Orientdb4r
       @password = options[:password]
 
       socket = TCPSocket.open(@host, @port)
-      protocol = BinData::Int16be.read(socket)
+      protocol_version = BinData::Int16be.read(socket).to_i
+
+      Orientdb4r::logger.info "Binary protocol version: #{protocol_version}"
 
-      Orientdb4r::logger.info "Binary protocol number: #{protocol}"
+      # check minimal protocol version which is supported
+      #raise ConnectionError, "Protocols >= #{MINIMAL_PROTOCOL_VERSION} are supported. Please upgrade your OrientDb server." if protocol_version < MINIMAL_PROTOCOL_VERSION
+      protocol = ProtocolFactory.get_protocol(protocol_version)
 
-      command = DbOpen.new
-      command.version = protocol
-      command.database = 'temp'
-      command.user = 'admin'
-      command.password = 'admin'
+      command = protocol::DbOpen.new
+      command.protocol_version = protocol_version
+      command.db_name = @database
+      command.user = @user
+      command.password = @password
       command.write(socket)
 
-      resp = BinData::Int8.read(socket).to_i
-      puts "EE #{resp}"
+      read_response(socket)
+
+      resp = { :session => read_integer(socket) }
+
+      # status = BinData::Int8.read(socket)
+      # session = BinData::Int32be.read(socket).to_i
+puts "EE resp = #{resp.inspect}"
 
       socket.close
     end
@@ -56,42 +67,75 @@ module Orientdb4r
       raise NotImplementedError, 'this should be overridden by concrete client'
     end
 
-class ProtocolString < BinData::Primitive
-        endian    :big
 
-        int32   :len,   :value => lambda { data.length }
-        string  :data,  :read_length => :len
+      # class Connect < BinData::Record
+      #     endian :big
+
+      #     int8            :operation,       :value => 2
+      #     int32           :session,         :value => -1
+      #     protocol_string :driver,          :value => 'Orientdb4r Ruby Client'
+      #     protocol_string :driver_version,  :value => Orientdb4r::VERSION
+      #     int16           :version
+      #     protocol_string :client_id
+      #     protocol_string :user
+      #     protocol_string :password
+      # end
+      # class DbOpen < BinData::Record
+      #     endian :big
+
+      #     int8            :operation,       :value => 3 #Orientdb4r::BinConstants::REQUEST_DB_OPEN
+      #     int32           :session,         :value => -1
+
+      #     protocol_string :driver_name,     :value => Orientdb4r::DRIVER_NAME
+      #     protocol_string :driver_version,  :value => Orientdb4r::VERSION
+      #     int16           :protocol_version
+      #     protocol_string :client_id
+      #     protocol_string :serialization_impl, :value => 'ORecordDocument2csv'
+      #     int8            :token_based,     :value => 0
+      #     protocol_string :db_name
+      #     protocol_string :db_type,         :value => 'document'
+      #     protocol_string :user
+      #     protocol_string :password
+      # end
+    # ------------------------------------------------------------------ Helpers
+
+    private
+
+      # Gets a hash of parameters.
+      def params(args = {})
+        args.merge({ session: connection.session })
+      end
 
-        def get;   self.data; end
-        def set(v) self.data = v; end
+      def read_response(socket)
+        result = BinData::Int8.read(socket).to_i
+        raise_response_error(socket) unless result == Status::OK
       end
-class DbOpen < BinData::Record
-          endian :big
-
-          int8            :operation,       :value => 3  #DB_OPEN
-          int32           :session,         :value => -1 #NEW_SESSION
-
-          protocol_string :driver,          :value => 'Orientdb4r Ruby Client'
-          protocol_string :driver_version,  :value => Orientdb4r::VERSION
-          int16           :version
-          protocol_string :client_id
-          protocol_string :database
-          protocol_string :user
-          protocol_string :password
-        end
-class Connect < BinData::Record
-          endian :big
-
-          int8            :operation,       :value => 2
-          int32           :session,         :value => -1 #NEW_SESSION
-          protocol_string :driver,          :value => 'Orientdb4r Ruby Client'
-          protocol_string :driver_version,  :value => Orientdb4r::VERSION
-          int16           :version
-          protocol_string :client_id
-          protocol_string :user
-          protocol_string :password
+      def raise_response_error(socket)
+        session = read_integer(socket)
+        exceptions = []
+
+        while (result = read_byte(socket)) == Status::ERROR
+          exceptions << {
+            :exception_class => read_string(socket),
+            :exception_message => read_string(socket)
+          }
         end
 
+        Orientdb4r::logger.error "exception(s): #{exceptions}"
+
+        # if exceptions[0] && exceptions[0][:exception_class] == "com.orientechnologies.orient.core.exception.ORecordNotFoundException"
+        #   raise RecordNotFound.new(session)
+        # else
+        #  raise ServerError.new(session, *exceptions)
+        # end
+      end
+      def read_integer(socket)
+        BinData::Int32be.read(socket).to_i
+      end
+      def read_byte(socket)
+        BinData::Int8.read(socket).to_i
+      end
+
   end
 
 end

data/lib/orientdb4r/rest/client.rb

@@ -4,7 +4,7 @@ module Orientdb4r
     include Aop2
 
 
-    before [:query, :command], :assert_connected
+    before [:query, :command, :gremlin, :batch], :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
@@ -290,6 +290,20 @@ module Orientdb4r
       rslt
     end
 
+    ###
+    # Executes a Gremlin command against the database.
+    def gremlin(gremlin)
+      raise ArgumentError, 'gremlin query is blank' if blank? gremlin
+      response = call_server(:method => :post, :uri => "command/#{@database}/gremlin/#{CGI::escape(gremlin)}")
+      entries = process_response(response) do
+        raise NotFoundError, 'record not found' if response.body =~ /ORecordNotFoundException/
+      end
+
+      rslt = entries['result']
+      # mixin all document entries (they have '@class' attribute)
+      rslt.each { |doc| doc.extend Orientdb4r::DocumentMetadata unless doc['@class'].nil? }
+      rslt
+    end
 
     def command(sql) #:nodoc:
       raise ArgumentError, 'command is blank' if blank? sql
@@ -297,6 +311,14 @@ module Orientdb4r
       process_response(response)
     end
 
+    ###
+    # Executes a batch of operations in a single call.
+    def batch(operations)
+      response = call_server(:method => :post, :uri => "batch/#{@database}", \
+          :content_type => 'application/json', :data => operations.to_json)
+      process_response(response)
+    end
+
 
     # -------------------------------------------------------------------- CLASS
 

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.5.1',   '2015-03-26', "Enh #39, PR #40"],
     ['0.5.0',   '2015-03-03', "Compatible with OrientDB v2.x, PR #31, PR #32, PR #33"],
     ['0.4.1',   '2013-09-03', "Enh #24, Enh #26, Enh #27"],
     ['0.4.0',   '2013-08-14', "Closed gap between this driver and OrientDB v1.4.0+; Enh #20, BF #25"],
@@ -31,4 +32,7 @@ module Orientdb4r
   # Current version.
   VERSION = VERSION_HISTORY[0][0]
 
+  # Driver identification.
+  DRIVER_NAME = 'Orientdb4r Ruby Client'
+
 end

data/test/test_client.rb

@@ -1,15 +1,19 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests communication with OrientDB cluster and load balancing.
 class TestClient < Test::Unit::TestCase
 
-  Orientdb4r::logger.level = Logger::DEBUG
-
   PROXY_URL = 'http://bad.domain.com'
 
+  ###
+  # Test inintialization of corresponding client type
+  def test_client_type
+    client = Orientdb4r.client :instance => :new
+    assert_instance_of Orientdb4r::RestClient, client
+    client = Orientdb4r.client :instance => :new, :binary => true
+    assert_instance_of Orientdb4r::BinClient, client
+  end
 
   ###
   # Test inintialization of single node.

data/test/test_database.rb

@@ -1,18 +1,22 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests DB management.
 class TestDatabase < Test::Unit::TestCase
 
   DB = 'temp'
-  Orientdb4r::logger.level = Logger::DEBUG
 
   def setup
     @client = Orientdb4r.client
   end
 
+  def teardown
+    if @client.database_exists? :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
+      @client.delete_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
+    end
+    @client.disconnect
+  end
+
   ###
   # CONNECT
   def test_connect
@@ -43,9 +47,6 @@ class TestDatabase < Test::Unit::TestCase
     assert_raise Orientdb4r::UnauthorizedError do
       @client.connect :database => DB, :user => 'admin1', :password => 'admin'
     end
-
-    # clean up
-    @client.disconnect
   end
 
 
@@ -73,14 +74,14 @@ class TestDatabase < Test::Unit::TestCase
     assert_raise ArgumentError do @client.create_database(:database => 'UniT', :type => :foo); end
 
     assert_nothing_thrown do
-      @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+      @client.create_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
     end
     assert_nothing_thrown do
       @client.get_database :database => 'UniT', :user => 'admin', :password => 'admin'
     end
     # creating an existing DB
     assert_raise Orientdb4r::ServerError do
-      @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+      @client.create_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
     end
     # insufficient rights
     assert_raise Orientdb4r::UnauthorizedError do
@@ -92,12 +93,12 @@ class TestDatabase < Test::Unit::TestCase
     assert_nothing_thrown do
       @client.connect :database => 'UniT', :user => 'admin', :password => 'admin'
     end
-    @client.delete_database({:database => 'UniT', :user => 'root', :password => 'root'})
+    @client.delete_database({:database => 'UniT', :user => 'root', :password => DB_ROOT_PASS})
 
     # create non-default DB: storage=local;type=graph
     assert_nothing_thrown do
-      @client.create_database :database => 'UniT', :user => 'root', :password => 'root', :storage => :plocal, :type => :graph
-      @client.delete_database :database => 'UniT', :user => 'root', :password => 'root'
+      @client.create_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS, :storage => :plocal, :type => :graph
+      @client.delete_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
     end
   end
 
@@ -142,11 +143,11 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # DELETE DATABASE
   def test_delete_database
-    @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+    @client.create_database :database => 'UniT', :user => 'root', :password => DB_ROOT_PASS
 
     # deleting non-existing DB
     assert_raise Orientdb4r::ServerError do
-      @client.delete_database :database => 'UniT1', :user => 'root', :password => 'root'
+      @client.delete_database :database => 'UniT1', :user => 'root', :password => DB_ROOT_PASS
     end
     # insufficient rights
     assert_raise Orientdb4r::UnauthorizedError do
@@ -154,7 +155,7 @@ class TestDatabase < Test::Unit::TestCase
     end
 
     assert_nothing_thrown do
-      @client.delete_database({:database => 'UniT', :user => 'root', :password => 'root'})
+      @client.delete_database({:database => 'UniT', :user => 'root', :password => DB_ROOT_PASS})
     end
   end
 
@@ -165,8 +166,8 @@ class TestDatabase < Test::Unit::TestCase
     # admin/admin has not 'server.info' resource access in standard installation
     assert_raise Orientdb4r::OrientdbError do @client.server :user => 'admin', :password => 'admin'; end
 
-    assert_nothing_thrown do @client.server :user => 'root', :password => 'root'; end
-    rslt = @client.server :user => 'root', :password => 'root'
+    assert_nothing_thrown do @client.server :user => 'root', :password => DB_ROOT_PASS; end
+    rslt = @client.server :user => 'root', :password => DB_ROOT_PASS
     assert_instance_of Hash, rslt
     assert rslt.include? 'connections'
     assert_not_nil rslt['connections']
@@ -177,7 +178,7 @@ class TestDatabase < Test::Unit::TestCase
   # GET List Databases
   # Retrieves the available databases.
   def test_list_databases
-    dbs = @client.list_databases :user => 'root', :password => 'root'
+    dbs = @client.list_databases :user => 'root', :password => DB_ROOT_PASS
     assert_not_nil dbs
     assert_instance_of Array, dbs
     assert !dbs.empty?
@@ -188,8 +189,11 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # Test of :assert_connected before advice.
   def test_assert_connected
+    @client.disconnect if @client.connected? # to be sure it this method is called as first in this TestCase and thread local client is still connected
     assert_raise Orientdb4r::ConnectionError do @client.query 'SELECT FROM OUser'; end
-    assert_raise Orientdb4r::ConnectionError do @client.query "INSERT INTO OUser(name) VALUES('x')"; end
+    assert_raise Orientdb4r::ConnectionError do @client.command "INSERT INTO OUser(name) VALUES('x')"; end
+    assert_raise Orientdb4r::ConnectionError do @client.gremlin("g.addVertex('class:X', 'prop1', 1, 'prop2', 'string1')"); end
+    assert_raise Orientdb4r::ConnectionError do @client.batch({:transaction => true, :operations => []}); 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

data/test/test_ddo.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests Data Definition Operarions.
@@ -8,7 +6,6 @@ class TestDdo < Test::Unit::TestCase
 
   CLASS = 'testing'
   DB = 'temp'
-  Orientdb4r::logger.level = Logger::DEBUG
 
   def initialize(params)
     super params

data/test/test_dmo.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests Data Manipulation Operarions.
@@ -9,8 +7,6 @@ class TestDmo < Test::Unit::TestCase
 
   CLASS = 'testing'
   DB = 'temp'
-  Orientdb4r::logger.level = Logger::DEBUG
-
 
   def setup
     @client = Orientdb4r.client

data/test/test_document_crud.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests CRUD operarions on document.
@@ -9,8 +7,6 @@ class TestDocumentCrud < Test::Unit::TestCase
 
   CLASS = 'testing'
   DB = 'temp'
-  Orientdb4r::logger.level = Logger::DEBUG
-
 
   def setup
     @client = Orientdb4r.client
@@ -142,4 +138,47 @@ class TestDocumentCrud < Test::Unit::TestCase
     assert_raise ArgumentError do @client.delete_document 'xx'; end
   end
 
+
+  #######################
+  # BATCH
+  #######################
+
+  def test_batch_ok
+    doc = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+    rslt = @client.batch({:transaction => true, :operations => [
+      {:type => :c, :record => {'@class' => CLASS, :prop2 => 'foo'}},
+      {:type => :d, :record => {'@rid' => doc.doc_rid}}
+    ]})
+    assert_instance_of Hash, rslt
+    assert_equal 1, @client.query("SELECT count(*) FROM #{CLASS}")[0]['count']
+  end
+
+  def test_batch_bad_params
+    doc = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+    assert_raise Orientdb4r::ServerError do @client.batch(nil); end
+    assert_raise Orientdb4r::ServerError do @client.batch({:foo => :baz, :bar => :alfa}); end # bad structure
+    assert_raise Orientdb4r::ServerError do @client.batch({:operations => [{:type => :d, :record => {'@rid' => '#123:456'}}]}); end # bad cluster
+    assert_nothing_thrown do puts @client.batch({:operations => [{:type => :d, :record => {'@rid' => "##{doc.doc_rid.cluster_id}:678"}}]}); end # bad RID is not problem
+  end
+
+  def test_batch_transaction
+    doc = @client.create_document( { '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
+
+    assert_raise Orientdb4r::ServerError do # will fail on update => tx on => create must be rollbacked
+      rslt = @client.batch({:transaction => true, :operations => [
+        {:type => :c, :record => {'@class' => CLASS, :prop2 => 'foo'}},
+        {:type => :u, :record => {'@rid' => doc.doc_rid}},
+      ]})
+    end
+    assert_equal 1, @client.query("SELECT count(*) FROM #{CLASS}")[0]['count']
+
+    assert_raise Orientdb4r::ServerError do # will fail on update => tx off => create must be done
+      rslt = @client.batch({:transaction => false, :operations => [
+        {:type => :c, :record => {'@class' => CLASS, :prop2 => 'foo'}},
+        {:type => :u, :record => {'@rid' => doc.doc_rid}},
+      ]})
+    end
+    assert_equal 2, @client.query("SELECT count(*) FROM #{CLASS}")[0]['count']
+  end
+
 end

data/test/test_gremlin.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+###
+# This class tests Data Manipulation Operarions.
+class TestGremlin < Test::Unit::TestCase
+  include Orientdb4r::Utils
+
+  CLASS = 'testing'
+  DB = 'temp'
+
+  def setup
+    @client = Orientdb4r.client
+    @client.connect :database => DB, :user => 'admin', :password => 'admin'
+    @client.gremlin("g.V.has('@class','#{CLASS}').remove()")
+    @client.drop_class(CLASS) # just to be sure if the previous test failed
+  end
+
+  def teardown
+    # remove the testing class after each test
+    @client.gremlin("g.V.has('@class','#{CLASS}').remove()")
+    @client.drop_class(CLASS)
+    @client.disconnect
+  end
+
+  def test_gremlin
+
+    1.upto(25) do |i|
+      result = @client.gremlin("g.addVertex('class:#{CLASS}', 'prop1', 1, 'prop2', 'string1')")
+    end
+
+    entries = @client.gremlin("g.V.has('@class','#{CLASS}')[0..<20]")
+    assert_not_nil entries
+    assert_instance_of Array, entries
+    assert_equal 20, entries.size # no limit20 is default limit
+    entries.each { |doc| assert doc.kind_of? Orientdb4r::DocumentMetadata }
+    entries.each { |doc| assert_instance_of Orientdb4r::Rid, doc.doc_rid }
+    # limit
+    assert_equal 5, @client.gremlin("g.V.has('@class', '#{CLASS}')[0..<5]").size
+    entries = @client.gremlin("g.V.has('@class', '#{CLASS}')[0..<100]")
+    assert_equal 25, entries.size
+
+    assert_equal 25, @client.gremlin("g.V.has('@class', '#{CLASS}').has('prop1', 1)").size
+    assert_equal 0,  @client.gremlin("g.V.has('@class', '#{CLASS}').has('prop1', -1)").size
+
+    entries = @client.gremlin "g.v(0:1111)"
+    assert_not_nil entries
+    assert_instance_of Array, entries
+
+    assert entries.empty?
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'coveralls'
+Coveralls.wear!
+
+require 'test/unit'
+
+$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'orientdb4r'
+
+Orientdb4r::logger.level = Logger::FATAL
+DB_ROOT_PASS = ENV['ORIENTDB_ROOT_PASS'] || 'root'

data/test/test_loadbalancing.rb

@@ -1,14 +1,9 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests communication with OrientDB cluster and load balancing.
 class TestLoadBalancing < Test::Unit::TestCase
 
-  Orientdb4r::logger.level = Logger::DEBUG
-
-
   ###
   # Test default Sequence strategy.
   def test_sequence_loadbalancing

data/test/test_utils.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-require 'orientdb4r'
+require 'test_helper'
 
 ###
 # This class tests Utils methods.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Vaclav Sykora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -47,12 +47,15 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
+- ".coveralls.yml"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - changelog.txt
+- ci/initialize-ci.sh
 - fstudy/design_v1.dia
 - fstudy/design_v1.png
 - fstudy/domain_model.dia
@@ -83,6 +86,8 @@ files:
 - test/test_ddo.rb
 - test/test_dmo.rb
 - test/test_document_crud.rb
+- test/test_gremlin.rb
+- test/test_helper.rb
 - test/test_loadbalancing.rb
 - test/test_utils.rb
 homepage: http://github.com/veny/orientdb4r
@@ -106,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby binding for Orient DB.
@@ -117,5 +122,7 @@ test_files:
 - test/test_ddo.rb
 - test/test_dmo.rb
 - test/test_document_crud.rb
+- test/test_gremlin.rb
+- test/test_helper.rb
 - test/test_loadbalancing.rb
 - test/test_utils.rb