boss-protocol 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b396f11246208a61e308b3aacbd4f4f9ccb23e32
-  data.tar.gz: c6ec201f8e6c42f079660614c58e8185f9a8f486
+  metadata.gz: 5874e8e0bafe28f14f96860d9e91ea38d0ab1783
+  data.tar.gz: ba1ce2c78a5f90e304f1e9bdc4fe7d3c4617df4e
 SHA512:
-  metadata.gz: a0b5291588eac732637fe136d454e9e0ac486a00a18d1a0055ea0934b89d4d9f143574248d95d8328ea2edcb908ff8e7b077ef1509d11d9890d26afcaa63fe34
-  data.tar.gz: 175de9dc48ad4f4f8404f171c693a74ea63aad4a5b8ef1e6946719c38edd8d6d976503c60e469f8ac8c09b3aeb77a656f8075f8c9a7f793e29c042a3b98bc71b
+  metadata.gz: 1f6d6ca3de1a97e307cafd2aef68e983d21e62d4b237849ebc181d1e83200c845d83d6ab64f1f3eb2f829eb79a0cf93e91e933f507e72ba9dcf31985ee56936c
+  data.tar.gz: 21bbd5e2bff93811da4eac812bcf01c0103a4b95f28a85c7e361731e422f6f87f840b52bf0d858ce08fee289212d4abbef5efb622202e3671c3ffa7f7fd6c4b2

data/lib/boss-protocol/version.rb

@@ -1,3 +1,3 @@
 module Boss
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/boss-protocol.rb

@@ -311,7 +311,7 @@ module Boss
     ##
     # write single byte
     def wbyte(b)
-      @io.putc(b.chr)
+      @io << b.chr
     end
 
     def wdouble val
@@ -338,6 +338,17 @@ module Boss
       @stream_mode = false
     end
 
+    ##
+    # Load the object (object tree) from the stream. Note that if there
+    # is more than one object in the stream that are stored with the same
+    # Formatter instance, they will share same cache and references,
+    # see Boss.Formatter.put for details.
+    # Note that nil is a valid restored object. Check eof? or catch
+    # EOFError, or use Boss.Parser.each to read all objects from the stream
+    def read
+      get
+    end
+
     ##
     # Load the object (object tree) from the stream. Note that if there
     # is more than one object in the stream that are stored with the same

data/spec/boss_spec.rb

@@ -5,6 +5,37 @@ require 'json'
 require 'zlib'
 require 'base64'
 require 'boss-protocol'
+require 'socket'
+
+class SocketStream
+
+  def initialize socket
+    @socket = socket
+  end
+
+  def read length=1
+    # data = ''
+    # while data.length < length
+    #   data << @socket.recv(length - data.length, Socket::MSG_WAITALL)
+    # end
+    # data
+    @socket.read length
+  end
+
+  def write data
+    @socket.write data
+  end
+
+  def eof?
+    @socket.eof?
+  end
+
+  def << data
+    write data
+  end
+
+end
+
 
 describe 'Boss' do
 
@@ -231,6 +262,41 @@ describe 'Boss' do
     b.should == c
     c.should == d
   end
+  
+  it 'run interoperable' do
+    s1, s2 = Socket.pair(:UNIX, :STREAM, 0)
+
+    out = SocketStream.new(s1)
+    ins = Boss::Parser.new SocketStream.new(s2)
+
+    last = nil
+    t = Thread.start {
+      ins.each { |obj|
+        obj == nil and break
+        last= obj
+      }
+    }
+
+    out << Boss.dump( { :cmd => "foo", :args => [], :kwargs => {}, :serial => 0 })
+    out << Boss.dump({ :ref => 0, :error => { "class" => "ArgumentError", "text" => "wrong number of arguments (given 0, expected 2)" }, :serial => 0 })
+    out << Boss.dump( { :cmd => "foo", :args => [10, 20], :kwargs => {}, :serial => 1 })
+    out << Boss.dump( { :ref => 1, :result => "Foo: 30, none", :serial => 1 })
+    out << Boss.dump( { :cmd => "foo", :args => [5, 6], :kwargs => { :optional => "yes!" }, :serial => 2 })
+    out << Boss.dump( { :ref => 2, :result => "Foo: 11, yes!", :serial => 2 })
+    out << Boss.dump( { :cmd => "a", :args => [], :kwargs => {}, :serial => 3 } )
+    out << Boss.dump( { :ref => 3, :result => 5, :serial => 3 } )
+
+    out << Boss.dump( { :cmd => "b", :args => [], :kwargs => {}, :serial => 4 } )
+    out << Boss.dump( { :ref => 4, :result => 6, :serial => 4 } )
+    out << Boss.dump( { :cmd => "get_hash", :args => [], :kwargs => {}, :serial => 5 } )
+    out << Boss.dump( { :ref => 5, :result => { "foo" => "bar", "bardd" => "buzz", "last" => "item", "bar" => "test" }, :serial => 5 } )
+
+    out << Boss.dump(nil)
+    t.join
+
+    last['ref'].should == 5
+    last['result']['foo'].should == 'bar'
+  end
 
   def round_check(ob)
     ob.should == Boss.load(Boss.dump(ob))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boss-protocol
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - sergeych