filter_io 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0cdede3401dcdd670bf293213c4836b1abd8b5
-  data.tar.gz: 6c9e0d608afff977d2acf2688e5a16c2357664f6
+  metadata.gz: 6a31b33c49d022a4d843c22358d84cc2617c2c9b
+  data.tar.gz: 6a5fc3060b2192db6dfe7a01cdfa0fc470df52a0
 SHA512:
-  metadata.gz: 2d63ff2053219b2abca0dcaecb876550fbfcaf3b09c657c0acb758d5eaed34f601ef059d647c10caa11b3de2549fd20eeeb846e2f9b8c0f375332da6f12d2d84
-  data.tar.gz: e80aeeb45c363e80a62a8c831a5fdfb8b94473ae9a3b98fe6ace97abaea623cff3380ec54c7333738450581020c788de8de8a6ffb90a46e848fda679da8e00a0
+  metadata.gz: 027ae9db72c8aabb4922f035975091ee8ea1859d1db24f66774e078dcd4d6d987c0b942a0d4049e0c23c8cf99402399ddf1d502947cde6c63546ba36d74478f7
+  data.tar.gz: 2c50d946d7b86b86ffbc6483e0561d93d868cfc9c63433e284d37ffa746fa2aeb75670528198a239da8dbf124d00af1c8bc290974e6cd83763ea8d74cd584033

data/lib/filter_io.rb

@@ -103,7 +103,8 @@ class FilterIO
     return '' if length == 0
 
     # fill the buffer up to the fill level (or whole input if length is nil)
-    while !source_eof? && (length.nil? || length > @buffer.bytesize)
+    while (!source_eof? || !@did_first_read) && (length.nil? || length > @buffer.bytesize)
+      @did_first_read = true
       buffer_data @options[:block_size] || length
     end
 
@@ -310,7 +311,7 @@ class FilterIO
       @source_pos += data.bytesize
       data.force_encoding(external_encoding)
     else
-      return
+      data = ""
     end
 
     initial_data_size = data.bytesize

data/lib/filter_io/version.rb

@@ -1,3 +1,3 @@
 class FilterIO
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/filter_io_spec.rb

@@ -45,9 +45,9 @@ describe FilterIO do
 
   it 'works with an empty source' do
     io = FilterIO.new(StringIO.new(''))
-    expect(io.bof?).to be_true
+    expect(io.bof?).to eq true
     io = FilterIO.new(StringIO.new(''))
-    expect(io.eof?).to be_true
+    expect(io.eof?).to eq true
     io = FilterIO.new(StringIO.new(''))
     expect {
       io.readchar
@@ -56,18 +56,18 @@ describe FilterIO do
 
   it 'supports `eof?`' do
     io = FilterIO.new(StringIO.new('x'))
-    expect(io.eof?).to be_false
+    expect(io.eof?).to eq false
     expect(io.readchar.chr).to eq 'x'
-    expect(io.eof?).to be_true
+    expect(io.eof?).to eq true
     expect(io.read).to eq ''
     expect(io.read(8)).to eq nil
   end
 
   it 'supports `bof?`' do
     io = FilterIO.new(StringIO.new('x'))
-    expect(io.bof?).to be_true
+    expect(io.bof?).to eq true
     expect(io.readchar.chr).to eq 'x'
-    expect(io.bof?).to be_false
+    expect(io.bof?).to eq false
   end
 
   it 'can `readchar` with unicode characters' do
@@ -286,22 +286,22 @@ describe FilterIO do
     end
     expect(io.read).to eq io_reference.read
     expect(io.read(4)).to eq io_reference.read(4)
-    expect(io_reference.eof?).to be_true
-    expect(io.eof?).to be_true
+    expect(io_reference.eof?).to eq true
+    expect(io.eof?).to eq true
   end
 
   it 'returns empty from read(0) before EOF' do
     io = FilterIO.new(StringIO.new('foo'))
     expect(io.read(0)).to eq ''
     expect(io.pos).to eq 0
-    expect(io.eof?).to be_false
+    expect(io.eof?).to eq false
   end
 
   it 'returns empty from read(0) at EOF' do
     io = FilterIO.new(StringIO.new(''))
     expect(io.read(0)).to eq ''
     expect(io.pos).to eq 0
-    expect(io.eof?).to be_true
+    expect(io.eof?).to eq true
   end
 
   it 'errors if attempting to read negative' do
@@ -917,4 +917,27 @@ describe FilterIO do
 
     expect(rows).to eq [%w[FOO BAR], %w[BAZ]]
   end
+
+  it 'calls block when stream empty' do
+    io = FilterIO.new StringIO.new('') do |data, state|
+      out = state.bof? ? 'start' : ''
+      out << data.upcase
+      out << 'end' if state.eof?
+    end
+    expect(io.read).to eq 'startend'
+
+    # multiple reads from empty stream should only trigger block once
+    expect(io.read).to eq ""
+  end
+
+  it 'no longer calls block once the stream is eof' do
+    io = FilterIO.new StringIO.new('foo') do |data, state|
+      out = state.bof? ? 'start' : ''
+      out << data.upcase
+      out << 'end' if state.eof?
+    end
+    expect(io.read).to eq 'startFOOend'
+    expect(io.read).to eq ""
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_io
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler