iproto 0.1 → 0.2

data/iproto.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'iproto'
-  s.version           = '0.1'
-  s.date              = '2012-01-23'
+  s.version           = '0.2'
+  s.date              = '2012-01-27'
   s.rubyforge_project = 'iproto'
 
   s.summary     = "Mail.Ru simple network protocol"
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   # = MANIFEST =
   s.files = %w[
+    LICENSE
     README.md
     Rakefile
     iproto.gemspec

data/lib/iproto.rb

@@ -1,5 +1,5 @@
 module IProto
-  VERSION = '0.1'
+  VERSION = '0.2'
   class IProtoError < StandardError; end
   class CouldNotConnect < IProtoError; end
   class UnexpectedResponse < IProtoError; end

data/lib/iproto/connection_api.rb

@@ -8,5 +8,9 @@ module IProto
       end
       @next_request_id
     end
+
+    def send_request(request_id, data)
+      # for override
+    end
   end
 end

data/lib/iproto/em.rb

@@ -92,8 +92,9 @@ module IProto
     # end FixedHeaderAndBody API
 
     # begin ConnectionAPI
-    def send_packet(request_id, data)
-      send_data data      
+    def send_request(request_type, body)
+      request_id = next_request_id
+      send_data [request_type, body.size, request_id].pack('LLL') + body
       f = Fiber.current
       waiting_requests[request_id] = f
       Fiber.yield

data/lib/iproto/tcp_socket.rb

@@ -1,27 +1,27 @@
 require 'socket'
 module IProto
-
   # TODO: timeouts
   class TCPSocket < ::TCPSocket
     include IProto::ConnectionAPI
 
     # begin ConnectionAPI
-    def send_packet(request_id, data)
-      send data, 0
-      body_size = recv_header request_id
-      recv_body body_size
+    def send_request(request_type, body)
+      request_id = next_request_id
+      r = send [request_type, body.bytesize, request_id].pack('LLL') + body, 0
+      response_size = recv_header request_id
+      recv_response response_size
     end
     # end ConnectionAPI
 
     def recv_header(request_id)
-      header = recv(12)
-      type, body_size, recv_request_id = header.unpack('L3')
+      header = read(12)
+      type, response_size, recv_request_id = header.unpack('L3')
       raise UnexpectedResponse.new("Waiting response for request_id #{request_id}, but received for #{recv_request_id}") unless request_id == recv_request_id
-      body_size
+      response_size
     end
 
-    def recv_body(body_size)
-      recv(body_size)
+    def recv_response(response_size)
+      read(response_size)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iproto
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies: []
 description: Mail.Ru simple network protocol
 email: ceo@prepor.ru
@@ -19,6 +19,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- LICENSE
 - README.md
 - Rakefile
 - iproto.gemspec
@@ -26,7 +27,6 @@ files:
 - lib/iproto/connection_api.rb
 - lib/iproto/em.rb
 - lib/iproto/tcp_socket.rb
-- LICENSE
 homepage: http://github.com/mailru/iproto-ruby
 licenses: []
 post_install_message: