object-stream 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2012223a66102b4befa32c0aaecbc6559f46d089
-  data.tar.gz: 348120adfb1bdf1a62b439fe3f4a78a3887fce0c
+  metadata.gz: ae62e3547b3329038fd0f88e4959b230748371b6
+  data.tar.gz: 1069da86dac10a83b2f2859963dc3e38e351a8b4
 SHA512:
-  metadata.gz: 03ea4758680c9209c65d178e938dc4025bbf37f09e73fd7a70955053aa09352edcf8c600b921cd5869735e4b0ce57227bd5202747fec618408786dd467f1ece0
-  data.tar.gz: 5afa9b0995c5f93e4055608202ba4a86551eb071c8415102a152cab179834b407c6e69310548a3e2421c0b99c07f6e71ae4bd932e226cf22bfde5a6dfcfd44c1
+  metadata.gz: 1361f8ee2756822763c0077f029142202cf7ae46360d947d6da770555fcd4e4209b8a84e7ecb71d46bc910071187ee2f6487188a7e6f1534312bbb82754b5ef7
+  data.tar.gz: f726444e47692a37a3cb02756444da1bf4df0b2a621c79f91cfaf83530a93f1d519381fdbc244f2641429c596c5544dc0a36418524775cc7a73187c69c84671d

data/lib/object-stream-wrapper.rb

@@ -28,7 +28,7 @@ class ObjectStreamWrapper
   def to_s
     "#<Wrapped #{@stream.class} to #{peer_name}, io=#{@stream.inspect}>"
   end
-  
+
   # Set the stream state so that subsequent objects returned by read will be
   # instances of a custom class +cl+. Does not affect #consume.
   # Class +cl+ should define cl.from_serialized, plus #to_json, #to_msgpack,
@@ -36,7 +36,7 @@ class ObjectStreamWrapper
   def expect cl
     @expected_class = cl
   end
-  
+
   # Turn off the custom class instantiation of #expect.
   def unexpect; expect nil; end
 
@@ -56,7 +56,7 @@ class ObjectStreamWrapper
     end
   end
   private :try_consume
-  
+
   def convert_to_expected obj
     if @expected_class and not obj.kind_of? @expected_class
       @expected_class.from_serialized(obj)
@@ -81,7 +81,7 @@ class ObjectStreamWrapper
       convert_to_expected(obj)
     end
   end
-  
+
   def each
     return to_enum unless block_given?
     read {|obj| yield obj} until eof
@@ -89,12 +89,12 @@ class ObjectStreamWrapper
   end
 
   def write *objects
-    @stream.write *objects
+    @stream.write(*objects)
   end
   alias << write
 
   def write_to_outbox *args, &bl
-    @stream.write_to_outbox *args, &bl
+    @stream.write_to_outbox(*args, &bl)
   end
 
   def eof?

data/lib/object-stream.rb

@@ -9,21 +9,21 @@
 # and yielding (non-blocking) read.
 module ObjectStream
   include Enumerable
-  
-  VERSION = "0.5"
-  
+
+  VERSION = "0.6"
+
   # The IO through which the stream reads and writes serialized object data.
   attr_reader :io
-  
+
   # Number of outgoing objects that can accumulate before the outbox is
   # serialized to the byte buffer (and possibly to the io).
   attr_reader :max_outbox
-  
+
   MARSHAL_TYPE  = "marshal".freeze
   YAML_TYPE     = "yaml".freeze
   JSON_TYPE     = "json".freeze
   MSGPACK_TYPE  = "msgpack".freeze
-  
+
   TYPES = [
     MARSHAL_TYPE, YAML_TYPE, JSON_TYPE, MSGPACK_TYPE
   ]
@@ -60,23 +60,23 @@ module ObjectStream
         @stream_class_map[type] = cl.call
       end
     end
-    
+
     def register_type type, &bl
       @stream_class_map[type] = bl
     end
   end
-  
+
   def initialize io, max_outbox: DEFAULT_MAX_OUTBOX, **opts
     @io = io
     @max_outbox = max_outbox
     @inbox = nil
     @outbox = []
   end
-  
+
   def to_s
     "#<#{self.class} io=#{io.inspect}>"
   end
-  
+
   # If no block given, behaves just the same as #read_one. If block given,
   # reads any available data and yields it to the block. This form is non-
   # blocking, if supported by the underlying serializer (such as msgpack).
@@ -104,7 +104,7 @@ module ObjectStream
     if @inbox and not @inbox.empty?
       return @inbox.shift
     end
-    
+
     have_result = false
     result = nil
     until have_result
@@ -127,11 +127,11 @@ module ObjectStream
     end
   end
   private :read_from_inbox
-  
+
   # Write the given objects to the stream, first flushing any objects in the
   # outbox. Flushes the underlying byte buffer afterwards.
   def write *objects
-    write_to_buffer *objects
+    write_to_buffer(*objects)
     flush_buffer
   end
   alias << write
@@ -174,7 +174,7 @@ module ObjectStream
     read {|obj| yield obj} until eof
   rescue EOFError
   end
-  
+
   def eof?
     (!@inbox || @inbox.empty?) && io.eof?
   end
@@ -187,62 +187,62 @@ module ObjectStream
     flush_outbox
     io.close
   end
-  
+
   def closed?
     io.closed?
   end
-  
+
   # Makes it possible to use stream in a select.
   def to_io
     io
   end
-  
+
   class MarshalStream
     include ObjectStream
-    
+
     ObjectStream.register_type MARSHAL_TYPE do
       self
     end
-    
+
     def read_from_stream
       yield Marshal.load(io)
     end
-    
+
     def write_to_stream object
       Marshal.dump(object, io)
       self
     end
   end
-  
+
   class YamlStream
     include ObjectStream
-    
+
     ObjectStream.register_type YAML_TYPE do
       require 'yaml'
       self
     end
-    
+
     def read_from_stream
       YAML.load_stream(io) do |obj|
         yield obj
       end
     end
-    
+
     def write_to_stream object
       YAML.dump(object, io)
       self
     end
   end
-  
+
   class JsonStream
     include ObjectStream
-    
+
     ObjectStream.register_type JSON_TYPE do
       require 'yajl'
       require 'yajl/json_gem'
       self
     end
-    
+
     attr_accessor :chunk_size
 
     DEFAULT_CHUNK_SIZE = 2000
@@ -260,7 +260,7 @@ module ObjectStream
       @parser.on_parse_complete = bl
       @parser << io.readpartial(chunk_size)
     end
-    
+
     def write_to_stream object
       @encoder.encode object, io
       self
@@ -269,25 +269,25 @@ module ObjectStream
 
   class MsgpackStream
     include ObjectStream
-    
+
     ObjectStream.register_type MSGPACK_TYPE do
       require 'msgpack'
       self
     end
-    
+
     attr_accessor :chunk_size
     attr_accessor :maxbuf
 
     DEFAULT_CHUNK_SIZE = 2000
     DEFAULT_MAXBUF = 4000
-    
+
     # See the discussion in examples/symbolize-keys.rb.
     def initialize io, chunk_size: DEFAULT_CHUNK_SIZE, maxbuf: DEFAULT_MAXBUF,
           symbolize_keys: false
       super
       @unpacker = MessagePack::Unpacker.new(symbolize_keys: symbolize_keys)
         # don't specify io, so don't have to read all of io in one loop
-      
+
       @packer = MessagePack::Packer.new(io)
       @chunk_size = chunk_size
       @maxbuf = maxbuf
@@ -301,7 +301,7 @@ module ObjectStream
         yield obj
       end
     end
-    
+
     def fill_buffer n
       @unpacker.feed(io.readpartial(n))
     end
@@ -318,12 +318,12 @@ module ObjectStream
           "Exceeded buffer limit by #{@unpacker.buffer.size - maxbuf} bytes."
       end
     end
-    
+
     def write_to_stream object
       @packer.write(object).flush
       self
     end
-    
+
     def write_to_buffer *objects
       flush_outbox
       objects.each do |object|
@@ -331,7 +331,7 @@ module ObjectStream
       end
       self
     end
-    
+
     def flush_buffer
       @packer.flush
       self

data/test/test-basic.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 
 module TestBasic
   attr_reader :sio, :stream
-  
+
   # supported by all types
   BASIC_OBJECTS = [
     nil,
@@ -24,18 +24,17 @@ module TestBasic
     { ["a"] => 3 },
     { {"b" => 5} => 6 }
   ]
-  
+
   class Custom
     attr_reader :x, :y
     def initialize x, y
       @x, @y = x, y
     end
     def ==(other)
-      @x == other.x
-      @y == other.y # just enough to make test pass
+      @x == other.x && @y == other.y
     end
   end
-  
+
   RUBY_OBJECTS = [
     :foo,
     {:foo => :bar},
@@ -43,15 +42,15 @@ module TestBasic
     File,
     Custom.new(1,2)
   ]
-  
+
   def type; self.class::TYPE; end
   def objects; BASIC_OBJECTS + self.class::OBJECTS; end
-  
+
   def setup
     @sio = StringIO.new
     @stream = ObjectStream.new sio, type: type
   end
-  
+
   def test_write_read
     objects.each do |obj|
       sio.rewind # do not need to clear stream's buffer (if any)
@@ -67,10 +66,10 @@ module TestBasic
       end
     end
   end
-  
+
   def test_batch_write
     a = ["a", "b", "c"]
-    stream.write *a
+    stream.write(*a)
     sio.rewind
     dump = sio.read
     sio.rewind
@@ -81,11 +80,11 @@ module TestBasic
     objects.each do |obj|
       stream.write obj
     end
-  
+
     sio.rewind
     dump = sio.read
     sio.rewind
-    
+
     assert_equal(objects, stream.to_a, # <-- #each called by #to_a
       "dump is #{dump.inspect}")
   end
@@ -95,16 +94,16 @@ module TestBasic
     a.each do |i|
       stream.write [i]
     end
-  
+
     sio.rewind
-    
+
     a2 = []
     stream.each do |object|
       i = object[0]
       a2 << i
       break if i == 5
     end
-    
+
     stream.each do |object|
       i = object[0]
       a2 << i
@@ -128,7 +127,7 @@ module TestBasic
     enum = stream.each
     assert_equal(objects, enum.to_a)
   end
-  
+
   def test_read_without_block
     n = 100
     n.times do |i|

data/test/test-consume.rb

@@ -9,7 +9,7 @@ class TestConsume < Minitest::Test
   def setup
     @sio = StringIO.new
   end
-  
+
   ObjectStream::TYPES.each do |type|
     define_method "test_consume_#{type}" do
       do_test_consume_for type: type
@@ -19,33 +19,33 @@ class TestConsume < Minitest::Test
   def do_test_consume_for(type: type)
     n_total = 10
     n_consumed = 5
-    
+
     objects = (0...n_total).map {|i| [i]}
-    
+
     stream = ObjectStreamWrapper.new(sio, type: type)
     objects.each do |object|
       stream << object
     end
-    
+
     sio.rewind
     stream = ObjectStreamWrapper.new(sio, type: type)
-    
+
     count = 0
-    
+
     n_consumed.times do |i|
       stream.consume do |a|
         assert_equal(i, a[0])
         count += 1
       end
     end
-    
+
     assert_equal(0, sio.pos)
-    
+
     stream.each_with_index do |a, i|
       assert_equal i + n_consumed, a[0]
       count += 1
     end
-    
+
     assert_equal(n_total, count)
   end
 end

data/test/test-expect.rb

@@ -5,12 +5,12 @@ require 'minitest/autorun'
 
 class TestExpect < Minitest::Test
   attr_reader :sio
-  
+
   class A
     def initialize x, y
       @x, @y = x, y
     end
-    
+
     def to_msgpack pk = nil
       case pk
       when MessagePack::Packer
@@ -18,37 +18,37 @@ class TestExpect < Minitest::Test
         pk.write @x
         pk.write @y
         return pk
-      
+
       else # nil or IO
         MessagePack.pack(self, pk)
       end
     end
-    
+
     def to_a
       [@x, @y]
     end
-    
+
     def to_json
       to_a.to_json
     end
-    
+
     def self.from_serialized ary
-      new *ary
+      new(*ary)
     end
-    
+
     def == other
       self.class == other.class and
         to_a == other.to_a
     end
   end
-  
+
   class B < A
   end
 
   def setup
     @sio = StringIO.new
   end
-  
+
   def test_expect
     objects = []
     20.times do |i|
@@ -58,12 +58,12 @@ class TestExpect < Minitest::Test
         objects << "B" << B.new(i, i.to_s)
       end
     end
-    
+
     stream = ObjectStreamWrapper.new(sio, type: ObjectStream::MSGPACK_TYPE)
     objects.each do |object|
       stream << object
     end
-    
+
     sio.rewind
     stream = ObjectStreamWrapper.new(sio, type: ObjectStream::MSGPACK_TYPE)
     objects2 = []

data/test/test-inbox.rb

@@ -5,30 +5,30 @@ require 'minitest/autorun'
 
 class TestInbox < Minitest::Test
   attr_reader :s, :t
-  
+
   def setup
     @s, @t = UNIXSocket.pair
   end
-  
+
   def test_marshal
     do_test(ObjectStream::MARSHAL_TYPE)
   end
-  
+
   def test_yaml
     do_test(ObjectStream::YAML_TYPE)
   end
-  
+
   def test_json
     do_test(ObjectStream::JSON_TYPE)
   end
-  
+
   def test_msgpack
     do_test(ObjectStream::MSGPACK_TYPE)
   end
-  
+
   def do_test type
     n = 200
-    th = Thread.new do
+    Thread.new do
       src = ObjectStream.new(s, type: type)
       n.times do |i|
         src << [i]

data/test/test-maxbuf.rb

@@ -5,11 +5,11 @@ require 'minitest/autorun'
 
 class TestMaxbuf < Minitest::Test
   attr_reader :sio, :stream
-  
+
   def setup
     @sio = StringIO.new
   end
-  
+
   def test_maxbuf
     stream = ObjectStream.new(sio, type: ObjectStream::MSGPACK_TYPE)
     stream << "a"*20

data/test/test-outbox.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 
 class TestOutbox < Minitest::Test
   attr_reader :sio
-  
+
   def setup
     @sio = StringIO.new
   end

data/test/test-slow-sender.rb

@@ -6,27 +6,27 @@ require 'minitest/autorun'
 
 class TestSlowSender < Minitest::Test
   attr_reader :s, :t
-  
+
   def setup
     @s, @t = UNIXSocket.pair
   end
-  
+
   def test_marshal
     assert_equal(:block, get_test_result(ObjectStream::MARSHAL_TYPE))
   end
-  
+
   def test_yaml
     assert_equal(:block, get_test_result(ObjectStream::YAML_TYPE))
   end
-  
+
   def test_json
     assert_equal(:noblock, get_test_result(ObjectStream::JSON_TYPE))
   end
-  
+
   def test_msgpack
     assert_equal(:noblock, get_test_result(ObjectStream::MSGPACK_TYPE))
   end
-  
+
   def get_test_result type
     pid = fork do
       sio = StringIO.new

data/test/test-symbolize-keys.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 
 module TestSymbolizeKeys
   attr_reader :sio, :stream
-  
+
   BASIC_OBJECTS = [
     nil,
     true,
@@ -23,7 +23,7 @@ module TestSymbolizeKeys
     @sio = StringIO.new
     @stream = ObjectStream.new sio, type: type, symbolize_keys: true
   end
-  
+
   def test_write_read
     objects.each do |obj|
       sio.rewind # do not need to clear stream's buffer (if any)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: object-stream
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Stream objects over IO using Marshal, JSON, YAML, or Msgpack.
@@ -87,9 +87,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -97,17 +97,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Stream objects over IO using Marshal, JSON, YAML, or Msgpack
 test_files:
-- test/test-maxbuf.rb
-- test/test-outbox.rb
 - test/test-basic.rb
 - test/test-consume.rb
-- test/test-symbolize-keys.rb
+- test/test-slow-sender.rb
 - test/test-inbox.rb
+- test/test-symbolize-keys.rb
 - test/test-expect.rb
-- test/test-slow-sender.rb
+- test/test-outbox.rb
+- test/test-maxbuf.rb
 has_rdoc: