iostreams 1.1.0 → 1.1.1

data/test/builder_test.rb

@@ -1,82 +1,82 @@
-require_relative 'test_helper'
+require_relative "test_helper"
 
 class BuilderTest < Minitest::Test
   describe IOStreams::Builder do
-    let(:file_name) { 'my/path/abc.bcd.xlsx.zip.gz.pgp' }
+    let(:file_name) { "my/path/abc.bcd.xlsx.zip.gz.pgp" }
     let(:streams) { IOStreams::Builder.new(file_name) }
 
-    describe '#option' do
-      it 'adds one option' do
-        streams.option(:pgp, passphrase: 'unlock-me')
-        assert_equal({pgp: {passphrase: 'unlock-me'}}, streams.options)
+    describe "#option" do
+      it "adds one option" do
+        streams.option(:pgp, passphrase: "unlock-me")
+        assert_equal({pgp: {passphrase: "unlock-me"}}, streams.options)
       end
 
-      it 'adds options in order' do
-        streams.option(:pgp, passphrase: 'unlock-me')
+      it "adds options in order" do
+        streams.option(:pgp, passphrase: "unlock-me")
         streams.option(:enc, compress: false)
-        assert_equal({pgp: {passphrase: 'unlock-me'}, enc: {compress: false}}, streams.options)
+        assert_equal({pgp: {passphrase: "unlock-me"}, enc: {compress: false}}, streams.options)
       end
 
-      it 'will not add an option if a stream was already set' do
-        streams.stream(:pgp, passphrase: 'unlock-me')
+      it "will not add an option if a stream was already set" do
+        streams.stream(:pgp, passphrase: "unlock-me")
         assert_raises ArgumentError do
-          streams.option(:pgp, passphrase: 'unlock-me')
+          streams.option(:pgp, passphrase: "unlock-me")
         end
       end
 
-      it 'will not add an invalid option' do
+      it "will not add an invalid option" do
         assert_raises ArgumentError do
           streams.option(:blah, value: 23)
         end
       end
 
-      describe 'with no file_name' do
+      describe "with no file_name" do
         let(:file_name) { nil }
 
-        it 'prevents options being set' do
+        it "prevents options being set" do
           assert_raises ArgumentError do
-            streams.option(:pgp, passphrase: 'unlock-me')
+            streams.option(:pgp, passphrase: "unlock-me")
           end
         end
       end
     end
 
-    describe '#stream' do
-      it 'adds one stream' do
-        streams.stream(:pgp, passphrase: 'unlock-me')
-        assert_equal({pgp: {passphrase: 'unlock-me'}}, streams.streams)
+    describe "#stream" do
+      it "adds one stream" do
+        streams.stream(:pgp, passphrase: "unlock-me")
+        assert_equal({pgp: {passphrase: "unlock-me"}}, streams.streams)
       end
 
-      it 'adds streams in order' do
-        streams.stream(:pgp, passphrase: 'unlock-me')
+      it "adds streams in order" do
+        streams.stream(:pgp, passphrase: "unlock-me")
         streams.stream(:enc, compress: false)
-        assert_equal({pgp: {passphrase: 'unlock-me'}, enc: {compress: false}}, streams.streams)
+        assert_equal({pgp: {passphrase: "unlock-me"}, enc: {compress: false}}, streams.streams)
       end
 
-      it 'will not add a stream if an option was already set' do
-        streams.option(:pgp, passphrase: 'unlock-me')
+      it "will not add a stream if an option was already set" do
+        streams.option(:pgp, passphrase: "unlock-me")
         assert_raises ArgumentError do
-          streams.stream(:pgp, passphrase: 'unlock-me')
+          streams.stream(:pgp, passphrase: "unlock-me")
         end
       end
 
-      it 'will not add an invalid stream' do
+      it "will not add an invalid stream" do
         assert_raises ArgumentError do
           streams.stream(:blah, value: 23)
         end
       end
     end
 
-    describe '#reader' do
+    describe "#reader" do
       let :gzip_string do
-        io_string = StringIO.new(''.b)
+        io_string = StringIO.new("".b)
         IOStreams::Gzip::Writer.stream(io_string) do |io|
           io.write("Hello World")
         end
         io_string.string
       end
 
-      it 'directly calls block for an empty stream' do
+      it "directly calls block for an empty stream" do
         string_io = StringIO.new
         value     = nil
         streams.stream(:none)
@@ -87,7 +87,7 @@ class BuilderTest < Minitest::Test
         assert_equal 32, value
       end
 
-      it 'returns the reader' do
+      it "returns the reader" do
         string_io = StringIO.new(gzip_string)
         streams.stream(:gz)
         streams.reader(string_io) do |io|
@@ -95,7 +95,7 @@ class BuilderTest < Minitest::Test
         end
       end
 
-      it 'returns the last reader' do
+      it "returns the last reader" do
         string_io = StringIO.new(gzip_string)
         streams.stream(:encode)
         streams.stream(:gz)
@@ -105,8 +105,8 @@ class BuilderTest < Minitest::Test
       end
     end
 
-    describe '#writer' do
-      it 'directly calls block for an empty stream' do
+    describe "#writer" do
+      it "directly calls block for an empty stream" do
         string_io = StringIO.new
         value     = nil
         streams.stream(:none)
@@ -117,7 +117,7 @@ class BuilderTest < Minitest::Test
         assert_equal 32, value
       end
 
-      it 'returns the reader' do
+      it "returns the reader" do
         string_io = StringIO.new
         streams.stream(:zip)
         streams.writer(string_io) do |io|
@@ -125,7 +125,7 @@ class BuilderTest < Minitest::Test
         end
       end
 
-      it 'returns the last reader' do
+      it "returns the last reader" do
         string_io = StringIO.new
         streams.stream(:encode)
         streams.stream(:zip)
@@ -137,79 +137,79 @@ class BuilderTest < Minitest::Test
 
     # Internal methods
 
-    describe '#class_for_stream' do
-      it 'xlsx' do
+    describe "#class_for_stream" do
+      it "xlsx" do
         assert_equal IOStreams::Xlsx::Reader, streams.send(:class_for_stream, :reader, :xlsx)
       end
 
-      it 'gzip' do
+      it "gzip" do
         assert_equal IOStreams::Gzip::Writer, streams.send(:class_for_stream, :writer, :gzip)
       end
 
-      it 'unknown' do
+      it "unknown" do
         assert_raises ArgumentError do
           streams.send(:class_for_stream, :reader, :unknown)
         end
       end
     end
 
-    describe '#parse_extensions' do
-      it 'single stream' do
-        streams = IOStreams::Builder.new('my/path/abc.xlsx')
+    describe "#parse_extensions" do
+      it "single stream" do
+        streams = IOStreams::Builder.new("my/path/abc.xlsx")
         assert_equal %i[xlsx], streams.send(:parse_extensions)
       end
 
-      it 'empty' do
-        streams = IOStreams::Builder.new('my/path/abc.csv')
+      it "empty" do
+        streams = IOStreams::Builder.new("my/path/abc.csv")
         assert_equal [], streams.send(:parse_extensions)
       end
 
-      it 'handles multiple extensions' do
+      it "handles multiple extensions" do
         assert_equal %i[xlsx zip gz pgp], streams.send(:parse_extensions)
       end
 
-      describe 'case-insensitive' do
-        let(:file_name) { 'a.XlsX.GzIp' }
+      describe "case-insensitive" do
+        let(:file_name) { "a.XlsX.GzIp" }
 
-        it 'is case-insensitive' do
+        it "is case-insensitive" do
           assert_equal %i[xlsx gzip], streams.send(:parse_extensions)
         end
       end
     end
 
-    describe '#pipeline' do
-      it 'with stream and file name' do
+    describe "#pipeline" do
+      it "with stream and file name" do
         expected = {enc: {compress: false}}
         streams.stream(:enc, compress: false)
         assert_equal expected, streams.pipeline
       end
 
-      it 'no file name, streams, or options' do
+      it "no file name, streams, or options" do
         expected = {}
         streams  = IOStreams::Builder.new
         assert_equal expected, streams.pipeline
       end
 
-      it 'file name without options' do
-        expected = {:xlsx => {}, :zip => {}, :gz => {}, :pgp => {}}
+      it "file name without options" do
+        expected = {xlsx: {}, zip: {}, gz: {}, pgp: {}}
         assert_equal expected, streams.pipeline
       end
 
-      it 'file name with encode option' do
-        expected = {encode: {encoding: 'BINARY'}, :xlsx => {}, :zip => {}, :gz => {}, :pgp => {}}
-        streams.option(:encode, encoding: 'BINARY')
+      it "file name with encode option" do
+        expected = {encode: {encoding: "BINARY"}, xlsx: {}, zip: {}, gz: {}, pgp: {}}
+        streams.option(:encode, encoding: "BINARY")
         assert_equal expected, streams.pipeline
       end
 
-      it 'file name with option' do
-        expected = {:xlsx => {}, :zip => {}, :gz => {}, :pgp => {passphrase: 'unlock-me'}}
-        streams.option(:pgp, passphrase: 'unlock-me')
+      it "file name with option" do
+        expected = {xlsx: {}, zip: {}, gz: {}, pgp: {passphrase: "unlock-me"}}
+        streams.option(:pgp, passphrase: "unlock-me")
         assert_equal expected, streams.pipeline
       end
     end
 
-    describe '#execute' do
-      it 'directly calls block for an empty stream' do
+    describe "#execute" do
+      it "directly calls block for an empty stream" do
         string_io = StringIO.new
         value     = nil
         streams.send(:execute, :writer, {}, string_io) do |io|
@@ -219,25 +219,25 @@ class BuilderTest < Minitest::Test
         assert_equal 32, value
       end
 
-      it 'calls last block in one element stream' do
-        pipeline  = {simple: {arg: 'first'}}
+      it "calls last block in one element stream" do
+        pipeline  = {simple: {arg: "first"}}
         string_io = StringIO.new
-        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write('last') }
-        assert_equal 'first>last', string_io.string
+        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write("last") }
+        assert_equal "first>last", string_io.string
       end
 
-      it 'chains blocks in 2 element stream' do
-        pipeline  = {simple: {arg: 'first'}, simple2: {arg: 'second'}}
+      it "chains blocks in 2 element stream" do
+        pipeline  = {simple: {arg: "first"}, simple2: {arg: "second"}}
         string_io = StringIO.new
-        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write('last') }
-        assert_equal 'second>first>last', string_io.string
+        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write("last") }
+        assert_equal "second>first>last", string_io.string
       end
 
-      it 'chains blocks in 3 element stream' do
-        pipeline  = {simple: {arg: 'first'}, simple2: {arg: 'second'}, simple3: {arg: 'third'}}
+      it "chains blocks in 3 element stream" do
+        pipeline  = {simple: {arg: "first"}, simple2: {arg: "second"}, simple3: {arg: "third"}}
         string_io = StringIO.new
-        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write('last') }
-        assert_equal 'third>second>first>last', string_io.string
+        streams.send(:execute, :writer, pipeline, string_io) { |io| io.write("last") }
+        assert_equal "third>second>first>last", string_io.string
       end
     end
 

data/test/bzip2_reader_test.rb

@@ -1,32 +1,27 @@
-require_relative 'test_helper'
+require_relative "test_helper"
 
 class Bzip2ReaderTest < Minitest::Test
   describe IOStreams::Bzip2::Reader do
     let :file_name do
-      File.join(File.dirname(__FILE__), 'files', 'text.txt.bz2')
+      File.join(File.dirname(__FILE__), "files", "text.txt.bz2")
     end
 
     let :decompressed do
-      File.read(File.join(File.dirname(__FILE__), 'files', 'text.txt'))
+      File.read(File.join(File.dirname(__FILE__), "files", "text.txt"))
     end
 
-    describe '.file' do
-      it 'file' do
-        result = IOStreams::Bzip2::Reader.file(file_name) do |io|
-          io.read
-        end
+    describe ".file" do
+      it "file" do
+        result = IOStreams::Bzip2::Reader.file(file_name, &:read)
         assert_equal decompressed, result
       end
 
-      it 'stream' do
+      it "stream" do
         result = File.open(file_name) do |file|
-          IOStreams::Bzip2::Reader.stream(file) do |io|
-            io.read
-          end
+          IOStreams::Bzip2::Reader.stream(file, &:read)
         end
         assert_equal decompressed, result
       end
     end
-
   end
 end

data/test/bzip2_writer_test.rb

@@ -1,9 +1,9 @@
-require_relative 'test_helper'
+require_relative "test_helper"
 
 class Bzip2WriterTest < Minitest::Test
   describe IOStreams::Bzip2::Writer do
     let :temp_file do
-      Tempfile.new('iostreams')
+      Tempfile.new("iostreams")
     end
 
     let :file_name do
@@ -11,20 +11,20 @@ class Bzip2WriterTest < Minitest::Test
     end
 
     let :decompressed do
-      File.read(File.join(File.dirname(__FILE__), 'files', 'text.txt'))
+      File.read(File.join(File.dirname(__FILE__), "files", "text.txt"))
     end
 
     after do
       temp_file.delete
     end
 
-    describe '.file' do
-      it 'file' do
+    describe ".file" do
+      it "file" do
         IOStreams::Bzip2::Writer.file(file_name) do |io|
           io.write(decompressed)
         end
 
-        File.open(file_name, 'rb') do |file|
+        File.open(file_name, "rb") do |file|
           io     = RBzip2.default_adapter::Decompressor.new(file)
           result = io.read
           temp_file.delete
@@ -32,8 +32,8 @@ class Bzip2WriterTest < Minitest::Test
         end
       end
 
-      it 'stream' do
-        io_string = StringIO.new(''.b)
+      it "stream" do
+        io_string = StringIO.new("".b)
         IOStreams::Bzip2::Writer.stream(io_string) do |io|
           io.write(decompressed)
         end
@@ -44,6 +44,5 @@ class Bzip2WriterTest < Minitest::Test
         assert_equal decompressed, data
       end
     end
-
   end
 end

data/test/deprecated_test.rb

@@ -1,10 +1,10 @@
-require_relative 'test_helper'
+require_relative "test_helper"
 
 # Test deprecated api
 class DeprecatedTest < Minitest::Test
   describe IOStreams do
     let :source_file_name do
-      File.join(__dir__, 'files', 'text.txt')
+      File.join(__dir__, "files", "text.txt")
     end
 
     let :data do
@@ -12,7 +12,7 @@ class DeprecatedTest < Minitest::Test
     end
 
     let :temp_file do
-      Tempfile.new('iostreams')
+      Tempfile.new("iostreams")
     end
 
     let :target_file_name do
@@ -22,38 +22,38 @@ class DeprecatedTest < Minitest::Test
     let :bad_data do
       [
         "New M\xE9xico,NE".b,
-        'good line',
+        "good line",
         "New M\xE9xico,\x07SF".b
-      ].join("\n").encode('BINARY')
+      ].join("\n").encode("BINARY")
     end
 
     let :stripped_data do
-      bad_data.gsub("\xE9".b, '').gsub("\x07", '')
+      bad_data.gsub("\xE9".b, "").gsub("\x07", "")
     end
 
     let :multiple_zip_file_name do
-      File.join(File.dirname(__FILE__), 'files', 'multiple_files.zip')
+      File.join(File.dirname(__FILE__), "files", "multiple_files.zip")
     end
 
     let :zip_gz_file_name do
-      File.join(File.dirname(__FILE__), 'files', 'text.zip.gz')
+      File.join(File.dirname(__FILE__), "files", "text.zip.gz")
     end
 
     let :contents_test_txt do
-      File.read(File.join(File.dirname(__FILE__), 'files', 'text.txt'))
+      File.read(File.join(File.dirname(__FILE__), "files", "text.txt"))
     end
 
     let :contents_test_json do
-      File.read(File.join(File.dirname(__FILE__), 'files', 'test.json'))
+      File.read(File.join(File.dirname(__FILE__), "files", "test.json"))
     end
 
     after do
       temp_file.delete
     end
 
-    describe '.copy' do
-      it 'streams' do
-        size   = IOStreams.reader(source_file_name) do |source_stream|
+    describe ".copy" do
+      it "streams" do
+        size = IOStreams.reader(source_file_name) do |source_stream|
           IOStreams.writer(target_file_name) do |target_stream|
             IOStreams.copy(source_stream, target_stream)
           end
@@ -64,8 +64,8 @@ class DeprecatedTest < Minitest::Test
         assert_equal actual.size, size
       end
 
-      it 'IO stream' do
-        size   = File.open(source_file_name) do |source_stream|
+      it "IO stream" do
+        size = File.open(source_file_name) do |source_stream|
           IOStreams.writer(target_file_name) do |target_stream|
             IOStreams.copy(source_stream, target_stream)
           end
@@ -76,7 +76,7 @@ class DeprecatedTest < Minitest::Test
         assert_equal actual.size, size
       end
 
-      it 'files' do
+      it "files" do
         size   = IOStreams.copy(source_file_name, target_file_name)
         actual = File.read(target_file_name)
 
@@ -85,18 +85,18 @@ class DeprecatedTest < Minitest::Test
       end
     end
 
-    describe '.each_line' do
-      it 'returns a line at a time' do
+    describe ".each_line" do
+      it "returns a line at a time" do
         lines = []
         count = IOStreams.each_line(source_file_name) { |line| lines << line }
         assert_equal data.lines.map(&:strip), lines
         assert_equal data.lines.count, count
       end
 
-      it 'strips non-printable characters' do
+      it "strips non-printable characters" do
         input = StringIO.new(bad_data)
         lines = []
-        count = IOStreams.each_line(input, encoding: 'UTF-8', encode_cleaner: :printable, encode_replace: '') do |line|
+        count = IOStreams.each_line(input, encoding: "UTF-8", encode_cleaner: :printable, encode_replace: "") do |line|
           lines << line
         end
         assert_equal stripped_data.lines.map(&:strip), lines
@@ -104,18 +104,14 @@ class DeprecatedTest < Minitest::Test
       end
     end
 
-    describe '.reader' do
-      it 'reads a zip file' do
-        result = IOStreams.reader(multiple_zip_file_name, streams: {zip: {entry_file_name: 'test.json'}}) do |io|
-          io.read
-        end
+    describe ".reader" do
+      it "reads a zip file" do
+        result = IOStreams.reader(multiple_zip_file_name, streams: {zip: {entry_file_name: "test.json"}}, &:read)
         assert_equal contents_test_json, result
       end
 
-      it 'reads a zip file from within a gz file' do
-        result = IOStreams.reader(zip_gz_file_name) do |io|
-          io.read
-        end
+      it "reads a zip file from within a gz file" do
+        result = IOStreams.reader(zip_gz_file_name, &:read)
         assert_equal contents_test_txt, result
       end
     end