protoplasm-em-server 0.1.1 → 0.1.2

data/lib/protoplasm/client/blocking_client.rb

@@ -27,28 +27,29 @@ module Protoplasm
       cmd = self.class._types.request_class.new(self.class._types.request_type_field => type.type, type.field => cmd_class.type.new(*args))
       cmd.encode(s)
       socket = _socket
-      socket.write([0, s.size].pack("CQ"))
+      socket.write([Types::Request::NORMAL, s.size].pack("CQ"))
       socket.write s
       socket.flush
       fetch_objects = true
       obj = nil
       while fetch_objects
-        response_code = socket.readpartial(1).unpack("C").first
+        response_byte = socket.read(1)
+        response_code = response_byte.unpack("C").first
         case response_code
         when Types::Response::NORMAL
           fetch_objects = !type.void?
           if fetch_objects
-            len_buf = ''
-            socket.readpartial(8 - len_buf.size, len_buf) while len_buf.size != 8
+            len_buf = socket.read(8)
             len = len_buf.unpack("Q").first
-            buf = ''
-            socket.readpartial(len - buf.size, buf) until buf.size == len
-            obj = type.response_class.decode(buf)
+            data = socket.read(len)
+            obj = type.response_class.decode(data)
             yield obj if block_given?
           end
           fetch_objects = false unless type.streaming?
         when Types::Response::STOP_STREAMING
           fetch_objects = false
+        else
+          raise "Control byte is #{response_byte.inspect}, code is #{response_code.inspect}"
         end
       end
       obj

data/lib/protoplasm/server/em_server.rb

@@ -74,7 +74,8 @@ module Protoplasm
       obj = type.response_class.new(*args)
       s = ''
       obj.encode(s)
-      send_data [Types::Response::NORMAL, s.size].pack("CQ")
+      send_data [Types::Response::NORMAL].pack("C")
+      send_data [s.size].pack("Q")
       send_data s
     end
   end

data/lib/protoplasm/version.rb

@@ -1,3 +1,3 @@
 module Protoplasm
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protoplasm-em-server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70099667516760 !ruby/object:Gem::Requirement
+  requirement: &70203485248320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099667516760
+  version_requirements: *70203485248320
 - !ruby/object:Gem::Dependency
   name: beefcake
-  requirement: &70099667515480 !ruby/object:Gem::Requirement
+  requirement: &70203485183020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *70099667515480
+  version_requirements: *70203485183020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70099667503900 !ruby/object:Gem::Requirement
+  requirement: &70203485180540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099667503900
+  version_requirements: *70203485180540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70099667503260 !ruby/object:Gem::Requirement
+  requirement: &70203485177180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70099667503260
+  version_requirements: *70203485177180
 description: A protoplasm server backed by EventMachine.
 email:
 - joshbuddy@gmail.com
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1445973023390049337
+      hash: 1388192791279370629
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1445973023390049337
+      hash: 1388192791279370629
 requirements: []
 rubyforge_project: protoplasm-em-server
 rubygems_version: 1.8.10