iostreams 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93dac4c226c66c4e36554311858ff328299fc4202c257cdb0e7f2c8e82e323b
-  data.tar.gz: fa96f9d6007769b812ab5506e1ca5ca20866ed9d6fc6bc98d75b50a0d50a23b2
+  metadata.gz: 26d07bc98819ce065e8c698f00b75a6c2e9fc0a9ea6bf13c1afa8bc8c1e71e66
+  data.tar.gz: 2f7898b4197d3f94cbfcc30ba6c8d23e72121877833e57ec9a989e465d019ca2
 SHA512:
-  metadata.gz: 2538af2be40ad81287b4c3501f0ff9672ea82289adcb2de1e976d868fd9aa655f01d496b6299ba851193e1ed832750e6bcb21f6ed88179aab303f348e4bef60f
-  data.tar.gz: e7d6c8f09d0377f0bdfb83fdfc61559afd1581d1e8425cc9a3a76754be2e92003f202246c0a43b83b12107774965388aa71f2c2950835797363ce057ca5fe24b
+  metadata.gz: 2887fb5b2935d28bcf2426fd7139a6b7a27c87c1da8d7289cc69f0a644c2d98e4667f6e6da1a57133bcf8bdd93e948d7819d24ce09cb0d65f6c35d59b0b604c7
+  data.tar.gz: 034aa07ff80107a139dd86ffd492361887de4f4e8190385b48d12b1bedeb0a3af8c1a25720d41f731330cb46d707736972c707c3ec5576551425d29d3843da68

data/lib/io_streams/gzip/reader.rb

@@ -2,9 +2,9 @@ module IOStreams
   module Gzip
     class Reader < IOStreams::Reader
       # Read from a gzip stream, decompressing the contents as it is read
-      def self.stream(input_stream, original_file_name: nil, &block)
+      def self.stream(input_stream, original_file_name: nil)
         io = ::Zlib::GzipReader.new(input_stream)
-        block.call(io)
+        yield io
       ensure
         io&.close
       end

data/lib/io_streams/line/reader.rb

@@ -75,8 +75,6 @@ module IOStreams
       # Note:
       # * The line delimiter is _not_ returned.
       def each
-        return to_enum(__method__) unless block_given?
-
         line_count = 0
         until eof?
           line = readline

data/lib/io_streams/pgp/writer.rb

@@ -89,10 +89,11 @@ module IOStreams
 
         IOStreams::Pgp.logger&.debug { "IOStreams::Pgp::Writer.open: #{command}" }
 
+        result = nil
         Open3.popen2e(command) do |stdin, out, waith_thr|
           begin
             stdin.binmode
-            yield(stdin)
+            result = yield(stdin)
             stdin.close
           rescue Errno::EPIPE
             # Ignore broken pipe because gpg terminates early due to an error
@@ -104,6 +105,7 @@ module IOStreams
             raise(Pgp::Failure, "GPG Failed to create encrypted file: #{file_name}: #{out.read.chomp}")
           end
         end
+        result
       end
     end
   end

data/lib/io_streams/record/reader.rb

@@ -68,8 +68,6 @@ module IOStreams
       end
 
       def each
-        return to_enum(__method__) unless block_given?
-
         @line_reader.each do |line|
           if @tabular.header?
             @tabular.parse_header(line)

data/lib/io_streams/row/reader.rb

@@ -40,8 +40,6 @@ module IOStreams
       end
 
       def each
-        return to_enum(__method__) unless block_given?
-
         @line_reader.each do |line|
           if @tabular.header?
             columns = @tabular.parse_header(line)

data/lib/io_streams/tabular/parser/fixed.rb

@@ -148,14 +148,14 @@ module IOStreams
 
           def initialize(size:, key: nil, type: :string, decimals: 2)
             @key      = key
-            @size     = size == :remainder ? -1 : size.to_i
+            @size     = (size == :remainder || size == "remainder") ? -1 : size.to_i
             @type     = type.to_sym
             @decimals = decimals
 
             unless @size.positive? || (@size == -1)
               raise(Errors::InvalidLayout, "Size #{size.inspect} must be positive or :remainder")
             end
-            raise(Errors::InvalidLayout, "Unknown type: #{type.inspect}") unless TYPES.include?(type)
+            raise(Errors::InvalidLayout, "Unknown type: #{type.inspect}") unless TYPES.include?(@type)
           end
 
           def parse(value)

data/lib/io_streams/version.rb

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

data/lib/io_streams/writer.rb

@@ -4,8 +4,9 @@ module IOStreams
     # and then pass that filename in for this reader.
     def self.stream(output_stream, original_file_name: nil, **args, &block)
       Utils.temp_file_name("iostreams_writer") do |file_name|
-        file(file_name, original_file_name: original_file_name, **args, &block)
+        count = file(file_name, original_file_name: original_file_name, **args, &block)
         ::File.open(file_name, "rb") { |source| ::IO.copy_stream(source, output_stream) }
+        count
       end
     end
 

data/test/line_reader_test.rb

@@ -98,13 +98,6 @@ class LineReaderTest < Minitest::Test
         assert_equal data.size, count
       end
 
-      it "with no block returns enumerator" do
-        lines = IOStreams::Line::Reader.file(file_name) do |io|
-          io.each.first(100)
-        end
-        assert_equal data, lines
-      end
-
       it "each_line stream" do
         lines = []
         count = File.open(file_name) do |file|

data/test/paths/file_test.rb

@@ -24,11 +24,6 @@ module Paths
           assert_equal count, data.lines.size
           assert_equal data.lines.collect(&:strip), records
         end
-
-        it "reads lines without block" do
-          records = file_path.each.first(100)
-          assert_equal data.lines.collect(&:strip), records
-        end
       end
 
       describe "#each_child" do

data/test/record_reader_test.rb

@@ -46,13 +46,6 @@ class RecordReaderTest < Minitest::Test
         end
         assert_equal expected, rows
       end
-
-      it "with no block returns enumerator" do
-        records = IOStreams::Record::Reader.file(file_name, cleanse_header: false) do |io|
-          io.each.first(100)
-        end
-        assert_equal expected, records
-      end
     end
 
     describe "#collect" do

data/test/row_reader_test.rb

@@ -20,13 +20,6 @@ class RowReaderTest < Minitest::Test
         assert_equal expected.size, count
       end
 
-      it "with no block returns enumerator" do
-        rows = IOStreams::Row::Reader.file(file_name) do |io|
-          io.each.first(100)
-        end
-        assert_equal expected, rows
-      end
-
       it "stream" do
         rows  = []
         count = IOStreams::Line::Reader.file(file_name) do |file|

data/test/tabular_test.rb

@@ -40,6 +40,19 @@ class TabularTest < Minitest::Test
       IOStreams::Tabular.new(format: :fixed, format_options: {layout: layout})
     end
 
+    let :fixed_with_strings do
+      layout = [
+        {size: "23", key: "name"},
+        {size: 40, key: "address"},
+        {size: 2},
+        {size: 5.0, key: "zip", type: "integer"},
+        {size: "8", key: "age", type: "integer"},
+        {size: 10, key: "weight", type: "float", decimals: 2},
+        {size: "remainder", key: "remainder"}
+      ]
+      IOStreams::Tabular.new(format: :fixed, format_options: {layout: layout})
+    end
+
     describe "#parse_header" do
       it "parses and sets the csv header" do
         tabular = IOStreams::Tabular.new(format: :csv)
@@ -269,6 +282,11 @@ class TabularTest < Minitest::Test
           assert_equal "Jack                   over there                                34618000000210123456.79", string
         end
 
+        it "renders fixed data with string keys" do
+          assert string = fixed_with_strings.render("name" => "Jack", "address" => "over there", "zip" => 34_618, "weight" => 123_456.789123, "age" => 21)
+          assert_equal "Jack                   over there                                34618000000210123456.79", string
+        end
+
         it "truncates long strings" do
           assert string = fixed.render(name: "Jack ran up the beanstalk and when jack reached the top it was truncated", address: "over there", zip: 34_618)
           assert_equal "Jack ran up the beanstaover there                                34618000000000000000.00", string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -87,6 +87,7 @@ files:
 - test/files/unclosed_quote_large_test.csv
 - test/files/unclosed_quote_test.csv
 - test/files/unclosed_quote_test2.csv
+- test/files/utf16_test.csv
 - test/gzip_reader_test.rb
 - test/gzip_writer_test.rb
 - test/io_streams_test.rb
@@ -159,6 +160,7 @@ test_files:
 - test/files/unclosed_quote_large_test.csv
 - test/files/unclosed_quote_test.csv
 - test/files/unclosed_quote_test2.csv
+- test/files/utf16_test.csv
 - test/gzip_reader_test.rb
 - test/gzip_writer_test.rb
 - test/io_streams_test.rb