orientdb-binary 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0dbc1ea16b695c940e53c9bfc8a806bff16c2ca
-  data.tar.gz: fbf2bf494cbd6fb478018af6114d5ba657a3dfcf
+  metadata.gz: 988aa38dedf3895ac5a72eb6c2fd68b50b112f6d
+  data.tar.gz: 39c85446e40a94648491c6cd5c6182326413d80c
 SHA512:
-  metadata.gz: d5eccede9b6aba253166a44f9ed7d5199df346f6a49db527bbc8be132ed6347a9303ae690857787de3fafb1094e4c3b45aba2bc7f8b3e28a713f2138453165dc
-  data.tar.gz: 445f4cb0cd0cda17007e85209a65ea3767846df28ac7a6d347f675872c8233f8ce36ba6042739d363196b7b36a1b1321147183672f8a39f20091aeb6b6ffc725
+  metadata.gz: 4bb5ad2d394629ec76db3488d0f36e7dacae43f7441705d65c6ede2ae9cf75bb62c7d27e79c14ba591d8b7f67da3d7399961cc09c734d2dfed2509aa6fef83d1
+  data.tar.gz: b6b0484860ae2b328e46b010bb11a565ccbe2c0278da607cd4f7ba38f13819f0a9d383e1a7e8944c05b6cb29bc271e18765da2b16218e721b2cac98230b45a63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orientdb-binary (0.7.0)
+    orientdb-binary (0.8.0)
       bindata (~> 1.8)
 
 GEM

data/lib/orientdb_binary/config.rb

@@ -1,5 +1,5 @@
 module OrientdbBinary
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
   NAME = "OrientDB Binary Protocol Ruby Client"
   PROTOCOL_VERSION = 20
 end

data/lib/orientdb_binary/database_operations/query.rb

@@ -26,24 +26,6 @@ module OrientdbBinary
         _command(q.to_binary_s, class_name)
       end
 
-      # def command(text)
-      #   mode = 's'.ord
-      #   class_name = 'com.orientechnologies.orient.core.sql.query.OSQLSynchQuery'
-      #   fetchplan = "*0"
-
-      #   query = OrientdbBinary::Protocols::SqlCommandPayload.new text: text, non_text_limit: -1, fetchplan: fetchplan
-      #   p query
-
-      #   # command = OrientdbBinary::Protocols::Command.new session: session, mode: mode, clazz_name: class_name, command_payload_length: query.to_binary_s.length, command_payload: query.to_binary_s
-      #   command = OrientdbBinary::Protocols::Command.new session: session, mode: mode, text: text, command_payload: query.to_binary_s
-      #   command.write(socket)
-
-      #   status = BinData::Int8.read(socket).to_i
-      #   process_errors(status)
-
-      #   p OrientdbBinary::Protocols::CommandAnswer.read(socket)
-      # end
-
       private
       def _command(binary_query, class_name)
         mode = 's'.ord

data/lib/orientdb_binary/database_operations/record.rb

@@ -34,7 +34,9 @@ module OrientdbBinary
         }
         options = defaults.merge(args)
         answer = OrientdbBinary::Protocols::RecordLoad.new(params(options)).process(socket)
-        answer.process(options)
+        unless answer[:exceptions]
+          answer.process(options)
+        end
       end
 
       # Create record from object
@@ -100,6 +102,22 @@ module OrientdbBinary
       def count_records
         OrientdbBinary::Protocols::DbCountRecords.new(params).process(socket)
       end
+
+      def register_script(opts)
+        default = {
+          :@class => "OFunction",
+          :@cluster => "ofunction",
+          language: "javascript",
+          parameters: [],
+          idempotent: nil,
+          code: nil,
+          name: nil
+        }
+
+        record = default.merge(opts)
+        create_record_from_object(record)
+      end
+
     end
   end
 end

data/lib/orientdb_binary/protocols/base.rb

@@ -5,7 +5,6 @@ module OrientdbBinary
 
       def process(socket)
         write(socket)
-
         status = BinData::Int8.read(socket).to_i
         errors = process_errors(socket, status)
         unless errors

data/lib/orientdb_binary/protocols/bindata_primitives.rb

@@ -4,7 +4,7 @@ module OrientdbBinary
       endian :big
 
       int32 :len, value: -> { data.length }
-      string :data, read_length: :len
+      string :data, read_length: :len, onlyif: -> {len > -1}
 
       def get
         data

data/lib/orientdb_binary/protocols/command.rb

@@ -1,39 +1,6 @@
 module OrientdbBinary
   module Protocols
 
-    # class SqlCommandPayload < BinData::Record
-    #   endian :big
-
-    #   protocol_string :text
-    #   int32 :non_text_limit
-    #   protocol_string :fetchplan
-    #   protocol_string :serialized_params, value: "params:[name:\"admin\"]"
-    # end
-
-    # class SqlCommandPayload < BinData::Record
-    #   endian :big
-
-    #   protocol_string :class_name
-    #   protocol_string :text
-    #   int32 :non_text_limit, value: -1
-    #   protocol_string :fetchplan, value: '*:-1'
-    #   protocol_string :serialized_params
-    #   # int8 :with_params, value: 1
-    #   # int8 :composite_key_params_present, value: 0
-    # end
-    class Recordd < BinData::Primitive
-      endian :big
-
-      array :records do
-            int16 :marker
-            int8 :record_type
-            int16 :cluster_id
-            int64 :position
-            int32 :version
-            protocol_string :record_content
-      end
-    end
-
     class SqlCommandPayload < BinData::Record
       endian :big
 
@@ -44,14 +11,36 @@ module OrientdbBinary
       protocol_string :serialized_params
     end
 
+    class ScriptCommandPayload < BinData::Record
+      endian :big
+
+      protocol_string :language
+      protocol_string :text
+      int32 :non_text_limit
+      protocol_string :fetchplan
+      int32 :serialized_params, value: 0
+    end
+
+    class Command < BinData::Record
+      include OrientdbBinary::Protocols::Base
+
+      endian :big
+
+      int8 :operation, value: OrientdbBinary::OperationTypes::REQUEST_COMMAND
+      int32 :session
+
+      bit8 :mode
+      protocol_string :command_payload
+    end
+
     class CommandAnswer < BinData::Record
       endian :big
 
       int32 :session
-      int8 :synch_result_type
+      int8 :result_type
 
-      int32 :collection_size, onlyif: -> {synch_result_type == 108}
-      array :collection, initial_length: :collection_size, onlyif: -> {synch_result_type == 108} do
+      int32 :collection_size, onlyif: -> {result_type == 108}
+      array :collection, initial_length: -> {result_type == 114 ? 1 : collection_size}, onlyif: -> {result_type == 108 or result_type == 114} do
         int16 :marker
         int8 :record_type
         int16 :cluster_id
@@ -60,13 +49,6 @@ module OrientdbBinary
         protocol_string :record_content
       end
 
-      int16 :marker, onlyif: -> {synch_result_type == 114}
-      int8 :record_type, onlyif: -> {synch_result_type == 114}
-      int16 :cluster_id, onlyif: -> {synch_result_type == 114}
-      int64 :position, onlyif: -> {synch_result_type == 114}
-      int32 :version, onlyif: -> {synch_result_type == 114}
-      protocol_string :record_content, onlyif: -> {synch_result_type == 114 or synch_result_type == 97}
-
       array :prefetched_records, read_until: -> {element.payload_status == 0} do
         int8  :payload_status
         int16 :marker, onlyif: -> {payload_status > 0}
@@ -80,87 +62,6 @@ module OrientdbBinary
     end
 
 
-    # class SqlCommandPayload < BinData::Record
-    #   endian :big
-
-    #   protocol_string :class_name, value: 'com.orientechnologies.orient.core.sql.OCommandSQL'
-    #   protocol_string :text, value: 'SELECT FROM OUser WHERE name = :name'
-    #   # protocol_string :fetchplan, value: '*:1'
-    #   int8 :with_params, value: 1
-    #   protocol_string :serialized_params, value: 'params:{"name":"admin"}'
-    #   int8 :composite_key_params_present, value: 0
-    # end
-
-    class ScriptCommandPayload < BinData::Record
-      endian :big
-
-      protocol_string :language
-      protocol_string :text
-      int32 :non_text_limit
-      protocol_string :fetchplan
-      int32 :serialized_params, value: 0
-    end
-
-    class Command < BinData::Record
-      include OrientdbBinary::Protocols::Base
-
-      endian :big
-
-      int8 :operation, value: OrientdbBinary::OperationTypes::REQUEST_COMMAND
-      int32 :session
 
-      bit8 :mode
-      protocol_string :command_payload
-    end
-
-    # class CommandAnswer < BinData::Record
-    #   endian :big
-
-    #   int32 :session
-    #   int8 :synch_result_type
-    #   int32 :collection_size
-    #   array :collection, initial_length: :collection_size do
-    #     int16 :marker
-    #     int8 :record_type
-    #     int16 :cluster_id
-    #     int64 :position
-    #     int32 :version
-    #     record_content :record_content
-    #   end
-    # end
   end
 end
-
-
-# if ($this->mode == OrientDB::COMMAND_QUERY || $this->mode == OrientDB::COMMAND_SELECT_SYNC || $this->mode == OrientDB::COMMAND_SELECT_GREMLIN) {
-#             $this->addByte(self::MODE_SYNC);
-#         } else {
-#             $this->addByte(self::MODE_ASYNC);
-#         }
-#         if ($this->mode == OrientDB::COMMAND_SELECT_ASYNC) {
-#             $objName = 'com.orientechnologies.orient.core.sql.query.OSQLAsynchQuery';
-#         } elseif ($this->mode == OrientDB::COMMAND_SELECT_SYNC) {
-#             $objName = 'com.orientechnologies.orient.core.sql.query.OSQLSynchQuery';
-#         } elseif ($this->mode == OrientDB::COMMAND_SELECT_GREMLIN) {
-#             $objName = 'com.orientechnologies.orient.graph.gremlin.OCommandGremlin';
-#         } else {
-#             $objName = 'com.orientechnologies.orient.core.sql.OCommandSQL';
-#         }
-# $buff = '';
-#         // Java query object name serialization
-#         $buff .= pack('N', strlen($objName));
-#         $buff .= $objName;
-#         // Query text serialization in TEXT mode
-#         $buff .= pack('N', strlen($this->query));
-#         $buff .= $this->query;
-#         if ($this->mode == OrientDB::COMMAND_SELECT_ASYNC || $this->mode == OrientDB::COMMAND_SELECT_SYNC || $this->mode == OrientDB::COMMAND_SELECT_GREMLIN) {
-#             // Limit set to -1 to ignore and use TEXT MODE
-#             $buff .= pack('N', -1);
-#             // Add a fetchplan
-#             $buff .= pack('N', strlen($this->fetchPlan));
-#             $buff .= $this->fetchPlan;
-#         }
-#         // Params serialization, we have 0 params
-#         $buff .= pack('N', 0);
-#         // Now query object serialization complete, add it to command bytes
-#         $this->addString($buff);

data/lib/orientdb_binary/serialization/serialize.rb

@@ -0,0 +1,80 @@
+module OrientdbBinary
+  module Serialization
+    class Serialize
+      def initialize()
+      end
+
+      def serialize_field_value(value)
+        result = ""
+        if value.is_a? String
+          return value if /^#\-{0,1}[\d]+:\-{0,1}[\d]+$/.match(value)
+          value = value.sub(/\\/, "\\\\")
+          value = value.gsub(/"/, "\\\"")
+          return "\"#{value}\""
+        end
+
+        if value.is_a? Integer
+          return value.to_s
+        end
+
+        if value.is_a? Float
+          return value.to_s + "f"
+        end
+
+        if value.is_a? Bignum
+          return value.to_s + "l"
+        end
+
+        if value.is_a? BigDecimal
+          return value.to_s + "d"
+        end
+
+        if value.is_a? Array or value.is_a? Set
+          type = value.class.to_s.downcase == "set" ? "<$>" : "[$]"
+          result = []
+
+          value.each do |el|
+            result << serialize_field_value(el)
+          end
+          return type.gsub("$", result.join(','))
+        end
+
+        if value.is_a?(TrueClass) or value.is_a?(FalseClass)
+          return value.to_s
+        end
+
+        if value.is_a? Hash
+          type = value[:type] == "d" ? "($)" : "{$}"
+          return type.gsub("$", serialize_document(value, value[:type] != "d"))
+        end
+
+        if value.is_a? Date
+        end
+
+        if value.is_a? DateTime
+        end
+
+        if value.is_a? Time
+        end
+      end
+
+      def serialize_document(document, is_map)
+        klass = "@"
+        result = []
+        document.each do |key, value|
+          unless [:version, :rid, :type].include? key
+            if key == :class
+              klass = value + "@"
+            else
+              field_wrap = is_map ? "\"" : ""
+            end
+            result << "#{field_wrap}#{key.to_s}#{field_wrap}:#{serialize_field_value(value)}"
+          end
+        end
+
+        return klass + "@" + result.join(',')
+      end
+    end
+  end
+end
+

data/test/database/test_database.rb

@@ -188,6 +188,62 @@ describe OrientdbBinary::Database do
            assert_equal 0, @db.load_record(cluster_id: 5, cluster_position: 0, fetch_plan: "*:-1", ignore_cache: 1, load_tombstones: 0)[:collection].length
         end
       end
+
+      describe "function" do
+        it "should be able to insert a function" do
+          record = @db.register_script(name: "test_script", code: "return 2;")
+          assert_equal "#7:0", record[:@rid]
+        end
+
+      end
+    end
+
+    describe "Queries" do
+
+      describe "Query" do
+        before do
+          @query = @db.query('SELECT FROM OUser where name = :name', {name: "admin"})
+        end
+
+        it "should find one data" do
+          assert_equal 1, @query[:collection].length
+        end
+
+        it "should be admin user" do
+          assert_equal 5, @query[:collection][0][:cluster_id]
+          assert_equal 0, @query[:collection][0][:position]
+        end
+      end
+
+      describe "Command" do
+        before do
+          @query = @db.command('INSERT INTO OUser (name, password, status) VALUES ("a", "secret", "ACTIVE"), ("b", "secret", "ACTIVE")', {})
+        end
+
+        it "should find one data" do
+          assert_equal 2, @query[:collection].length
+        end
+
+        it "should be user" do
+          user = OrientdbBinary::Parser::Deserializer.new.deserialize_document(@query[:collection][0][:record_content])
+          assert_equal "a", user[:name]
+        end
+      end
+
+      describe "Command returning one value" do
+        before do
+          @query = @db.command('INSERT INTO OUser (name, password, status) VALUES ("a", "secret", "ACTIVE")', {})
+        end
+
+        it "should find one data" do
+          assert_equal 1, @query[:collection].length
+        end
+
+        it "should be user" do
+          user = OrientdbBinary::Parser::Deserializer.new.deserialize_document(@query[:collection][0][:record_content])
+          assert_equal "a", user[:name]
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb-binary
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Michal Ostrowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/orientdb_binary/protocols/record_update.rb
 - lib/orientdb_binary/protocols/shutdown.rb
 - lib/orientdb_binary/record_id.rb
+- lib/orientdb_binary/serialization/serialize.rb
 - lib/orientdb_binary/server.rb
 - orientdb-binary.gemspec
 - test/database/test_database.rb