diff --git a/lib/zip/inflater.rb b/lib/zip/inflater.rb index 3904ce2..d499bb9 100644 --- a/lib/zip/inflater.rb +++ b/lib/zip/inflater.rb @@ -8,7 +8,7 @@ module Zip @has_returned_empty_string = false end - def sysread(length = nil, outbuf = '') + def read(length = nil, outbuf = '') while length.nil? || (@buffer.bytesize < length) break if input_finished? @buffer << produce_input diff --git a/lib/zip/input_stream.rb b/lib/zip/input_stream.rb index e417916..748e18c 100644 --- a/lib/zip/input_stream.rb +++ b/lib/zip/input_stream.rb @@ -80,8 +80,8 @@ module Zip end # Modeled after IO.sysread - def sysread(number_of_bytes = nil, buf = nil) - @decompressor.sysread(number_of_bytes, buf) + def sysread(length = nil, outbuf = '') + @decompressor.read(length, outbuf) end class << self @@ -161,7 +161,7 @@ module Zip end def produce_input - @decompressor.sysread(CHUNK_SIZE) + @decompressor.read(CHUNK_SIZE) end def input_finished? diff --git a/lib/zip/null_decompressor.rb b/lib/zip/null_decompressor.rb index 31ae9e1..6534b16 100644 --- a/lib/zip/null_decompressor.rb +++ b/lib/zip/null_decompressor.rb @@ -2,7 +2,7 @@ module Zip module NullDecompressor #:nodoc:all module_function - def sysread(_length = nil, _outbuf = nil) + def read(_length = nil, _outbuf = nil) nil end diff --git a/lib/zip/pass_thru_decompressor.rb b/lib/zip/pass_thru_decompressor.rb index 6e5f05e..b525583 100644 --- a/lib/zip/pass_thru_decompressor.rb +++ b/lib/zip/pass_thru_decompressor.rb @@ -6,7 +6,7 @@ module Zip @has_returned_empty_string = false end - def sysread(length = nil, outbuf = '') + def read(length = nil, outbuf = '') if eof? has_returned_empty_string_val = @has_returned_empty_string @has_returned_empty_string = true diff --git a/test/deflater_test.rb b/test/deflater_test.rb index b34f357..d1970ce 100644 --- a/test/deflater_test.rb +++ b/test/deflater_test.rb @@ -59,7 +59,7 @@ class DeflaterTest < MiniTest::Test def inflate(fileName) File.open(fileName, 'rb') do |file| inflater = ::Zip::Inflater.new(file) - inflater.sysread + inflater.read end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 960f71c..224a1eb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -66,12 +66,12 @@ module DecompressorTests end def test_read_everything - assert_equal(@refText, @decompressor.sysread) + assert_equal(@refText, @decompressor.read) end def test_read_in_chunks chunkSize = 5 - while (decompressedChunk = @decompressor.sysread(chunkSize)) + while (decompressedChunk = @decompressor.read(chunkSize)) assert_equal(@refText.slice!(0, chunkSize), decompressedChunk) end assert_equal(0, @refText.size)