iproto 0.3.6 → 0.3.7

data/iproto.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'iproto'
-  s.version           = '0.3.6'
-  s.date              = '2012-07-18'
+  s.version           = '0.3.7'
+  s.date              = '2012-08-07'
   s.rubyforge_project = 'iproto'
 
   s.summary     = "Mail.Ru simple network protocol"
@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
-end
+  s.add_dependency 'bin_utils', ['= 0.0.2']
+end

data/lib/iproto/connection_api.rb

@@ -1,6 +1,6 @@
+require 'bin_utils'
 module IProto
   module ConnectionAPI
-    PACK = 'VVV'.freeze
     DEFAULT_RECONNECT = 0.1
     HEADER_SIZE = 12
 
@@ -11,5 +11,12 @@ module IProto
     def send_request(request_id, data)
       # for override
     end
+
+    BINARY = ::Encoding::BINARY
+    def pack_request(request_type, request_id, body)
+      data = ''.force_encoding(BINARY)
+      ::BinUtils.append_int32_le!(data, request_type, body.bytesize, request_id)
+      ::BinUtils.append_string!(data, body)
+    end
   end
 end

data/lib/iproto/em.rb

@@ -83,7 +83,8 @@ module IProto
 
     def receive_chunk(chunk)
       if @_state == :receive_header
-        @type, body_size, @request_id = chunk.unpack(PACK)
+        body_size = ::BinUtils.get_int32_le(chunk, 4)
+        @request_id = ::BinUtils.get_int32_le(chunk, 8)
         if body_size > 0
           @_needed_size = body_size
           @_state = :receive_body
@@ -154,7 +155,7 @@ module IProto
 
     def _do_send_request(request_type, body, request)
       while @waiting_requests.include?(request_id = next_request_id); end
-      send_data [request_type, body.size, request_id].pack(PACK) + body
+      send_data pack_request(request_type, request_id, body)
       @waiting_requests[request_id] = request
     end
 

data/lib/iproto/tcp_socket.rb

@@ -48,7 +48,7 @@ module IProto
     def send_request(request_type, body)
       begin
         request_id = next_request_id
-        r = socket.send ([request_type, body.bytesize, request_id].pack(PACK) << body), 0
+        socket.send pack_request(request_type, request_id, body), 0
         response_size = recv_header request_id
         recv_response response_size
       rescue Errno::EPIPE, Retry => e
@@ -61,7 +61,8 @@ module IProto
 
     def recv_header(request_id)
       header = socket.read(HEADER_SIZE)  or _raise_disconnected('disconnected while read', @retry ? :retry : true)
-      type, response_size, recv_request_id = header.unpack(PACK)
+      response_size = ::BinUtils.get_int32_le(header, 4)
+      recv_request_id = ::BinUtils.get_int32_le(header, 8)
       unless request_id == recv_request_id
         raise UnexpectedResponse.new("Waiting response for request_id #{request_id}, but received for #{recv_request_id}")
       end

data/lib/iproto.rb

@@ -1,5 +1,5 @@
 module IProto
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
   class IProtoError < StandardError; end
   class ConnectionError < IProtoError; end
   class CouldNotConnect < ConnectionError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iproto
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
-dependencies: []
+date: 2012-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bin_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Mail.Ru simple network protocol
 email: ceo@prepor.ru
 executables: []
@@ -54,3 +70,4 @@ signing_key:
 specification_version: 2
 summary: Mail.Ru simple network protocol
 test_files: []
+has_rdoc: