iostreams 1.0.0.beta7 → 1.0.0

data/lib/io_streams/version.rb

@@ -1,3 +1,3 @@
 module IOStreams
-  VERSION = "1.0.0.beta7".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/iostreams.rb

@@ -1,12 +1,12 @@
 require 'io_streams/version'
 # @formatter:off
 module IOStreams
+  autoload :Builder,  'io_streams/builder'
   autoload :Errors,   'io_streams/errors'
   autoload :Path,     'io_streams/path'
   autoload :Pgp,      'io_streams/pgp'
   autoload :Reader,   'io_streams/reader'
   autoload :Stream,   'io_streams/stream'
-  autoload :Streams,  'io_streams/streams'
   autoload :Tabular,  'io_streams/tabular'
   autoload :Utils,    'io_streams/utils'
   autoload :Writer,   'io_streams/writer'

data/test/{streams_test.rb → builder_test.rb}

@@ -1,9 +1,9 @@
 require_relative 'test_helper'
 
-class StreamsTest < Minitest::Test
-  describe IOStreams::Streams do
+class BuilderTest < Minitest::Test
+  describe IOStreams::Builder do
     let(:file_name) { 'my/path/abc.bcd.xlsx.zip.gz.pgp' }
-    let(:streams) { IOStreams::Streams.new(file_name) }
+    let(:streams) { IOStreams::Builder.new(file_name) }
 
     describe '#option' do
       it 'adds one option' do
@@ -68,6 +68,14 @@ class StreamsTest < Minitest::Test
     end
 
     describe '#reader' do
+      let :gzip_string do
+        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
         string_io = StringIO.new
         value     = nil
@@ -80,17 +88,17 @@ class StreamsTest < Minitest::Test
       end
 
       it 'returns the reader' do
-        string_io = StringIO.new
-        streams.stream(:bz2)
+        string_io = StringIO.new(gzip_string)
+        streams.stream(:gz)
         streams.reader(string_io) do |io|
-          assert io.is_a?(RBzip2::FFI::Decompressor), io
+          assert io.is_a?(::Zlib::GzipReader), io
         end
       end
 
       it 'returns the last reader' do
-        string_io = StringIO.new
+        string_io = StringIO.new(gzip_string)
         streams.stream(:encode)
-        streams.stream(:bz2)
+        streams.stream(:gz)
         streams.reader(string_io) do |io|
           assert io.is_a?(IOStreams::Encode::Reader), io
         end
@@ -147,12 +155,12 @@ class StreamsTest < Minitest::Test
 
     describe '#parse_extensions' do
       it 'single stream' do
-        streams = IOStreams::Streams.new('my/path/abc.xlsx')
+        streams = IOStreams::Builder.new('my/path/abc.xlsx')
         assert_equal %i[xlsx], streams.send(:parse_extensions)
       end
 
       it 'empty' do
-        streams = IOStreams::Streams.new('my/path/abc.csv')
+        streams = IOStreams::Builder.new('my/path/abc.csv')
         assert_equal [], streams.send(:parse_extensions)
       end
 
@@ -178,7 +186,7 @@ class StreamsTest < Minitest::Test
 
       it 'no file name, streams, or options' do
         expected = {}
-        streams  = IOStreams::Streams.new
+        streams  = IOStreams::Builder.new
         assert_equal expected, streams.pipeline
       end
 
@@ -238,6 +246,10 @@ class StreamsTest < Minitest::Test
         yield new(io, **args)
       end
 
+      def self.open(file_name_or_io, **args, &block)
+        file_name_or_io.is_a?(String) ? file(file_name_or_io, **args, &block) : stream(file_name_or_io, **args, &block)
+      end
+
       def initialize(io, arg:)
         @io  = io
         @arg = arg

data/test/encode_reader_test.rb

@@ -21,6 +21,7 @@ class EncodeReaderTest < Minitest::Test
     describe '#read' do
       describe 'replacement' do
         it 'does not strip invalid characters' do
+          skip "Does not raise on JRuby" if defined?(JRuby)
           input = StringIO.new(bad_data)
           IOStreams::Encode::Reader.stream(input, encoding: 'UTF-8') do |io|
             assert_raises ::Encoding::UndefinedConversionError do

data/test/paths/s3_test.rb

@@ -100,7 +100,7 @@ module Paths
       describe '#each_line' do
         it 'reads line by line' do
           lines = []
-          existing_path.each_line {|line| lines << line}
+          existing_path.each(:line) {|line| lines << line}
           assert_equal raw.lines.collect(&:chomp), lines
         end
       end

data/test/stream_test.rb

@@ -75,7 +75,7 @@ class StreamTest < Minitest::Test
       it 'returns a line at a time' do
         lines = []
         stream.stream(:none)
-        count = stream.each_line { |line| lines << line }
+        count = stream.each(:line) { |line| lines << line }
         assert_equal data.lines.map(&:strip), lines
         assert_equal data.lines.count, count
       end
@@ -85,16 +85,16 @@ class StreamTest < Minitest::Test
         lines  = []
         stream = IOStreams::Stream.new(input)
         stream.stream(:encode, encoding: 'UTF-8', cleaner: :printable, replace: '')
-        count = stream.each_line { |line| lines << line }
+        count = stream.each(:line) { |line| lines << line }
         assert_equal stripped_data.lines.map(&:strip), lines
         assert_equal stripped_data.lines.count, count
       end
     end
 
-    describe '.each_row' do
+    describe '.each row' do
     end
 
-    describe '.each_record' do
+    describe '.each record' do
     end
 
     describe '#writer' do
@@ -191,11 +191,11 @@ class StreamTest < Minitest::Test
       end
     end
 
-    describe '#line_writer' do
+    describe '#writer(:line)' do
       describe "#write" do
         it 'one block' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream.write("Hello World")
           end
           assert_equal "Hello World\n", io.string
@@ -203,7 +203,7 @@ class StreamTest < Minitest::Test
 
         it 'multiple blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream.write("He")
             stream.write("l")
             stream.write("lo ")
@@ -214,7 +214,7 @@ class StreamTest < Minitest::Test
 
         it 'empty blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream.write("")
             stream.write("He")
             stream.write("")
@@ -229,7 +229,7 @@ class StreamTest < Minitest::Test
 
         it 'nil blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream.write(nil)
             stream.write("He")
             stream.write(nil)
@@ -246,7 +246,7 @@ class StreamTest < Minitest::Test
       describe "#<<" do
         it 'one block' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream << "Hello World"
           end
           assert_equal "Hello World\n", io.string
@@ -254,7 +254,7 @@ class StreamTest < Minitest::Test
 
         it 'multiple blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream << "He"
             stream << "l" << "lo " << "World"
           end
@@ -263,7 +263,7 @@ class StreamTest < Minitest::Test
 
         it 'empty blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream << ""
             stream << "He" << "" << "l" << ""
             stream << "lo " << "World"
@@ -274,7 +274,7 @@ class StreamTest < Minitest::Test
 
         it 'nil blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream << nil
             stream << "He" << nil << "l" << nil
             stream << "lo " << "World"
@@ -287,9 +287,9 @@ class StreamTest < Minitest::Test
       describe "line writers within line writers" do
         it 'uses existing line writer' do
           io = StringIO.new
-          IOStreams::Stream.new(io).line_writer do |stream|
+          IOStreams::Stream.new(io).writer(:line) do |stream|
             stream.write("Before")
-            IOStreams::Stream.new(stream).line_writer do |inner|
+            IOStreams::Stream.new(stream).writer(:line) do |inner|
               stream.write("Inner")
               assert_equal inner.object_id, stream.object_id
             end
@@ -300,11 +300,11 @@ class StreamTest < Minitest::Test
       end
     end
 
-    describe '#row_writer' do
+    describe '#writer(:array)' do
       describe "#write" do
         it 'one block' do
           io = StringIO.new
-          IOStreams::Stream.new(io).row_writer do |stream|
+          IOStreams::Stream.new(io).writer(:array) do |stream|
             stream << %w[Hello World]
           end
           assert_equal "Hello,World\n", io.string
@@ -312,7 +312,7 @@ class StreamTest < Minitest::Test
 
         it 'multiple blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).row_writer do |stream|
+          IOStreams::Stream.new(io).writer(:array) do |stream|
             stream << %w[He]
             stream << %w[l lo\  World]
             stream << ["He", "", "l", ""]
@@ -324,7 +324,7 @@ class StreamTest < Minitest::Test
         it 'empty blocks' do
           # skip "TODO"
           io = StringIO.new
-          IOStreams::Stream.new(io).row_writer do |stream|
+          IOStreams::Stream.new(io).writer(:array) do |stream|
             stream << %w[He]
             stream << []
             stream << %w[l lo\  World]
@@ -337,7 +337,7 @@ class StreamTest < Minitest::Test
 
         it 'nil values' do
           io = StringIO.new
-          IOStreams::Stream.new(io).row_writer do |stream|
+          IOStreams::Stream.new(io).writer(:array) do |stream|
             stream << %w[He]
             stream << %w[l lo\  World]
             stream << ["He", nil, "l", nil]
@@ -349,7 +349,7 @@ class StreamTest < Minitest::Test
         it 'empty leading array' do
           skip "TODO"
           io = StringIO.new
-          IOStreams::Stream.new(io).row_writer do |stream|
+          IOStreams::Stream.new(io).writer(:array) do |stream|
             stream << []
             stream << %w[He]
             stream << %w[l lo\  World]
@@ -362,11 +362,11 @@ class StreamTest < Minitest::Test
       end
     end
 
-    describe '#record_writer' do
+    describe '#writer(:hash)' do
       describe "#write" do
         it 'one block' do
           io = StringIO.new
-          IOStreams::Stream.new(io).record_writer do |stream|
+          IOStreams::Stream.new(io).writer(:hash) do |stream|
             stream << {first_name: "Jack", last_name: "Johnson"}
           end
           assert_equal  "first_name,last_name\nJack,Johnson\n", io.string, io.string.inspect
@@ -374,7 +374,7 @@ class StreamTest < Minitest::Test
 
         it 'multiple blocks' do
           io = StringIO.new
-          IOStreams::Stream.new(io).record_writer do |stream|
+          IOStreams::Stream.new(io).writer(:hash) do |stream|
             stream << {first_name: "Jack", last_name: "Johnson"}
             stream << {first_name: "Able", last_name: "Smith"}
           end
@@ -383,7 +383,7 @@ class StreamTest < Minitest::Test
 
         it 'empty hashes' do
           io = StringIO.new
-          IOStreams::Stream.new(io).record_writer do |stream|
+          IOStreams::Stream.new(io).writer(:hash) do |stream|
             stream << {first_name: "Jack", last_name: "Johnson"}
             stream << {} << {first_name: "Able", last_name: "Smith"}
             stream << {}
@@ -394,7 +394,7 @@ class StreamTest < Minitest::Test
         it 'nil values' do
           skip "TODO"
           io = StringIO.new
-          IOStreams::Stream.new(io).record_writer do |stream|
+          IOStreams::Stream.new(io).writer(:hash) do |stream|
             stream << {first_name: "Jack", last_name: "Johnson"}
             stream << {} << {first_name: "Able", last_name: "Smith"}
             stream << {first_name: "Able", last_name: nil}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta7
+  version: 1.0.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -20,6 +20,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/io_streams/builder.rb
 - lib/io_streams/bzip2/reader.rb
 - lib/io_streams/bzip2/writer.rb
 - lib/io_streams/deprecated.rb
@@ -46,7 +47,6 @@ files:
 - lib/io_streams/row/reader.rb
 - lib/io_streams/row/writer.rb
 - lib/io_streams/stream.rb
-- lib/io_streams/streams.rb
 - lib/io_streams/symmetric_encryption/reader.rb
 - lib/io_streams/symmetric_encryption/writer.rb
 - lib/io_streams/tabular.rb
@@ -66,6 +66,7 @@ files:
 - lib/io_streams/zip/reader.rb
 - lib/io_streams/zip/writer.rb
 - lib/iostreams.rb
+- test/builder_test.rb
 - test/bzip2_reader_test.rb
 - test/bzip2_writer_test.rb
 - test/deprecated_test.rb
@@ -104,7 +105,6 @@ files:
 - test/row_reader_test.rb
 - test/row_writer_test.rb
 - test/stream_test.rb
-- test/streams_test.rb
 - test/tabular_test.rb
 - test/test_helper.rb
 - test/utils_test.rb
@@ -126,17 +126,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Input and Output streaming for Ruby.
 test_files:
 - test/pgp_reader_test.rb
 - test/deprecated_test.rb
+- test/builder_test.rb
 - test/line_reader_test.rb
 - test/xlsx_reader_test.rb
 - test/minimal_file_reader.rb
@@ -145,7 +146,6 @@ test_files:
 - test/bzip2_writer_test.rb
 - test/encode_writer_test.rb
 - test/gzip_writer_test.rb
-- test/streams_test.rb
 - test/stream_test.rb
 - test/paths/matcher_test.rb
 - test/paths/s3_test.rb