boss-protocol 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88325e367e81c6d045667b628bd2f048eb7309bb
-  data.tar.gz: 08b1938498936324561d7d68b4f3acb58c354f6e
+  metadata.gz: efc0df5f02b78e91df3de6a16c8a87c25d1075bd
+  data.tar.gz: 11131a67fd7fddca99b4fddb73b2aa29ceb40352
 SHA512:
-  metadata.gz: 2a3a36cfc30b669be43b47788da11e934a82b21890d1c2a24eb227a6fc9fdd695189a1cb6811dc45af5bd066d1448781a41cb7278d4c12cb034f8198df978fde
-  data.tar.gz: 8e7b80832a549cfc8ef618c186af7a023ccc6b4ab738b9e0f0d0d63075df6aac19052d345d71aa99f3096bd5173d621592a5a5ead54ac1c04c61c52ce8741d45
+  metadata.gz: f0246ac59217158e9e0a40df894a7cedb1fff0f33fd61c4c1ae11f7a85a9b4e35f9e3a88796c1c313a6c5c7a9e8caab618d51ad850351b88773c8188e7259c5a
+  data.tar.gz: c96d6d3c1d85d7d34cd39211dfa09e324b9ac3f57474616f411745a3a1db480f94d677f9749cf5c97fcc86184a5651401eeadf087211379004a9ca84af2254b0

data/README.md

@@ -1,6 +1,6 @@
 # Boss Protocol
 
-Supported version: 1.3.1 (stream mode with short binaries cached)
+Supported version: 1.4 (stream mode with no caching, regular cached mode)
 
 BOSS is an acronym for Binary Object Streaming Specification.
 

data/lib/boss-protocol.rb

@@ -36,6 +36,8 @@ require 'zlib'
 # 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
 #
+# 1.4   Stream mode not use caching. Stream mode format is changed (removed unused parameters)
+#
 # 1.3.1 Stream mode added and fixed
 #
 # 1.2 version adds support for booelans and removes support for python __reduce__ - based objects
@@ -114,19 +116,14 @@ module Boss
       @io = dst ? dst : StringIO.new('', 'wb')
       @io.set_encoding 'binary'
       @cache = { nil => 0 }
+      @stream_mode = false
     end
 
 
-    # Switch to stream mode. Stream mode limits cache using to strings only in LRU
-    # mode using specified parameters. Stream mode writes a marker into output so
-    # decoder knows it.
-    # @param max_string_size maximum allowed size of the string to be cached.
-    #        longer strings will not be cached
-    # @param max_cache_entries
-    def stream_mode max_cache_entries, max_string_size
-      @max_cache_entries, @max_string_size = max_cache_entries, max_string_size
+    # Switch to stream mode. Stream mode turns off caching.
+    def stream_mode
+      @stream_mode = true
       whdr TYPE_EXTRA, XT_STREAM_MODE
-      self << max_cache_entries.to_i << max_string_size.to_i
       @cache = { nil => 0 }
     end
 
@@ -241,25 +238,7 @@ module Boss
         false
       else
         # Check stream mode, bin and strings only
-        if @max_string_size
-          if obj.is_a?(String) && obj.length <= @max_string_size
-            if @cache.length > @max_cache_entries
-              minIndex = @cache.length - @max_cache_entries
-              key      = nil
-              @cache.each { |k, v|
-                next if k == nil
-                if v == minIndex
-                  key = k
-                else
-                  @cache[k] = v - 1
-                end
-              }
-              key == nil and raise "Cache implementation failed"
-              @cache.delete key
-            end
-            @cache[obj] = @cache.length
-          end
-        else
+        unless @stream_mode
           @cache[obj] = @cache.length
         end
         true
@@ -345,6 +324,7 @@ module Boss
       @io = src.class <= String ? StringIO.new(src) : src
       @io.set_encoding Encoding::BINARY
       @cache = [nil]
+      @stream_mode = false
     end
 
     ##
@@ -392,8 +372,7 @@ module Boss
               Time.at renc
             when XT_STREAM_MODE
               @cache = [nil]
-              @max_cache_entries = get + 1 # Count 0th element (always 0)
-              @max_string_size = get
+              @stream_mode = true
               get
             else
               raise UnknownTypeException
@@ -435,15 +414,10 @@ module Boss
 
     private
 
-    def cache_object object
+    def
+    cache_object object
       # Stream mode?
-      if @max_cache_entries
-        if object.is_a?(String) && object.length <= @max_string_size
-          # Should cache
-          @cache << object
-          @cache.delete_at(1) if @cache.length > @max_cache_entries
-        end
-      else
+      unless @stream_mode
         @cache << object
       end
     end

data/lib/boss-protocol/version.rb

@@ -1,3 +1,3 @@
 module Boss
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/boss_spec.rb

@@ -155,16 +155,16 @@ describe 'Boss' do
 
   it 'should implement stream mode' do
     out = Boss::Formatter.new
-    out.stream_mode 3, 10
+    out.stream_mode
     3.times { out << "String too long" }
     (1..6).each { |n| out << "test#{n}" }
     (4..6).each { |n| out << "test#{n}" }
     (4..6).each { |n| out << "test#{n}" }
     out << "test7"
 
-    res = "\x81\x18P{String too long{String too long{String too long+test1+test2+test3+test4+test5+test6\r\x15\x1D\r\x15\x1D+test7"
-    res.force_encoding 'binary'
-    out.string.should == res
+    #res = "\x81\x18P{String too long{String too long{String too long+test1+test2+test3+test4+test5+test6\r\x15\x1D\r\x15\x1D+test7"
+    #res.force_encoding 'binary'
+    #out.string.should == res
 
     inp = Boss::Parser.new out.string
 
@@ -179,31 +179,12 @@ describe 'Boss' do
 
   it 'should work fine with big stream mode' do
     out = Boss::Formatter.new
-    out.stream_mode 7, 500
+    out.stream_mode
     src = 4096.times.map { |n| s="Long string #{n}"; out << s; s }
     inp = Boss::Parser.new out.string
     src.each { |s| inp.get.should == s }
   end
 
-  it 'should parse following code' do
-    src    = 'gcAAAcAAAbwgn0XEfzTatIn6O75xqrvA5yOMHfndd8G1SiIyOj057yZzc3Rh
-    cnQgY29tbWFuZDMfQ3RvU2VyaWFsACNkYXRhDzNhbnN3ZXIjcG9uZzNzZXJp
-    YWwAHx0IJQ8rZmlsZXMWJyNuYW1lKzRoZXJvM2lzX2RpcmEjc2l6ZbiIK210
-    aW1leTZGWxaFJ02LQWRyaWFubyBDZWxlbnRhbm9dYWW4iG15O0ZbFoU9CA=='
-    parser = Boss::Parser.new(Base64::decode64 src)
-    out    = []
-    begin
-      loop {
-        out << (x=parser.get)
-      }
-    rescue EOFError
-    end
-    x=out[-1]
-    x['toSerial'].should == 1
-    x['serial'].should == 1
-    x['data']['files'].length.should == 2
-  end
-
   def round_check(ob)
     ob.should == Boss.load(Boss.dump(ob))
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: boss-protocol
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: Binary streamable bit-effective protocol to effectively store object
@@ -32,9 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -54,17 +53,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Traversable and streamable to protocol supports lists, hashes, caching, compression

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0