filter_io 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2daf76da95ab847d8218f60d72f21bf35c5c9456
-  data.tar.gz: 045a05eb40a210da7c266a4467e0c85577c08055
+  metadata.gz: 9208b4c2d0df82cc91ed1cad2283a3d36218987c
+  data.tar.gz: a577f773a20e4e2be7bd219b01629d020a7522dc
 SHA512:
-  metadata.gz: 4203fb5d9ba5cde5c0cba11a105c62cb5b944069cb8ffe39b3691533d862477d47f8c6d52c766681d9ec25888311e8af0f1762f2eb76074e5ef6cdf064f2036c
-  data.tar.gz: 8c25baecac50a4b62d2c14147384dfd0cf875e2f7ce2336bd979bdb534d6d5c32fb661ee4fead5f2369ade08bcbb78235d45e7092ff83ed67e2b2a12e9d6c4fc
+  metadata.gz: 8edcd67f5b6220499dd21c6453d695eee991e8770f3ea48787fc1c72433275d8efe49c68fd27c48d0208edd76ad5bdf33e4fa612cc53e8a9f64e411a2348729d
+  data.tar.gz: ea4b663fbd4aca1f2d85259904c008ca30c23ee409c76876f039aa9120115c07ef0d8b5fffe58107b39f97de150bd9310539307bf3ea232b782fa57ac6bcb53f

data/lib/filter_io.rb

@@ -98,7 +98,7 @@ class FilterIO
     nil
   end
 
-  def read(length = nil)
+  def read(length = nil, buffer = nil)
     raise ArgumentError if length && length < 0
     return '' if length == 0
 
@@ -116,7 +116,7 @@ class FilterIO
       else
         length
       end
-      data = pop_bytes read_length
+      data = pop_bytes read_length, buffer
       @pos += data.bytesize
       if length.nil?
         data.force_encoding external_encoding if external_encoding
@@ -249,15 +249,19 @@ class FilterIO
     str
   end
 
-  def pop_bytes(count)
-    data = begin
+  def pop_bytes(count, output_buffer = nil)
+    begin
       org_encoding = @buffer.encoding
       @buffer.force_encoding 'ASCII-8BIT'
-      @buffer.slice!(0, count)
+      data = @buffer.slice!(0, count)
+      if output_buffer
+        output_buffer.replace data
+      else
+        data
+      end
     ensure
       @buffer.force_encoding org_encoding
     end
-    data
   end
 
   def buffer_data(block_size = nil)

data/lib/filter_io/version.rb

@@ -1,3 +1,3 @@
 class FilterIO
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/filter_io_spec.rb

@@ -309,6 +309,14 @@ describe FilterIO do
     expect(io.pos).to eq 2
   end
 
+  it 'supports reading into user buffer' do
+    io = FilterIO.new(StringIO.new('foo bar'))
+    buffer = 'abcdef'
+    result = io.read(3, buffer)
+    expect(result.object_id).to eq buffer.object_id
+    expect(result).to eq 'foo'
+  end
+
   it 'allows filtering of input with a block' do
     input = 'foo bar'
     expected = 'FOO BAR'
@@ -808,4 +816,18 @@ describe FilterIO do
     end
     expect(io.read).to eq 'TEST'
   end
+
+  it 'supports IO.copy_stream' do
+    input = StringIO.new "Test"
+    output = StringIO.new
+
+    filtered_input = FilterIO.new input do |data|
+      data.upcase
+    end
+
+    IO.copy_stream(filtered_input, output)
+
+    output.rewind
+    expect(output.read).to eq 'TEST'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_io
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Filter IO streams with a block. Ruby's FilterInputStream.