orient_db_client 0.0.1 → 0.0.2

data/lib/orient_db_client/connection.rb

@@ -36,17 +36,13 @@ module OrientDbClient
         when 'java.lang.IndexOutOfBoundsException', 'java.lang.IllegalArgumentException'
           result = false
         else
-          throw err
+          raise err
         end
       end
 
       result
     end
 
-    def command(session, text, options = {})
-      @protocol.command(@socket, session, text, options)
-    end
-
     def count(session, cluster_name)
       @protocol.count(@socket, session, cluster_name)
     end
@@ -123,6 +119,14 @@ module OrientDbClient
       @sessions[session] = DatabaseSession.new(message_content[:session], self, message_content[:clusters])
   	end
 
+    def query(session, text, options = {})
+      options[:query_class_name] = :query
+      
+      result = @protocol.command(@socket, session, text, options)
+
+      result[:message_content]
+    end
+
     def reload(session)
       result = @protocol.db_reload(@socket, session)
       clusters = result[:message_content][:clusters]

data/lib/orient_db_client/database_session.rb

@@ -18,10 +18,6 @@ module OrientDbClient
 			@connection.cluster_exists?(@id, cluster_id)
 		end
 
-		def command(text, options = {})
-			@connection.command(@id, text, options)
-		end
-
 		def count(cluster_name)
 			@connection.count(@id, cluster_name)
 		end
@@ -45,12 +41,12 @@ module OrientDbClient
 		end
 
 		def delete_record(rid_or_cluster_id, cluster_position_or_version, version = nil)
-			if rid_or_cluster_id.is_a?(Fixnum)
-				rid = OrientDbClient::Rid.new(rid_or_cluster_id, cluster_position)
-				version = version
-			else
+			if rid_or_cluster_id.is_a?(OrientDbClient::Rid)
 				rid = rid_or_cluster_id
-				version = cluster_position_or_version
+				version = cluster_position_or_version.to_i
+			else
+				rid = OrientDbClient::Rid.new(rid_or_cluster_id.to_i, cluster_position_or_version.to_i)
+				version = version
 			end
 			
 			@connection.delete_record(@id, rid, version)
@@ -76,13 +72,17 @@ module OrientDbClient
 			@connection.load_record(@id, rid_or_cluster_id)[:message_content]
 		end
 
+		def query(text, options = {})
+			@connection.query(@id, text, options)
+		end
+
 		def reload
 			@connection.reload(@id)
 		end
 
-		def update_record(record, rid_or_cluster_id, cluster_position_or_version, version = nil)
+		def update_record(record, rid_or_cluster_id, cluster_position_or_version, version = :none)
 			if rid_or_cluster_id.is_a?(Fixnum)
-				rid = OrientDbClient::Rid.new(rid_or_cluster_id, cluster_position)
+				rid = OrientDbClient::Rid.new(rid_or_cluster_id, cluster_position_or_version)
 				version = version
 			else
 				rid = rid_or_cluster_id

data/lib/orient_db_client/protocols/protocol7.rb

@@ -66,15 +66,26 @@ module OrientDbClient
 			DRIVER_NAME 	= 'OrientDB Ruby Client'.freeze
 			DRIVER_VERSION 	= OrientDbClient::VERSION
 
+			COMMAND_CLASS = 'com.orientechnologies.orient.core.sql.OCommandSQL'.freeze
+			QUERY_CLASS = 'com.orientechnologies.orient.core.sql.query.OSQLSynchQuery'.freeze
+
 			NEW_SESSION = -1
 
 			def self.command(socket, session, command, options = {})
 				options = {
 					:async =>				false,	# Async mode is not supported yet
-					:query_class_name => 	'com.orientechnologies.orient.core.sql.query.OSQLSynchQuery',
+					:query_class_name => QUERY_CLASS,
 					:limit =>				-1
 				}.merge(options);
 
+				if options[:query_class_name].is_a?(Symbol)
+					options[:query_class_name] = case options[:query_class_name]
+						when :query then QUERY_CLASS
+						when :command then COMMAND_CLASS
+						else raise "Unsupported command class: #{options[:query_class_name]}"
+					end
+				end
+
 				serialized_command = NetworkMessage.new { |m|
 					m.add :string,		options[:query_class_name]
 					m.add :string,		command
@@ -408,7 +419,7 @@ module OrientDbClient
 						:record_version 	=> read_integer(socket),
 						:bytes				=> read_string(socket) })
 				else
-					throw "Unsupported record format: #{record[:format]}"
+					raise "Unsupported record format: #{record[:format]}"
 				end
 			end
 
@@ -424,7 +435,7 @@ module OrientDbClient
 						result.concat collection
 						break
 					else
-						throw "Unsupported payload status: #{status}"
+						raise "Unsupported payload status: #{status}"
 					end
 				end
 
@@ -519,10 +530,10 @@ module OrientDbClient
 							result = result || record
 							result[:document] = deserializer.deserialize(record[:bytes])[:document]
 						else
-							throw "Unsupported record type: #{record[:record_type]}"
+							raise "Unsupported record type: #{record[:record_type]}"
 						end
 					else
-						throw "Unsupported payload status: #{status}"
+						raise "Unsupported payload status: #{status}"
 					end
 				end
 

data/lib/orient_db_client/protocols/protocol9.rb

@@ -8,9 +8,18 @@ module OrientDbClient
 
             def self.command(socket, session, command, options = {})
                 options[:query_class_name].tap do |qcn|
+                    if qcn.is_a?(Symbol)
+                        qcn = case qcn
+                            when :query then 'q'
+                            when :command then 'c'
+                        end
+                    end
+
                     if qcn.nil? || qcn == 'com.orientechnologies.orient.core.sql.query.OSQLSynchQuery'
-                        options[:query_class_name] = 'q' 
+                        qcn = 'q' 
                     end
+
+                    options[:query_class_name] = qcn
                 end
 
                 super socket, session, command, options

data/lib/orient_db_client/serializers/serializer7.rb

@@ -172,11 +172,7 @@ module OrientDbClient
                 if value.is_a?(OrientDbClient::Rid)
                     serialize_rid(value)
                 elsif value.is_a?(String)
-                    if value.encoding.equal?(binary_encoding)
-                        serialize_binary(value)
-                    else
-                        serialize_string(value)
-                    end
+                    serialize_string(value)
                 elsif value.is_a?(Fixnum)
                     serialize_integer(value)
                 elsif value.is_a?(TrueClass)

data/lib/orient_db_client/version.rb

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

data/lib/orient_db_client.rb

@@ -6,7 +6,8 @@ require "socket"
 
 module OrientDbClient
 	def connect(host, options = {})
-		options = { port: 2424 }.merge(options)
+    options[:port] = options[:port].to_i
+    options[:port] = 2424 if options[:port] == 0
 
 		s = TCPSocket.open(host, options[:port])
 

data/test/integration/database_session_9_test.rb

@@ -26,8 +26,8 @@ class TestDatabaseSession < MiniTest::Unit::TestCase
     refute @connection.closed?
   end
 
-  def test_command
-    result = @session.command("SELECT FROM OUser")
+  def test_query
+    result = @session.query("SELECT FROM OUser")
 
     assert_equal @session.id, result[:session]
 

data/test/integration/database_session_test.rb

@@ -52,30 +52,26 @@ class TestDatabaseSession < MiniTest::Unit::TestCase
     refute @session.cluster_exists?("OTest")
   end
 
-  def test_command
-    result = @session.command("SELECT FROM OUser")
+  def test_query
+    result = @session.query("SELECT FROM OUser")
 
-    assert_equal @session.id, result[:session]
+    assert_equal 3, result.length
+
+    result[0].tap do |record|
+      assert_equal 0, record[:format]
+      assert_equal 4, record[:cluster_id]
+      assert_equal 0, record[:cluster_position]
+
+      record[:document].tap do |doc|
+        assert_equal 'admin', doc['name']
+        assert_equal 'ACTIVE', doc['status']
+
+        doc['roles'].tap do |roles|
+          assert roles.is_a?(Array), "expected Array, but got #{roles.class}"
 
-    result[:message_content].tap do |content|
-      assert_equal 3, content.length
-  
-      content[0].tap do |record|
-        assert_equal 0, record[:format]
-        assert_equal 4, record[:cluster_id]
-        assert_equal 0, record[:cluster_position]
-
-        record[:document].tap do |doc|
-          assert_equal 'admin', doc['name']
-          assert_equal 'ACTIVE', doc['status']
-
-          doc['roles'].tap do |roles|
-            assert roles.is_a?(Array), "expected Array, but got #{roles.class}"
-
-            assert roles[0].is_a?(OrientDbClient::Rid)
-            assert_equal 3, roles[0].cluster_id
-            assert_equal 0, roles[0].cluster_position
-          end
+          assert roles[0].is_a?(OrientDbClient::Rid)
+          assert_equal 3, roles[0].cluster_id
+          assert_equal 0, roles[0].cluster_position
         end
       end
     end

data/test/unit/serializers/serializer7_test.rb

@@ -28,7 +28,6 @@ class TestSerializer7 < MiniTest::Unit::TestCase
                 'time'                  => :time
             },
             :document => {
-                'implicit_binary' => "Binary data".encode("ASCII-8BIT"),
                 'implicit_boolean_true' => true,
                 'implicit_boolean_false' => false,
                 'implicit_collection' => [ 3, 7, 14 ],
@@ -63,7 +62,7 @@ class TestSerializer7 < MiniTest::Unit::TestCase
             }
         }
 
-        expected_result = %Q{OClass@implicit_binary:_QmluYXJ5IGRhdGE=_,implicit_boolean_true:true,implicit_boolean_false:false,implicit_collection:[3,7,14],implicit_date:1333425600a,implicit_document:(sym_key:\"embedded doc string\"),implicit_double:6.6236d,implicit_integer:15,implicit_long:7345723467317884556l,implicit_map:{\"key1\":\"value1\",\"key2\":\"value2\"},implicit_time:1296279468t,implicit_string:\"a string\",buffer:_RXhwbGljaXQgYmluYXJ5IGRhdGE=_,true:true,false:false,byte:97b,array:[\"Test\",\"Test3\",6,2,#5:1],date_from_time:1339560000a,date_from_string:1339560000a,doc:(integer:735),float:5.6234f,double:2.67234235d,bignum:1l,bigdec:6.2724522625234c,map:{\"key1\":\"Value 1\",\"key_2\":\"Value 2\",\"key_3\":6234},rid:#3:2,short:5s,time:1327417259t,implicit_embedded_documents:[(null_rid:#),(short:16134s)]}
+        expected_result = %Q{OClass@implicit_boolean_true:true,implicit_boolean_false:false,implicit_collection:[3,7,14],implicit_date:1333425600a,implicit_document:(sym_key:\"embedded doc string\"),implicit_double:6.6236d,implicit_integer:15,implicit_long:7345723467317884556l,implicit_map:{\"key1\":\"value1\",\"key2\":\"value2\"},implicit_time:1296279468t,implicit_string:\"a string\",buffer:_RXhwbGljaXQgYmluYXJ5IGRhdGE=_,true:true,false:false,byte:97b,array:[\"Test\",\"Test3\",6,2,#5:1],date_from_time:1339560000a,date_from_string:1339560000a,doc:(integer:735),float:5.6234f,double:2.67234235d,bignum:1l,bigdec:6.2724522625234c,map:{\"key1\":\"Value 1\",\"key_2\":\"Value 2\",\"key_3\":6234},rid:#3:2,short:5s,time:1327417259t,implicit_embedded_documents:[(null_rid:#),(short:16134s)]}
 
         result = @serializer.serialize(record)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orient_db_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -123,18 +123,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4489046239481477100
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4489046239481477100
 requirements: []
 rubyforge_project: orient_db_client
 rubygems_version: 1.8.21