orientdb_client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b7e8eed23a652cb9e3b2011164a7327ef5c554
-  data.tar.gz: 9f567cb1117ad35b8ffbf656f3e1767e0f7dedbb
+  metadata.gz: 03bbffcac337c8b24baa097e7f55f3d4350cea44
+  data.tar.gz: a2074ddd31091c8aaae2af2fb49f2d94633d370d
 SHA512:
-  metadata.gz: fc6cd1274f0452ea61b90bee9ddfcf4c8a6aa65f80ca408820074310e658ba0b3e51d3b5a861829c24aaf150c1bc442868ee5eb031129436af90cc32da56ed1e
-  data.tar.gz: 9923fe4d47c09552ae309c82cf0bc90bdcb501d0cbd41dfe7ce1ad51fd0966e64434ef4a52053e2346b0e1408bf1a84a873d963dcd12b7e73833013a21842fdf
+  metadata.gz: a4191890669fe5a9fe9ff44e986b355adaf9a4c7182783e9d47df3ce9f4ec64d2f4f91a8050544b5509b16d4166a92a9c1cbf7a46af6fbc13103d3a2a03cce8c
+  data.tar.gz: 896fc166ca48be6faef0729eb14cd4fda54a894460d3270b78389e0a480dcd129b6d06b3c00cb3216c42449b671599aeeef8920bf973eafa06b4d5c5308b29f7

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Master
 
+## 0.0.6
+
+* Correctly handle error message for database creation conflict exceptions.
+* Ensure `NegativeArraySizeException`s are correctly converted to `NotFoundError`s across all supported versions of Orientdb.
+* Ensure "database already exists" errors messages are consistent across all supported versions of Orientdb.
+
 ## 0.0.5
 
 * Differentiate between Typhoeus adapter timeouts and connection failures.

data/README.md

@@ -2,7 +2,8 @@
 
 [![Build Status](https://travis-ci.org/lukeasrodgers/orientdb_client.svg)](https://travis-ci.org/lukeasrodgers/orientdb_client)
 
-Ruby client for Orientdb. Probably not quite ready for production yet.
+While not yet at version 1.0, the client has been in use in a production environment for several months, working fine, with some minor improvements and bugfixes along the way.
+
 Inspired by https://github.com/veny/orientdb4r
 
 Goals:
@@ -12,11 +13,13 @@ Goals:
 
 Tested on:
 * 2.1.5
+* 2.1.4
 * 2.0.6 - specs may fail due to Orientdb bug with deleting database (https://github.com/orientechnologies/orientdb/issues/3746)
 * 2.0.4
 * 2.0.2
 
-CI tests with Travis currently only run non-integration tests (i.e. they don't actually hit an Orientdb server).
+CI tests with Travis currently only run non-integration tests (i.e. they don't actually hit an Orientdb server). This means that the "tested on versions x.x.x" is *manual testing*.
+That is to say, this testing process is error-prone, so you should run the tests yourself with whatever version of Orientdb you are using.
 
 ## Installation
 

data/lib/orientdb_client/version.rb

@@ -1,3 +1,3 @@
 module OrientdbClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/orientdb_client.rb

@@ -344,14 +344,20 @@ module OrientdbClient
       when /ODatabaseException/
         if odb_error_message.match(/already exists/)
           klass = ConflictError
+          message = 'Database already exists'
         else
           klass = ServerError
+          message = "#{odb_error_class}: #{odb_error_message}"
         end
-        raise klass.new("#{odb_error_class}: #{odb_error_message}", code, body)
+        raise klass.new(message, code, body)
       when /ODistributedRecordLockedException/
         raise DistributedRecordLockedException.new("#{odb_error_class}: #{odb_error_message}", code, body)
       when /OSerializationException/
         raise SerializationException.new("#{odb_error_class}: #{odb_error_message}", code, body)
+      when /NegativeArraySizeException/
+        raise NegativeArraySizeException.new("#{odb_error_class}: #{odb_error_message}", code, body)
+      else
+        raise ServerError.new("Unparseable Orientdb server error", code, body)
       end
     end
 
@@ -365,7 +371,7 @@ module OrientdbClient
       code = response.response_code
       body = response.body
       if (body.match(/Database.*already exists/))
-        raise ConflictError.new(e.message, code, body)
+        raise ConflictError.new('Database already exists', code, body)
       elsif (body.match(/NegativeArraySizeException/))
         raise NegativeArraySizeException.new(e.message, code, body)
       else
@@ -379,7 +385,7 @@ module OrientdbClient
       [matches[1], matches[2]]
     rescue => e
       if (response.body.match(/Database.*already exists/))
-        raise ConflictError.new(e.message, response.response_code, response.body)
+        raise ConflictError.new('Database already exists', response.response_code, response.body)
       elsif (response.body.match(/NegativeArraySizeException/))
         raise NegativeArraySizeException.new(e.message, response.response_code, response.body)
       else

data/spec/orientdb_client_spec.rb

@@ -97,13 +97,23 @@ RSpec.describe OrientdbClient do
         end
 
         context 'with existing database' do
-          it 'creates a database' do
+          it 'raises a ConflictError' do
             client.create_database(temp_db_name, 'plocal', 'document')
             expect(client.database_exists?(temp_db_name)).to be true
             expect do
               client.create_database(temp_db_name, 'plocal', 'document')
             end.to raise_exception(OrientdbClient::ConflictError)
           end
+
+          it 'extracts the right conflict error message' do
+            client.create_database(temp_db_name, 'plocal', 'document')
+            expect(client.database_exists?(temp_db_name)).to be true
+            begin
+              client.create_database(temp_db_name, 'plocal', 'document')
+            rescue => e
+              expect(e.message).to eql('Database already exists')
+            end
+          end
         end
 
         context 'with invalid storage type' do
@@ -651,6 +661,42 @@ RSpec.describe OrientdbClient do
       end
     end
 
+    describe 'handling `NegativeArraySizeException`s' do
+      before do
+        client.connect(username: username, password: password, db: db)
+        if client.has_class?('Person')
+          client.command('delete vertex Person')
+          client.drop_class('Person')
+        end
+        if client.has_class?('Friend')
+          client.drop_class('Friend')
+        end
+      end
+
+      after do
+        client.command('delete vertex Person')
+        client.drop_class('Person')
+        client.drop_class('Friend')
+      end
+
+      it 'translates this exception into a NotFoundError' do
+        client.create_class('Person', extends: 'V')
+        client.create_class('Friend', extends: 'E')
+        client.command('create property Friend.out link Person')
+        client.command('create property Friend.in link Person')
+        client.command('create index FollowIdx on Friend (out,in) unique')
+        client.command('create property Person.user_id integer')
+        jim = client.command('insert into Person CONTENT ' + Oj.dump({'name' => 'jim', 'user_id' => 1}))
+        bob = client.command('insert into Person CONTENT ' + Oj.dump({'name' => 'bob', 'user_id' => 2}))
+        jim_rid = jim['result'][0]['@rid']
+        bob_rid = bob['result'][0]['@rid']
+        client.command("create edge Friend from #{jim_rid} to #{bob_rid}")
+        expect do
+          client.query("select in('Friend')[660-669].user_id,user_id from Person where user_id in [2]", {:limit=>1})
+        end.to raise_exception(OrientdbClient::NotFoundError)
+      end
+    end
+
     describe 'duplicate record creation violating index constraint' do
       before do
         client.connect(username: username, password: password, db: db)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Luke Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus