filter_io 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1cb1c5f84b0cddd924603e941450302c549858d
-  data.tar.gz: a451b82ce46d27ce9a47393a90451f1b3de7a4c1
+  metadata.gz: cb0cdede3401dcdd670bf293213c4836b1abd8b5
+  data.tar.gz: 6c9e0d608afff977d2acf2688e5a16c2357664f6
 SHA512:
-  metadata.gz: 1acd2b06b1d8bf1d368003eddf1356c43b95f1cddc270e5ac617c2537140232d50750d8d5e6a22a9581713e5ba115dc96be1b3383cd02a3e8c0c77ae447211b3
-  data.tar.gz: c3cecc20a335b518d4477fb10cfc15d3a3bf274b6a5a615d145c959af9fdc8ca40f983feca11a4dc7ee4e36c06f5d9a26ef68d5738946cf3897995e90851b5eb
+  metadata.gz: 2d63ff2053219b2abca0dcaecb876550fbfcaf3b09c657c0acb758d5eaed34f601ef059d647c10caa11b3de2549fd20eeeb846e2f9b8c0f375332da6f12d2d84
+  data.tar.gz: e80aeeb45c363e80a62a8c831a5fdfb8b94473ae9a3b98fe6ace97abaea623cff3380ec54c7333738450581020c788de8de8a6ffb90a46e848fda679da8e00a0

data/lib/filter_io.rb

@@ -18,6 +18,7 @@ class FilterIO
     @io = io
     @options = options || {}
     @block = block
+    @source_pos = 0
     @pos = 0
     @buffer = empty_string
     @buffer_raw = empty_string_raw
@@ -152,6 +153,7 @@ class FilterIO
       # noop
     when 0
       @io.rewind
+      @source_pos = 0
       @pos = 0
       @buffer = empty_string
       @buffer_raw = empty_string_raw
@@ -305,6 +307,7 @@ class FilterIO
     if !@buffer_raw.empty?
      data = @buffer_raw.slice! 0, @buffer_raw.bytesize
     elsif data = @io.read(block_size)
+      @source_pos += data.bytesize
       data.force_encoding(external_encoding)
     else
       return
@@ -323,7 +326,9 @@ class FilterIO
       end
     rescue NeedMoreData => e
       raise EOFError, 'end of file reached' if @io.eof?
-      data << @io.read(block_size).force_encoding(external_encoding)
+      new_data = @io.read(block_size).force_encoding(external_encoding)
+      data << new_data
+      @source_pos += new_data.bytesize
       retry
     end
 
@@ -355,7 +360,14 @@ class FilterIO
 
     if data && @block
       args = [data.dup]
-      args << BlockState.new(@io.pos == data.length, source_eof?) if @block.arity > 1
+      if @block.arity > 1
+        src_pos = begin
+          @io.pos
+        rescue Errno::ESPIPE
+          @source_pos
+        end
+        args << BlockState.new(src_pos == data.length, source_eof?)
+      end
       data = @block.call(*args)
       raise IOError, 'Block returned nil' if data.nil?
     end

data/lib/filter_io/version.rb

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

data/spec/filter_io_spec.rb

@@ -348,6 +348,18 @@ describe FilterIO do
     expect(io.read).to eq expected
   end
 
+  it 'passes false for BOF to the block if stream previously read' do
+    input = StringIO.new 'Test String'
+    expect(input.read(4)).to eq 'Test'
+    io = FilterIO.new(input, :block_size => 4) do |data, state|
+      data = "*#{data}*"
+      data = ">>>#{data}" if state.bof?
+      data = "#{data}<<<" if state.eof?
+      data
+    end
+    expect(io.read).to eq '* Str**ing*<<<'
+  end
+
   it 'passes a copy of the data to block (to prevent mutation bugs)' do
     input = "foobar"
     expected = [
@@ -865,6 +877,18 @@ describe FilterIO do
     expect(io.read).to eq 'TEST'
   end
 
+  it 'supports filtering from a pipe with state' do
+    read_io, write_io = IO::pipe
+    write_io.write 'test'
+    write_io.close
+    io = FilterIO.new read_io do |data, state|
+      out = state.bof? ? 'start' : ''
+      out << data.upcase
+      out << 'end' if state.eof?
+    end
+    expect(io.read).to eq 'startTESTend'
+  end
+
   it 'supports IO.copy_stream' do
     input = StringIO.new "Test"
     output = StringIO.new

metadata

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