iostreams 0.14.0 → 0.15.0

data/test/xlsx_reader_test.rb

@@ -1,45 +1,41 @@
 require_relative 'test_helper'
 
-module Streams
+class XlsxReaderTest
   describe IOStreams::Xlsx::Reader do
-    before do
-      @xlsx_contents = [
+    let :file_name do
+      File.join(File.dirname(__FILE__), 'files', 'spreadsheet.xlsx')
+    end
+
+    let :xlsx_contents do
+      [
         ['first column', 'second column', 'third column'],
         ['data 1', 'data 2', 'more data']
       ]
     end
 
     describe '.open' do
-      let(:file_name) { File.join(File.dirname(__FILE__), 'files', 'spreadsheet.xlsx') }
-
       describe 'with a file path' do
-        before do
-          @file = File.open(file_name)
-        end
-
         it 'returns the contents of the file' do
           rows = []
-          IOStreams::Xlsx::Reader.open(@file) do |spreadsheet|
-            spreadsheet.each { |row| rows << row }
+          IOStreams::Xlsx::Reader.open(file_name) do |stream|
+            stream.each { |row| rows << row }
           end
-          assert_equal(@xlsx_contents, rows)
+          assert_equal xlsx_contents, rows
         end
       end
 
       describe 'with a file stream' do
-
         it 'returns the contents of the file' do
           rows = []
           File.open(file_name) do |file|
-            IOStreams::Xlsx::Reader.open(file) do |spreadsheet|
-              spreadsheet.each { |row| rows << row }
+            IOStreams::Xlsx::Reader.open(file) do |stream|
+              stream.each { |row| rows << row }
             end
           end
 
-          assert_equal(@xlsx_contents, rows)
+          assert_equal xlsx_contents, rows
         end
       end
     end
-
   end
 end

data/test/zip_reader_test.rb

@@ -1,34 +1,33 @@
 require_relative 'test_helper'
 require 'zip'
 
-# Unit Test for IOStreams::Zip
-module Streams
-  class ZipReaderTest < Minitest::Test
-    describe IOStreams::Zip::Reader do
-      before do
-        @file_name = File.join(File.dirname(__FILE__), 'files', 'text.zip')
-        @zip_data  = File.open(@file_name, 'rb') { |f| f.read }
-        @data      = Zip::File.open(@file_name) { |zip_file| zip_file.first.get_input_stream.read }
-      end
+class ZipReaderTest < Minitest::Test
+  describe IOStreams::Zip::Reader do
+    let :file_name do
+      File.join(File.dirname(__FILE__), 'files', 'text.zip')
+    end
 
-      describe '.open' do
-        it 'file' do
-          result = IOStreams::Zip::Reader.open(@file_name) do |io|
-            io.read
-          end
-          assert_equal @data, result
+    let :decompressed do
+      Zip::File.open(file_name) { |zip_file| zip_file.first.get_input_stream.read }
+    end
+
+    describe '.open' do
+      it 'file' do
+        result = IOStreams::Zip::Reader.open(file_name) do |io|
+          io.read
         end
+        assert_equal decompressed, result
+      end
 
-        it 'stream' do
-          result = File.open(@file_name) do |file|
-            IOStreams::Zip::Reader.open(file) do |io|
-              io.read
-            end
+      it 'stream' do
+        result = File.open(file_name) do |file|
+          IOStreams::Zip::Reader.open(file) do |io|
+            io.read
           end
-          assert_equal @data, result
         end
+        assert_equal decompressed, result
       end
-
     end
+
   end
 end

data/test/zip_writer_test.rb

@@ -1,47 +1,51 @@
 require_relative 'test_helper'
 require 'zip'
 
-# Unit Test for IOStreams::Zip
-module Streams
-  class ZipWriterTest < Minitest::Test
-    describe IOStreams::Zip::Writer do
-      before do
-        file_name = File.join(File.dirname(__FILE__), 'files', 'text.txt')
-        @data     = File.read(file_name)
-      end
+class ZipWriterTest < Minitest::Test
+  describe IOStreams::Zip::Writer do
+    let :temp_file do
+      Tempfile.new('iostreams')
+    end
 
-      describe '.open' do
-        it 'file' do
-          temp_file = Tempfile.new('rocket_job')
-          file_name = temp_file.to_path
-          IOStreams::Zip::Writer.open(file_name, zip_file_name: 'text.txt') do |io|
-            io.write(@data)
-          end
-          result = Zip::File.open(file_name) do |zip_file|
-            zip_file.first.get_input_stream.read
-          end
-          temp_file.delete
-          assert_equal @data, result
-        end
+    let :file_name do
+      temp_file.path
+    end
+
+    let :decompressed do
+      File.read(File.join(File.dirname(__FILE__), 'files', 'text.txt'))
+    end
 
-        it 'stream' do
-          io_string = StringIO.new(''.force_encoding('ASCII-8BIT'))
-          IOStreams::Zip::Writer.open(io_string) do |io|
-            io.write(@data)
-          end
-          io     = StringIO.new(io_string.string)
-          result = nil
-          begin
-            zin = ::Zip::InputStream.new(io)
-            zin.get_next_entry
-            result = zin.read
-          ensure
-            zin.close if zin
-          end
-          assert_equal @data, result
+    after do
+      temp_file.delete
+    end
+
+    describe '.open' do
+      it 'file' do
+        IOStreams::Zip::Writer.open(file_name, zip_file_name: 'text.txt') do |io|
+          io.write(decompressed)
+        end
+        result = Zip::File.open(file_name) do |zip_file|
+          zip_file.first.get_input_stream.read
         end
+        assert_equal decompressed, result
       end
 
+      it 'stream' do
+        io_string = StringIO.new(''.b)
+        IOStreams::Zip::Writer.open(io_string) do |io|
+          io.write(decompressed)
+        end
+        io     = StringIO.new(io_string.string)
+        result = nil
+        begin
+          zin = ::Zip::InputStream.new(io)
+          zin.get_next_entry
+          result = zin.read
+        ensure
+          zin.close if zin
+        end
+        assert_equal decompressed, result
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -31,25 +31,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
 - lib/io_streams/bzip2/reader.rb
 - lib/io_streams/bzip2/writer.rb
-- lib/io_streams/csv/reader.rb
-- lib/io_streams/csv/writer.rb
-- lib/io_streams/delimited/reader.rb
-- lib/io_streams/delimited/writer.rb
 - lib/io_streams/file/reader.rb
 - lib/io_streams/file/writer.rb
 - lib/io_streams/gzip/reader.rb
 - lib/io_streams/gzip/writer.rb
 - lib/io_streams/io_streams.rb
+- lib/io_streams/line/reader.rb
+- lib/io_streams/line/writer.rb
 - lib/io_streams/pgp.rb
 - lib/io_streams/pgp/reader.rb
 - lib/io_streams/pgp/writer.rb
+- lib/io_streams/record/reader.rb
+- lib/io_streams/record/writer.rb
+- lib/io_streams/row/reader.rb
+- lib/io_streams/row/writer.rb
+- lib/io_streams/s3.rb
+- lib/io_streams/s3/reader.rb
+- lib/io_streams/s3/writer.rb
 - lib/io_streams/sftp/reader.rb
 - lib/io_streams/sftp/writer.rb
 - lib/io_streams/streams.rb
+- lib/io_streams/tabular.rb
+- lib/io_streams/tabular/errors.rb
+- lib/io_streams/tabular/header.rb
+- lib/io_streams/tabular/parser/array.rb
+- lib/io_streams/tabular/parser/base.rb
+- lib/io_streams/tabular/parser/csv.rb
+- lib/io_streams/tabular/parser/fixed.rb
+- lib/io_streams/tabular/parser/hash.rb
+- lib/io_streams/tabular/parser/json.rb
+- lib/io_streams/tabular/parser/psv.rb
+- lib/io_streams/tabular/utility/csv_row.rb
 - lib/io_streams/version.rb
 - lib/io_streams/xlsx/reader.rb
 - lib/io_streams/zip/reader.rb
@@ -57,14 +74,11 @@ files:
 - lib/iostreams.rb
 - test/bzip2_reader_test.rb
 - test/bzip2_writer_test.rb
-- test/csv_reader_test.rb
-- test/csv_writer_test.rb
-- test/delimited_reader_test.rb
-- test/delimited_writer_test.rb
 - test/file_reader_test.rb
 - test/file_writer_test.rb
 - test/files/spreadsheet.xlsx
 - test/files/test.csv
+- test/files/test.json
 - test/files/text.txt
 - test/files/text.txt.bz2
 - test/files/text.txt.gz
@@ -73,9 +87,16 @@ files:
 - test/gzip_reader_test.rb
 - test/gzip_writer_test.rb
 - test/io_streams_test.rb
+- test/line_reader_test.rb
+- test/line_writer_test.rb
 - test/pgp_reader_test.rb
 - test/pgp_test.rb
 - test/pgp_writer_test.rb
+- test/record_reader_test.rb
+- test/record_writer_test.rb
+- test/row_reader_test.rb
+- test/row_writer_test.rb
+- test/tabular_test.rb
 - test/test_helper.rb
 - test/xlsx_reader_test.rb
 - test/zip_reader_test.rb
@@ -100,28 +121,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Ruby file streaming. Supports Text, Zip, Gzip, Xlsx, csv, PGP / GPG and Symmetric
-  Encryption.
+summary: Input and Output streaming for Ruby.
 test_files:
 - test/pgp_reader_test.rb
+- test/line_reader_test.rb
 - test/xlsx_reader_test.rb
-- test/csv_writer_test.rb
+- test/row_writer_test.rb
 - test/zip_reader_test.rb
 - test/bzip2_writer_test.rb
 - test/gzip_writer_test.rb
-- test/delimited_writer_test.rb
 - test/file_reader_test.rb
+- test/record_reader_test.rb
 - test/pgp_writer_test.rb
+- test/line_writer_test.rb
+- test/row_reader_test.rb
 - test/bzip2_reader_test.rb
-- test/csv_reader_test.rb
 - test/zip_writer_test.rb
-- test/delimited_reader_test.rb
 - test/files/text.zip
 - test/files/spreadsheet.xlsx
 - test/files/test.csv
+- test/files/test.json
 - test/files/text.txt.bz2
 - test/files/text.txt.gz.zip
 - test/files/text.txt.gz
@@ -129,5 +151,7 @@ test_files:
 - test/gzip_reader_test.rb
 - test/test_helper.rb
 - test/file_writer_test.rb
+- test/tabular_test.rb
 - test/pgp_test.rb
 - test/io_streams_test.rb
+- test/record_writer_test.rb

data/lib/io_streams/csv/reader.rb

@@ -1,21 +0,0 @@
-require 'csv'
-module IOStreams
-  module CSV
-    class Reader
-      # Read from a file or stream
-      def self.open(file_name_or_io, options = Hash.new, &block)
-        unless IOStreams.reader_stream?(file_name_or_io)
-          ::CSV.open(file_name_or_io, options, &block)
-        else
-          begin
-            csv = ::CSV.new(file_name_or_io, options)
-            block.call(csv)
-          ensure
-            csv.close if csv
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/io_streams/csv/writer.rb

@@ -1,20 +0,0 @@
-module IOStreams
-  module CSV
-    class Writer
-      # Write to a file / stream, compressing with GZip
-      def self.open(file_name_or_io, options = {}, &block)
-        unless IOStreams.writer_stream?(file_name_or_io)
-          ::CSV.open(file_name_or_io, 'wb', options, &block)
-        else
-          begin
-            csv = ::CSV.new(file_name_or_io, options)
-            block.call(csv)
-          ensure
-            csv.close if csv
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/io_streams/delimited/writer.rb

@@ -1,67 +0,0 @@
-module IOStreams
-  module Delimited
-    class Writer
-      attr_accessor :delimiter
-
-      # Write delimited records/lines to a file or stream
-      def self.open(file_name_or_io, delimiter: $/, encoding: UTF8_ENCODING, strip_non_printable: false)
-        if IOStreams.writer_stream?(file_name_or_io)
-          yield new(file_name_or_io, delimiter: delimiter, encoding: encoding, strip_non_printable: strip_non_printable)
-        else
-          ::File.open(file_name_or_io, 'wb') do |io|
-            yield new(io, delimiter: delimiter, encoding: encoding, strip_non_printable: strip_non_printable)
-          end
-        end
-      end
-
-      NOT_PRINTABLE = Regexp.compile(/[^[:print:]]/)
-
-      # A delimited stream writer that will write to the supplied output stream
-      #
-      # The output stream should be binary with no text conversions performed
-      # since `strip_non_printable` will be applied to the binary stream before
-      # converting to UTF-8
-      #
-      # Parameters
-      #   output_stream
-      #     The output stream that implements #write
-      #
-      #   delimiter: [String]
-      #     Add the specified delimiter after every record when writing it
-      #     to the output stream
-      #     Default: OS Specific. Linux: "\n"
-      #
-      #   encoding:
-      #     Force encoding to this encoding for all data being read
-      #     Default: UTF8_ENCODING
-      #     Set to nil to disable encoding
-      #
-      #   strip_non_printable: [true|false]
-      #     Strip all non-printable characters read from the file
-      #     Default: false
-      def initialize(output_stream, delimiter: $/, encoding: UTF8_ENCODING, strip_non_printable: false)
-        @output_stream       = output_stream
-        @delimiter           = delimiter.dup
-        @encoding            = encoding
-        @strip_non_printable = strip_non_printable
-        @delimiter.force_encoding(UTF8_ENCODING) if @delimiter
-      end
-
-      # Write a record or line to the output stream
-      def <<(record)
-        chunk = record.to_s
-        # Strip out non-printable characters before converting to UTF-8
-        chunk = chunk.gsub(NOT_PRINTABLE, '') if @strip_non_printable
-        @output_stream.write((@encoding ? chunk.force_encoding(@encoding) : chunk))
-        @output_stream.write(@delimiter)
-      end
-
-      # Write the given string to the underlying stream
-      # Note: Use of this method not recommended
-      def write(string)
-        @output_stream.write(string)
-      end
-
-    end
-  end
-end