iostreams 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d07bc98819ce065e8c698f00b75a6c2e9fc0a9ea6bf13c1afa8bc8c1e71e66
-  data.tar.gz: 2f7898b4197d3f94cbfcc30ba6c8d23e72121877833e57ec9a989e465d019ca2
+  metadata.gz: 30ace4685022c88754654b2b48d1c86185e47841f1d3c6a3916bc348098b178d
+  data.tar.gz: 040c669d7ad4521941a3752dc405390c4f7dda98a583cc0f5d923091e12bd452
 SHA512:
-  metadata.gz: 2887fb5b2935d28bcf2426fd7139a6b7a27c87c1da8d7289cc69f0a644c2d98e4667f6e6da1a57133bcf8bdd93e948d7819d24ce09cb0d65f6c35d59b0b604c7
-  data.tar.gz: 034aa07ff80107a139dd86ffd492361887de4f4e8190385b48d12b1bedeb0a3af8c1a25720d41f731330cb46d707736972c707c3ec5576551425d29d3843da68
+  metadata.gz: 90f2635d2e443fe4c4f3992d8f92a725118b2f52c0d4861ee1d778be8f145d93c2f0663904f8cf699b33106a154d13980634881a0039c7e0ad6389d137d69760
+  data.tar.gz: 970da1fd8e3b6ea7e1b36dad476c7f842413c2b8b50dc2939802b1962c00347bcdfa6a135245550c9cb639b694e9ca2c16439bde1afe7677701f3867cdc277e4

data/lib/io_streams/version.rb

@@ -1,3 +1,3 @@
 module IOStreams
-  VERSION = "1.10.2".freeze
+  VERSION = "1.10.3".freeze
 end

data/lib/io_streams/zip/writer.rb

@@ -14,7 +14,7 @@ module IOStreams
       #     Name of the file entry within the Zip file.
       #
       # The stream supplied to the block only responds to #write
-      def self.stream(output_stream, original_file_name: nil, zip_file_name: nil, entry_file_name: zip_file_name, &block)
+      def self.stream(output_stream, original_file_name: nil, zip_file_name: nil, entry_file_name: zip_file_name)
         # Default the name of the file within the zip to the supplied file_name without the zip extension
         if entry_file_name.nil? && original_file_name && (original_file_name =~ /\.(zip)\z/i)
           entry_file_name = original_file_name.to_s[0..-5]
@@ -23,7 +23,11 @@ module IOStreams
 
         Utils.load_soft_dependency("zip_tricks", "Zip") unless defined?(ZipTricks::Streamer)
 
-        ZipTricks::Streamer.open(output_stream) { |zip| zip.write_deflated_file(entry_file_name, &block) }
+        result = nil
+        ZipTricks::Streamer.open(output_stream) do |zip|
+          zip.write_deflated_file(entry_file_name) { |io| result = yield(io) }
+        end
+        result
       end
     end
   end

data/test/bzip2_writer_test.rb

@@ -20,10 +20,13 @@ class Bzip2WriterTest < Minitest::Test
 
     describe ".file" do
       it "file" do
-        IOStreams::Bzip2::Writer.file(file_name) do |io|
-          io.write(decompressed)
-          io.write(decompressed)
-        end
+        result =
+          IOStreams::Bzip2::Writer.file(file_name) do |io|
+            io.write(decompressed)
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
 
         File.open(file_name, "rb") do |file|
           io     = ::Bzip2::FFI::Reader.new(file)
@@ -35,10 +38,13 @@ class Bzip2WriterTest < Minitest::Test
 
       it "stream" do
         io_string = StringIO.new("".b)
-        IOStreams::Bzip2::Writer.stream(io_string) do |io|
-          io.write(decompressed)
-          io.write(decompressed)
-        end
+        result    =
+          IOStreams::Bzip2::Writer.stream(io_string) do |io|
+            io.write(decompressed)
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
 
         io     = StringIO.new(io_string.string)
         rbzip2 = ::Bzip2::FFI::Reader.new(io)

data/test/encode_writer_test.rb

@@ -22,18 +22,24 @@ class EncodeWriterTest < Minitest::Test
       it "file" do
         temp_file = Tempfile.new("rocket_job")
         file_name = temp_file.to_path
-        IOStreams::Encode::Writer.file(file_name, encoding: "ASCII-8BIT") do |io|
-          io << bad_data
-        end
+        result    =
+          IOStreams::Encode::Writer.file(file_name, encoding: "ASCII-8BIT") do |io|
+            io << bad_data
+            53534
+          end
+        assert_equal 53534, result
         result = File.read(file_name, mode: "rb")
         assert_equal bad_data, result
       end
 
       it "stream" do
-        io = StringIO.new("".b)
-        IOStreams::Encode::Writer.stream(io, encoding: "ASCII-8BIT") do |encoded|
-          encoded << bad_data
-        end
+        io     = StringIO.new("".b)
+        result =
+          IOStreams::Encode::Writer.stream(io, encoding: "ASCII-8BIT") do |encoded|
+            encoded << bad_data
+            53534
+          end
+        assert_equal 53534, result
         assert_equal "ASCII-8BIT", io.string.encoding.to_s
         assert_equal bad_data, io.string
       end
@@ -70,9 +76,12 @@ class EncodeWriterTest < Minitest::Test
       it "returns byte count" do
         io_string = StringIO.new("".b)
         count     = 0
-        IOStreams::Encode::Writer.stream(io_string, encoding: "ASCII-8BIT") do |io|
-          count += io.write(bad_data)
-        end
+        result    =
+          IOStreams::Encode::Writer.stream(io_string, encoding: "ASCII-8BIT") do |io|
+            count += io.write(bad_data)
+            53534
+          end
+        assert_equal 53534, result
         assert_equal bad_data, io_string.string
         assert_equal bad_data.size, count
       end

data/test/gzip_writer_test.rb

@@ -20,9 +20,13 @@ class GzipWriterTest < Minitest::Test
 
     describe ".file" do
       it "file" do
-        IOStreams::Gzip::Writer.file(file_name) do |io|
-          io.write(decompressed)
-        end
+        result =
+          IOStreams::Gzip::Writer.file(file_name) do |io|
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
+
         result = Zlib::GzipReader.open(file_name, &:read)
         temp_file.delete
         assert_equal decompressed, result
@@ -30,11 +34,15 @@ class GzipWriterTest < Minitest::Test
 
       it "stream" do
         io_string = StringIO.new("".b)
-        IOStreams::Gzip::Writer.stream(io_string) do |io|
-          io.write(decompressed)
-        end
-        io = StringIO.new(io_string.string)
-        gz = Zlib::GzipReader.new(io)
+        result    =
+          IOStreams::Gzip::Writer.stream(io_string) do |io|
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
+
+        io   = StringIO.new(io_string.string)
+        gz   = Zlib::GzipReader.new(io)
         data = gz.read
         gz.close
         assert_equal decompressed, data

data/test/line_writer_test.rb

@@ -18,18 +18,25 @@ class DelimitedWriterTest < Minitest::Test
       it "file" do
         temp_file = Tempfile.new("rocket_job")
         file_name = temp_file.to_path
-        IOStreams::Line::Writer.file(file_name) do |io|
-          lines.each { |line| io << line }
-        end
+        result    =
+          IOStreams::Line::Writer.file(file_name) do |io|
+            lines.each { |line| io << line }
+            53534
+          end
+        assert_equal 53534, result
+
         result = File.read(file_name)
         assert_equal raw, result
       end
 
       it "stream" do
         io_string = StringIO.new
-        IOStreams::Line::Writer.stream(io_string) do |io|
-          lines.each { |line| io << line }
-        end
+        result    =
+          IOStreams::Line::Writer.stream(io_string) do |io|
+            lines.each { |line| io << line }
+            53534
+          end
+        assert_equal 53534, result
         assert_equal raw, io_string.string
       end
     end
@@ -38,9 +45,12 @@ class DelimitedWriterTest < Minitest::Test
       it "returns byte count" do
         io_string = StringIO.new
         count     = 0
-        IOStreams::Line::Writer.stream(io_string) do |io|
-          lines.each { |line| count += io.write(line) }
-        end
+        result    =
+          IOStreams::Line::Writer.stream(io_string) do |io|
+            lines.each { |line| count += io.write(line) }
+            53534
+          end
+        assert_equal 53534, result
         assert_equal raw, io_string.string
         assert_equal raw.size, count
       end

data/test/pgp_writer_test.rb

@@ -21,9 +21,12 @@ class PgpWriterTest < Minitest::Test
 
     describe ".file" do
       it "writes encrypted text file" do
-        IOStreams::Pgp::Writer.file(file_name, recipient: "receiver@example.org") do |io|
-          io.write(decrypted)
-        end
+        result =
+          IOStreams::Pgp::Writer.file(file_name, recipient: "receiver@example.org") do |io|
+            io.write(decrypted)
+            53534
+          end
+        assert_equal 53534, result
 
         result = IOStreams::Pgp::Reader.file(file_name, passphrase: "receiver_passphrase", &:read)
         assert_equal decrypted, result
@@ -34,9 +37,12 @@ class PgpWriterTest < Minitest::Test
         binary_data      = File.open(binary_file_name, "rb", &:read)
 
         File.open(binary_file_name, "rb") do |input|
-          IOStreams::Pgp::Writer.file(file_name, recipient: "receiver@example.org") do |output|
-            IO.copy_stream(input, output)
-          end
+          result =
+            IOStreams::Pgp::Writer.file(file_name, recipient: "receiver@example.org") do |output|
+              IO.copy_stream(input, output)
+              53534
+            end
+          assert_equal 53534, result
         end
 
         result = IOStreams::Pgp::Reader.file(file_name, passphrase: "receiver_passphrase", &:read)
@@ -108,9 +114,12 @@ class PgpWriterTest < Minitest::Test
 
       it "writes to a stream" do
         io_string = StringIO.new("".b)
-        IOStreams::Pgp::Writer.stream(io_string, recipient: "receiver@example.org", signer: "sender@example.org", signer_passphrase: "sender_passphrase") do |io|
-          io.write(decrypted)
-        end
+        result    =
+          IOStreams::Pgp::Writer.stream(io_string, recipient: "receiver@example.org", signer: "sender@example.org", signer_passphrase: "sender_passphrase") do |io|
+            io.write(decrypted)
+            53534
+          end
+        assert_equal 53534, result
 
         io     = StringIO.new(io_string.string)
         result = IOStreams::Pgp::Reader.stream(io, passphrase: "receiver_passphrase", &:read)

data/test/record_writer_test.rb

@@ -43,28 +43,38 @@ class RecordWriterTest < Minitest::Test
 
     describe "#<<" do
       it "file" do
-        IOStreams::Record::Writer.file(file_name) do |io|
-          inputs.each { |hash| io << hash }
-        end
+        result =
+          IOStreams::Record::Writer.file(file_name) do |io|
+            inputs.each { |hash| io << hash }
+            53534
+          end
+        assert_equal 53534, result
         result = File.read(file_name)
         assert_equal raw_csv_data, result
       end
 
       it "json file" do
-        IOStreams::Record::Writer.file(file_name, file_name: "abc.json") do |io|
-          inputs.each { |hash| io << hash }
-        end
+        result =
+          IOStreams::Record::Writer.file(file_name, file_name: "abc.json") do |io|
+            inputs.each { |hash| io << hash }
+            53534
+          end
+        assert_equal 53534, result
+
         result = File.read(file_name)
         assert_equal raw_json_data, result
       end
 
       it "stream" do
         io_string = StringIO.new
-        IOStreams::Line::Writer.stream(io_string) do |io|
-          IOStreams::Record::Writer.stream(io) do |stream|
-            inputs.each { |row| stream << row }
+        result    =
+          IOStreams::Line::Writer.stream(io_string) do |io|
+            IOStreams::Record::Writer.stream(io) do |stream|
+              inputs.each { |row| stream << row }
+              53534
+            end
           end
-        end
+        assert_equal 53534, result
         assert_equal raw_csv_data, io_string.string
       end
     end

data/test/row_writer_test.rb

@@ -29,20 +29,26 @@ class RowWriterTest < Minitest::Test
 
     describe ".stream" do
       it "file" do
-        IOStreams::Row::Writer.file(file_name) do |io|
-          csv_rows.each { |array| io << array }
-        end
+        result =
+          IOStreams::Row::Writer.file(file_name) do |io|
+            csv_rows.each { |array| io << array }
+            53534
+          end
+        assert_equal 53534, result
         result = ::File.read(file_name)
         assert_equal raw_csv_data, result
       end
 
       it "streams" do
         io_string = StringIO.new
-        IOStreams::Line::Writer.stream(io_string) do |io|
-          IOStreams::Row::Writer.stream(io) do |stream|
-            csv_rows.each { |array| stream << array }
+        result    =
+          IOStreams::Line::Writer.stream(io_string) do |io|
+            IOStreams::Row::Writer.stream(io) do |stream|
+              csv_rows.each { |array| stream << array }
+              53534
+            end
           end
-        end
+        assert_equal 53534, result
         assert_equal raw_csv_data, io_string.string
       end
     end

data/test/zip_writer_test.rb

@@ -21,19 +21,25 @@ class ZipWriterTest < Minitest::Test
 
     describe ".file" do
       it "file" do
-        IOStreams::Zip::Writer.file(file_name, entry_file_name: "text.txt") do |io|
-          io.write(decompressed)
-        end
+        result =
+          IOStreams::Zip::Writer.file(file_name, entry_file_name: "text.txt") do |io|
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
         result = IOStreams::Zip::Reader.file(file_name, &:read)
         assert_equal decompressed, result
       end
 
       it "stream" do
         io_string = StringIO.new("".b)
-        IOStreams::Zip::Writer.stream(io_string) do |io|
-          io.write(decompressed)
-        end
-        io = StringIO.new(io_string.string)
+        result    =
+          IOStreams::Zip::Writer.stream(io_string) do |io|
+            io.write(decompressed)
+            53534
+          end
+        assert_equal 53534, result
+        io     = StringIO.new(io_string.string)
         result = IOStreams::Zip::Reader.stream(io, &:read)
         assert_equal decompressed, result
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies: []
 description:
 email: