obuf 1.2.0 → 1.2.1

data/.travis.yml

@@ -5,4 +5,3 @@ rvm:
   - 2.1.1
   - 2.2.0
   - jruby
-  - ruby-head

data/README.md

@@ -1,5 +1,7 @@
 # obuf
 
+[![Build Status](https://travis-ci.org/julik/obuf.svg?branch=master)](https://travis-ci.org/julik/obuf)
+
 A simple Ruby object buffer. Use this if you need to temporarily store alot of serializable Ruby objects.
 
     obuf = Obuf.new

data/lib/obuf.rb

@@ -19,7 +19,7 @@ require "thread" # required for ruby 18
 #
 # Both reading and writing aim to be threadsafe
 class Obuf
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
   require File.dirname(__FILE__) + "/obuf/lens"
   require File.dirname(__FILE__) + "/obuf/protected_lens"
   

data/lib/obuf/lens.rb

@@ -3,6 +3,7 @@ require 'thread'
 # Provides a per-object iterator on top of any IO object or pipe
 class Obuf::Lens
   include Enumerable
+  NothingToRecover = Class.new(StandardError)
   
   DELIM = "\t"
   END_RECORD = "\n"
@@ -32,7 +33,10 @@ class Obuf::Lens
       skip_bytes = @io.gets("\t").to_i
       @io.seek(@io.pos + skip_bytes + 1)
     end
+    
     recover_object
+  rescue NothingToRecover # TODO: we need to honor this exception in the future
+    nil
   end
   
   # Recover the object at the current position in the IO. Returns +nil+
@@ -42,14 +46,17 @@ class Obuf::Lens
     demarshal_bytes = @io.gets("\t").to_i
     
     # When at end of IO return nil
-    return nil if demarshal_bytes == 0
+    raise NothingToRecover if demarshal_bytes.zero?
     
     blob = @io.read(demarshal_bytes)
     demarshal_object(blob)
   end
   
   def each
-    yield(recover_object) until @io.eof?
+    begin
+      loop { yield(recover_object) }
+    rescue NothingToRecover
+    end
   end
   
   private

data/obuf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "obuf"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]

data/test/test_obuf.rb

@@ -132,8 +132,9 @@ class TestLens < Test::Unit::TestCase
     lens = Obuf::Lens.new(mock_io)
     lens << "Hi there!"
     
-    recovered = lens.recover_object
-    assert_nil recovered, "The IO is at the end now"
+    assert_raise Obuf::Lens::NothingToRecover do
+      lens.recover_object
+    end
     
     mock_io.rewind
     recovered = lens.recover_object
@@ -161,6 +162,22 @@ class TestLens < Test::Unit::TestCase
     assert_equal [123, :a], items[2]
   end
   
+  def test_lens_to_a
+    mock_io = StringIO.new
+    
+    writing_lens = Obuf::Lens.new(mock_io)
+    writing_lens << "Hi there!"
+    writing_lens << 98121
+    writing_lens << [123, :a]
+    
+    mock_io.rewind
+    
+    reading_lens = Obuf::Lens.new(mock_io)
+    items = reading_lens.to_a
+    assert_equal 3, items.length
+    assert_equal "Hi there!", items[0]
+  end
+      
   def test_lens_recover_at
     mock_io = StringIO.new
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obuf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4056659205467737583
+      hash: 4000191137531519975
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: