boss-protocol 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c0b4f367f0b59d7612093290d9c4b2e9bf32322
-  data.tar.gz: 443ba9c925bb3f50efe4ba4b2167c845d4ee68a1
+  metadata.gz: b396f11246208a61e308b3aacbd4f4f9ccb23e32
+  data.tar.gz: c6ec201f8e6c42f079660614c58e8185f9a8f486
 SHA512:
-  metadata.gz: 11aa28920cc77dc9fa7cd5ef9b3d1803d3a198ec6e9106223d9d60548ffc8aad1fe55d314547e9e1755ecc9c995547ff9721d8d6551cc714aee607d0ab16f38f
-  data.tar.gz: b10a10f3c3b69731ce65f29690008c4a2d6cc7bfc9312dd97a097a4c7c83d2983f4ac22534dd7bfbff73ef7ae89f846281094eb79e0ec32ec70f149acb3c2c5c
+  metadata.gz: a0b5291588eac732637fe136d454e9e0ac486a00a18d1a0055ea0934b89d4d9f143574248d95d8328ea2edcb908ff8e7b077ef1509d11d9890d26afcaa63fe34
+  data.tar.gz: 175de9dc48ad4f4f8404f171c693a74ea63aad4a5b8ef1e6946719c38edd8d6d976503c60e469f8ac8c09b3aeb77a656f8075f8c9a7f793e29c042a3b98bc71b

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .idea
 .rbx
 .rvmrc
+.ruby-version

data/README.md

@@ -40,15 +40,12 @@ Supported types:
  * Boolean values (true/false)
  * UTF-8 encoded texts, any length
  * Binary data, any length
- * Time objects (date and time rounded to 1 second resolution)
- * Arrays with any number of elements
+ * Time objects (date and time with 1 second resolution)
+ * Arrays with any number of elements of any type
  * Hashes with any keys and values and unlimited length
- * Reference to the object that already was serialized
+ * Reference to the object that already was serialized (unless in stream mode)
 
-There is a pending extension to serialize user types that will be available
-soon or even faster - leave me a request in issues. There are also versions
-in C and Python that are in most part ready but are parts
-in other systems and need to be extracted first.
+There is a working JAVA implemetation also.
 
 ## Installation
 

data/lib/boss-protocol.rb

@@ -31,14 +31,15 @@ require 'zlib'
 #
 
 ##
-# Boss protocol version 1.2 basic implementation
+# Boss protocol version 1.4 full implementation
 #
-# Attn! We removed Bzip2 compression for the sake of compatibility. We may add it back when situation
-# with bz2 implementations on various platforms will be eased
+# Attentionn! Bzip2 compression was removed for the sake of compatibility.
 #
-# 1.4   Stream mode not use caching. Stream mode format is changed (removed unused parameters)
+# 1.4   Stream mode do not use caching anymore (not effective while slow).
+#       Stream mode format is changed (removed unused parameters)
 #
 # 1.3.1 Stream mode added and fixed
+# 1.3
 #
 # 1.2 version adds support for booelans and removes support for python __reduce__ - based objects
 #       as absolutely non portable. It also introduces
@@ -68,21 +69,21 @@ module Boss
   TYPE_LIST = 6
   TYPE_DICT = 7
 
-                 # Extra types:
+  # Extra types:
 
-  DZERO     = 0  #: float 0.0
-  FZERO     = 1  #: double 0.0
+  DZERO     = 0 #: float 0.0
+  FZERO     = 1 #: double 0.0
 
-  DONE      = 2  #: double 1.0
-  FONE      = 3  #: float 1.0
-  DMINUSONE = 4  #: double -1.0
-  FMINUSONE = 5  #: float  -1.0
+  DONE      = 2 #: double 1.0
+  FONE      = 3 #: float 1.0
+  DMINUSONE = 4 #: double -1.0
+  FMINUSONE = 5 #: float  -1.0
 
-  TFLOAT  = 6    #: 32-bit IEEE float
-  TDOUBLE = 7    #: 64-bit IEEE float
+  TFLOAT  = 6 #: 32-bit IEEE float
+  TDOUBLE = 7 #: 64-bit IEEE float
 
-  TOBJECT   = 8  #: object record
-  TMETHOD   = 9  #: instance method
+  TOBJECT   = 8 #: object record
+  TMETHOD   = 9 #: instance method
   TFUNCTION = 10 #: callable function
   TGLOBREF  = 11 #: global reference
 
@@ -114,14 +115,23 @@ module Boss
     #
     def initialize(dst=nil)
       @io = dst ? dst : StringIO.new('', 'wb')
-      @io.set_encoding 'binary'
-      @cache = { nil => 0 }
+      @io.set_encoding Encoding::BINARY if @io.respond_to? :set_encoding
+      @cache       = { nil => 0 }
       @stream_mode = false
     end
 
+    def get_stream
+      @io
+    end
+
 
     # Switch to stream mode. Stream mode turns off caching.
     def stream_mode
+      set_stream_mode
+    end
+
+    # Switch to stream mode. Stream mode turns off caching.
+    def set_stream_mode
       @stream_mode = true
       whdr TYPE_EXTRA, XT_STREAM_MODE
       @cache = { nil => 0 }
@@ -157,7 +167,7 @@ module Boss
     # has per-instance cache so put(x) put(x) put(x)
     # will store one object and 2 more refs to it, so
     # on load time only one object will be constructed and
-    # 2 more refs will be creted.
+    # 2 more refs will be created.
     def put(ob)
       case ob
         when Fixnum, Bignum
@@ -323,8 +333,8 @@ module Boss
     def initialize(src=nil)
       @io = src.class <= String ? StringIO.new(src) : src
       @io.set_encoding Encoding::BINARY if @io.respond_to? :set_encoding
-      @rbyte = @io.respond_to?(:readbyte) ? -> { @io.readbyte } : -> { @io.read(1).ord }
-      @cache = [nil]
+      @rbyte       = @io.respond_to?(:readbyte) ? -> { @io.readbyte } : -> { @io.read(1).ord }
+      @cache       = [nil]
       @stream_mode = false
     end
 
@@ -372,7 +382,7 @@ module Boss
             when TTIME
               Time.at renc
             when XT_STREAM_MODE
-              @cache = [nil]
+              @cache       = [nil]
               @stream_mode = true
               get
             else
@@ -415,8 +425,7 @@ module Boss
 
     private
 
-    def
-    cache_object object
+    def cache_object object
       # Stream mode?
       unless @stream_mode
         @cache << object

data/lib/boss-protocol/version.rb

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

data/spec/boss_spec.rb

@@ -101,7 +101,7 @@ describe 'Boss' do
     round_check root
   end
 
-  it 'shold encode hash/array ancestors too' do
+  it 'should encode hash/array ancestors too' do
     class MyHash < Hash
       def []= k, v
         super k.to_s, v.to_s
@@ -126,6 +126,37 @@ describe 'Boss' do
 
   end
 
+  it 'sends and restores foobars1' do
+    # stupid error
+    src = { :ref => 7, :result => { "foo" => "bar", "bardd" => "buzz", "last" => "item", "bar" => "test", arr: 10.times.map { 'bar' } }, :serial => 7 }
+    f   = Boss::Formatter.new
+    f.set_stream_mode
+    f << src
+    # p f.get_stream.string
+    encoded = f.get_stream.string
+    ins     = Boss::Parser.new(encoded)
+    ins.each { |res|
+      # p res
+      res['result']['bar'].should == 'test'
+      res['result']['arr'].should == 10.times.map { 'bar' }
+    }
+  end
+
+  it 'sends and restores foobars2' do
+    # stupid error
+    src = { :ref => 7, :result => { "foo" => "bar", "bardd" => "buzz", "last" => "item", "bar" => "test", arr: 10.times.map { 'bar' } }, :serial => 7 }
+    f   = Boss::Formatter.new
+    f << src
+    # p f.get_stream.string
+    encoded = f.get_stream.string
+    ins     = Boss::Parser.new(encoded)
+    ins.each { |res|
+      # p res
+      res['result']['arr'].should == 10.times.map { 'bar' }
+      res['result']['bar'].should == 'test'
+    }
+  end
+
   it 'should effectively compress/decompress' do
     # No compression
     data = "Too short"
@@ -185,6 +216,22 @@ describe 'Boss' do
     src.each { |s| inp.get.should == s }
   end
 
+  it 'should work in mixed normal and stream modes' do
+    s1  = "The string"
+    out = Boss::Formatter.new
+    out << s1 << s1
+    out.stream_mode
+    out << s1 << s1
+    # p Base64.encode64(out.string)
+    input      = Boss::Parser.new out.string
+    a, b, c, d = 4.times.map { input.get }
+    b.__id__.should_not == c.__id__
+    c.__id__.should_not == d.__id__
+    a.should == b
+    b.should == c
+    c.should == d
+  end
+
   def round_check(ob)
     ob.should == Boss.load(Boss.dump(ob))
   end
@@ -533,4 +580,4 @@ ZPRlks8o0Gc+RzbVHfjjBc+8ffGnPSaQaU6ZDxOCIu82CDqxTouy6UhoFPN1
 NhpXhYHtuZti57hJEhySiPp/f/3XX//1/wEcUSZF
   End
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boss-protocol
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Traversable and streamable to protocol supports lists, hashes, caching, compression