orientdb_client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeff7a5103216c207de656f5dd0addb641d2265a
-  data.tar.gz: 54538b3766d81b1f42d244909b302a9789d71a67
+  metadata.gz: 3b21ad9036b5e5873f1f51dc9508dd386bddd7b0
+  data.tar.gz: 503d006feb63fd5d7ff3ab7994af1e5d86839fed
 SHA512:
-  metadata.gz: b7338004884c5dac72cbee3816ab4e1865c1a30f4389270f081e62a055f0d951b35845e8cdebfabfa6d18fcbf9ebd13b543e2c158043ac2335854db142eb63b7
-  data.tar.gz: bd0fd3eebb9028e72e9de1857eeff9e4c73b826153f291b39746f97acd73bd9dff60838910def0381478549480b77eec31da3817b2b01a5b43bf9c2f68e8b919
+  metadata.gz: 9eb18afed7dd6191124107a6919df244536c4468e11a599690134f43f150470c20a8d078f3aea3db7131b8c165608cda500fd1a8104182d5385ba6b962480e98
+  data.tar.gz: 252f573b2958cb4ffcbae1b7a71f0cb115d8e5f78e5748c563f5b9d1a41700c30f2629a7f1da8d51e7849b99c0df4bffd397cd37c453b53c15a9d2ab7737e509

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2.3
+script: bundle exec rspec --tag ~'type:integration'

data/README.md

@@ -1,5 +1,7 @@
 # OrientdbClient
 
+[![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.
 Inspired by https://github.com/veny/orientdb4r
 
@@ -14,6 +16,8 @@ Tested on:
 * 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).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -51,7 +55,7 @@ Orientdb::logger = MyLogger.new
 # use a different HttpAdapter
 require 'orientdb_client'
 require 'orientdb_client/http_adapters/curb_adapter'
-client = OrientdbClient.cient(adapter: 'CurbAdapter')
+client = OrientdbClient.client(adapter: 'CurbAdapter')
 ```
 
 ## HTTP Adapters

data/lib/orientdb_client.rb

@@ -313,21 +313,27 @@ module OrientdbClient
         raise ClientError.new("#{odb_error_class}: #{odb_error_message}", code, body)
       when /OCommandExecutionException/
         raise CommandExecutionException.new("#{odb_error_class}: #{odb_error_message}", code, body)
-      when /OSchemaException/
+      when /OSchemaException|OIndexException/
         raise ClientError.new("#{odb_error_class}: #{odb_error_message}", code, body)
       when /OConcurrentModification/
-        raise MVCCError.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+        raise MVCCError.new("#{odb_error_class}: #{odb_error_message}", code, body)
       when /IllegalStateException/
-        raise ServerError.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+        raise ServerError.new("#{odb_error_class}: #{odb_error_message}", code, body)
       when /ORecordDuplicate/
-        raise DuplicateRecordError.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+        raise DuplicateRecordError.new("#{odb_error_class}: #{odb_error_message}", code, body)
+      when /ODistributedException/
+        if odb_error_message.match(/ORecordDuplicate/)
+          raise DistributedDuplicateRecordError.new("#{odb_error_class}: #{odb_error_message}", code, body)
+        else
+          raise DistributedException.new("#{odb_error_class}: #{odb_error_message}", code, body)
+        end
       when /OTransactionException/
         if odb_error_message.match(/ORecordDuplicate/)
-          raise DistributedDuplicateRecordError.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+          raise DistributedDuplicateRecordError.new("#{odb_error_class}: #{odb_error_message}", code, body)
         elsif odb_error_message.match(/distributed/)
-          raise DistributedTransactionException.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+          raise DistributedTransactionException.new("#{odb_error_class}: #{odb_error_message}", code, body)
         else
-          raise TransactionException.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+          raise TransactionException.new("#{odb_error_class}: #{odb_error_message}", code, body)
         end
       when /ODatabaseException/
         if odb_error_message.match(/already exists/)
@@ -335,7 +341,11 @@ module OrientdbClient
         else
           klass = ServerError
         end
-        raise klass.new("#{odb_error_class}: #{odb_error_message}", response.response_code, response.body)
+        raise klass.new("#{odb_error_class}: #{odb_error_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)
       end
     end
 
@@ -343,15 +353,17 @@ module OrientdbClient
       body = response.body
       json = Oj.load(body)
       # odb > 2.1 (?) errors are in JSON format
-      matches = json['errors'].first['content'].match(/\A([^:]+):\s?(.+)/m)
+      matches = json['errors'].first['content'].match(/\A([^:]+):?\s?(.*)/m)
       [matches[1], matches[2]]
     rescue => e
-      if (response.body.match(/Database.*already exists/))
-        raise ConflictError.new(e.message, response.response_code, response.body)
-      elsif (response.body.match(/NegativeArraySizeException/))
-        raise NegativeArraySizeException.new(e.message, response.response_code, response.body)
+      code = response.response_code
+      body = response.body
+      if (body.match(/Database.*already exists/))
+        raise ConflictError.new(e.message, code, body)
+      elsif (body.match(/NegativeArraySizeException/))
+        raise NegativeArraySizeException.new(e.message, code, body)
       else
-        raise OrientdbError.new("Could not parse Orientdb server error", response.response_code, response.body)
+        raise OrientdbError.new("Could not parse Orientdb server error: #{code}, #{body}")
       end
     end
 

data/lib/orientdb_client/errors.rb

@@ -17,12 +17,16 @@ module OrientdbClient
   class TransactionException < ServerError; end
   class DistributedTransactionException < TransactionException; end
   class MVCCError < ServerError; end
+  class DistributedRecordLockedException < TransactionException; end
+  # Generic DistributedException, generally a more specific error is preferable.
+  class DistributedException < ServerError; end
 
   # ClientError: you did something wrong
   class ClientError < OrientdbError; end
   class UnauthorizedError < ClientError; end
   class IllegalArgumentException < ClientError; end
   class CommandExecutionException < ClientError; end
+  class SerializationException < ClientError; end
 
   # ConflictError: you tried to create something that already exists
   class ConflictError < ClientError; end

data/lib/orientdb_client/version.rb

@@ -1,3 +1,3 @@
 module OrientdbClient
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/orientdb_client_spec.rb

@@ -13,16 +13,16 @@ RSpec.describe OrientdbClient do
   let(:db) { OrientdbClient::Test::DatabaseName }
   let(:temp_db_name) { "#{OrientdbClient::Test::DatabaseName}_temp" }
 
-  after(:each) do
-    if client.connected?
-      client.disconnect
-    end
-    if client.database_exists?(temp_db_name)
-      client.delete_database(temp_db_name, username: valid_username, password: valid_password)
+  describe 'integration specs', type: :integration do
+    after(:each) do
+      if client.connected?
+        client.disconnect
+      end
+      if client.database_exists?(temp_db_name)
+        client.delete_database(temp_db_name, username: valid_username, password: valid_password)
+      end
     end
-  end
 
-  describe 'integration specs', type: :integration do
     describe '#connect' do
       subject { client.connect(username: username, password: password, db: db) }
 
@@ -91,7 +91,7 @@ RSpec.describe OrientdbClient do
         before do
           client.connect(username: username, password: password, db: db)
         end
-        
+
         context 'with valid database parameters' do
           it 'creates a database' do
             client.create_database(temp_db_name, 'plocal', 'document')
@@ -128,55 +128,57 @@ RSpec.describe OrientdbClient do
     end
 
     describe '#delete_database' do
-      before(:each) do
-        if !client.database_exists?(temp_db_name)
-          client.create_database(temp_db_name, 'plocal', 'document', username: valid_username, password: valid_password)
-        end
-      end
-
-      context 'without existing connection' do
-        context 'with valid authentication options' do
-          it 'deletes the database' do
-            client.delete_database(temp_db_name, username: username, password: password)
-            expect(client.database_exists?(temp_db_name)).to be false
+      if !$distributed_mode
+        before(:each) do
+          if !client.database_exists?(temp_db_name)
+            client.create_database(temp_db_name, 'plocal', 'document', username: valid_username, password: valid_password)
           end
         end
 
-        context 'with invalid authentication options' do
-          it 'raises UnauthorizedError' do
-            expect do
-              client.delete_database(temp_db_name, username: 'foo', password: 'bar')
-            end.to raise_exception(OrientdbClient::UnauthorizedError)
+        context 'without existing connection' do
+          context 'with valid authentication options' do
+            it 'deletes the database' do
+              client.delete_database(temp_db_name, username: username, password: password)
+              expect(client.database_exists?(temp_db_name)).to be false
+            end
           end
 
-          it 'does not delete the database' do
-            begin
-              client.delete_database(temp_db_name, username: 'foo', password: 'bar')
-            rescue
-            ensure
-              expect(client.database_exists?(temp_db_name)).to be true
+          context 'with invalid authentication options' do
+            it 'raises UnauthorizedError' do
+              expect do
+                client.delete_database(temp_db_name, username: 'foo', password: 'bar')
+              end.to raise_exception(OrientdbClient::UnauthorizedError)
+            end
+
+            it 'does not delete the database' do
+              begin
+                client.delete_database(temp_db_name, username: 'foo', password: 'bar')
+              rescue
+              ensure
+                expect(client.database_exists?(temp_db_name)).to be true
+              end
             end
           end
         end
-      end
 
-      context 'with existing connection' do
-        before do
-          client.connect(username: username, password: password, db: db)
-        end
-        
-        context 'with valid database parameters' do
-          it 'deletes the database' do
-            client.delete_database(temp_db_name)
-            expect(client.database_exists?(temp_db_name)).to be false
+        context 'with existing connection' do
+          before do
+            client.connect(username: username, password: password, db: db)
           end
-        end
 
-        context 'with no matching database' do
-          it 'raises a ClientError' do
-            expect do
-              client.delete_database(temp_db_name + 'baz')
-            end.to raise_exception(OrientdbClient::ClientError, /OConfigurationException/)
+          context 'with valid database parameters' do
+            it 'deletes the database' do
+              client.delete_database(temp_db_name)
+              expect(client.database_exists?(temp_db_name)).to be false
+            end
+          end
+
+          context 'with no matching database' do
+            it 'raises a ClientError' do
+              expect do
+                client.delete_database(temp_db_name + 'baz')
+              end.to raise_exception(OrientdbClient::ClientError, /OConfigurationException/)
+            end
           end
         end
       end
@@ -228,9 +230,25 @@ RSpec.describe OrientdbClient do
           end
         end
 
+        context 'with invalid JSON' do
+          it 'raises SerializationException' do
+            expect do
+              client.command('insert into OUser CONTENT ' + Oj.dump({a:1}))
+            end.to raise_exception(OrientdbClient::SerializationException)
+          end
+        end
+
+        context 'creating index for property that does not exist' do
+          it 'raises a ClientError' do
+            expect do
+              client.command('create index UserIdx on OUser (user_id) unique')
+            end.to raise_exception(OrientdbClient::ClientError)
+          end
+        end
+
         context 'with invalid query' do
           it 'returns result' do
-            expect { client.query('select * crumb') }.to raise_exception(OrientdbClient::ClientError, /OCommandSQLParsingException/)
+            expect { client.command('select * crumb') }.to raise_exception(OrientdbClient::ClientError, /OCommandSQLParsingException/)
           end
         end
       end
@@ -358,6 +376,7 @@ RSpec.describe OrientdbClient do
           end
         end
 
+        # This spec sometimes fails on Orientdb 2.1.X
         context 'when class does not exist' do
           it 'raises exception' do
             expect do
@@ -635,6 +654,32 @@ RSpec.describe OrientdbClient do
       end
     end
 
+    describe 'duplicate record creation violating index constraint' 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
+      end
+      after do
+        client.command('delete vertex Person')
+        client.drop_class('Person')
+      end
+
+      it 'raises DuplicateRecordError' do
+        error_klass = $distributed_mode ? OrientdbClient::DistributedDuplicateRecordError : OrientdbClient:: DuplicateRecordError
+        client.create_class('Person', extends: 'V') do |c|
+          c.property('user_id', 'integer')
+        end
+        client.command('create index PersonIdx on Person (user_id) unique')
+        client.command('insert into Person CONTENT ' + Oj.dump({'user_id' => 1}))
+        expect do
+          client.command('insert into Person CONTENT ' + Oj.dump({'user_id' => 1}))
+        end.to raise_exception(error_klass)
+      end
+    end
+
   end
 
   # These specs will sometimes fail, not too much we can do about that, depends
@@ -674,7 +719,8 @@ RSpec.describe OrientdbClient do
       jim_rid = jim['result'][0]['@rid']
       bob_rid = bob['result'][0]['@rid']
       thrs = []
-      expect do 
+      err = nil
+      begin
         thrs << Thread.new do
           100.times do
             client.command("create edge Friend from #{jim_rid} to #{bob_rid}")
@@ -688,7 +734,16 @@ RSpec.describe OrientdbClient do
           end
         end
         thrs.each { |t| t.join }
-      end.to raise_exception(OrientdbClient::MVCCError, /OConcurrentModificationException/)
+      rescue => e
+        err = e
+      ensure
+        if $distributed_mode
+          correct_error_raised = err.is_a?(OrientdbClient::MVCCError) || err.is_a?(OrientdbClient::DistributedRecordLockedException)
+        else
+          correct_error_raised = err.is_a?(OrientdbClient::MVCCError)
+        end
+        expect(correct_error_raised).to be true
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -25,6 +25,19 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!(:allow_localhost => true)
 
 $db = ENV['ORIENTDB_TEST_DATABASENAME'] || OrientdbClient::Test::DatabaseName
+begin
+  r = `ps aux | grep -E "server.*orient.*distributed=true" | grep -v grep | wc -l`;
+  $distributed_mode = r.strip.chomp.to_i == 1
+rescue
+  puts "Could not determine Orientdb distributed/standalone mode, assuming standalone"
+  $distributed_mode = false
+ensure
+  if $distributed_mode
+    # Orientdb distributed mode does not support db deletion.
+    # https://github.com/orientechnologies/orientdb/issues/3746
+    puts "Orientdb is running in distributed mode; skipping some tests."
+  end
+end
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luke Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -146,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -194,3 +195,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_http_adapter.rb
 - spec/typhoeus_adapter_spec.rb
+has_rdoc: