iostreams 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17b7f95e61b93d4e1e69390deaa85511c3765fc
-  data.tar.gz: 29b174a1959de6a887040c89af1f63a072807f7b
+  metadata.gz: 48ec90a51a7475ae218a9758190fe4916d3af4a6
+  data.tar.gz: 6d5d33b93ab5b17884fdd79ae8e7d00adbe8adc9
 SHA512:
-  metadata.gz: b2edf62d725b21fcb292ffbb025113462083a1f6156097e496c2d67e7a2cf77f10cb482b8094b431a5521577a29bb37bb19466e068acc6f1286f55a5e846acd9
-  data.tar.gz: 7bb62d42bb61a520132188d9f8304b1eb1923bf7b7d9b119b675a0c8cb980884b24818011e805d57a82532e6c13ab32f3a4593a03fa7ff82103b59cb5381569c
+  metadata.gz: 99d8654a734acc8af11acaaba49c61904f71d055695279ebb912d0501c20ad812e8e8ba1a906f84586e8c72e67dcae590922fb5d9df100487e1c87ac72d533f7
+  data.tar.gz: 708bcf9a33706391aa38a3314e668149bd14c86964dd235281c1ec512f4ac1ff11a80a232ba996789d7d04dae08cf70541637837965ec10ac92b8152f8b87539

data/lib/io_streams/csv/reader.rb

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,20 @@
+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/reader.rb

@@ -5,7 +5,7 @@ module IOStreams
 
       # Read from a file or stream
       def self.open(file_name_or_io, options={}, &block)
-        if file_name_or_io.respond_to?(:read)
+        if IOStreams.reader_stream?(file_name_or_io)
           block.call(new(file_name_or_io, options))
         else
           ::File.open(file_name_or_io, 'rb') do |io|
@@ -25,16 +25,14 @@ module IOStreams
       #     The input stream that implements #read
       #
       #   options
-      #     :delimiter[Symbol|String]
+      #     :delimiter[String]
       #       Line / Record delimiter to use to break the stream up into records
-      #         nil
-      #           Automatically detect line endings and break up by line
-      #           Searches for the first "\r\n" or "\n" and then uses that as the
-      #           delimiter for all subsequent records
-      #         String:
-      #           Any string to break the stream up by
-      #           The records when saved will not include this delimiter
+      #         Any string to break the stream up by
+      #         The records when saved will not include this delimiter
       #       Default: nil
+      #         Automatically detect line endings and break up by line
+      #         Searches for the first "\r\n" or "\n" and then uses that as the
+      #         delimiter for all subsequent records
       #
       #     :buffer_size [Integer]
       #       Maximum size of the buffer into which to read the stream into for
@@ -44,7 +42,7 @@ module IOStreams
       #
       #     :strip_non_printable [true|false]
       #       Strip all non-printable characters read from the file
-      #       Default: true iff :encoding is UTF8_ENCODING, otherwise false
+      #       Default: false
       #
       #     :encoding
       #       Force encoding to this encoding for all data being read
@@ -65,7 +63,7 @@ module IOStreams
       end
 
       # Returns each line at a time to to the supplied block
-      def each_line(&block)
+      def each(&block)
         partial = nil
         loop do
           if read_chunk == 0
@@ -89,9 +87,29 @@ module IOStreams
         end
       end
 
+      alias_method :each_line, :each
+
+      # Reads length bytes from the I/O stream.
+      # Not recommended, but available if someone calls #read on this delimited reader
+      def read(length = nil, outbuf = nil)
+        if length
+          while (@buffer.size < length) && (read_chunk > 0)
+          end
+          data = @buffer.slice!(0, length)
+          outbuf << data if outbuf
+          data
+        else
+          while read_chunk > 0
+          end
+          @buffer
+        end
+      end
+
       ##########################################################################
       private
 
+      NOT_PRINTABLE = Regexp.compile(/[^[:print:]|\r|\n]/)
+
       # Returns [Integer] the number of bytes read into the internal buffer
       # Returns 0 on EOF
       def read_chunk
@@ -100,7 +118,7 @@ module IOStreams
         return 0 unless chunk
 
         # Strip out non-printable characters before converting to UTF-8
-        chunk = chunk.scan(/[[:print:]]|\r|\n/).join if @strip_non_printable
+        chunk.gsub!(NOT_PRINTABLE, '') if @strip_non_printable
 
         @buffer << (@encoding ? chunk.force_encoding(@encoding) : chunk)
         chunk.size

data/lib/io_streams/delimited/writer.rb

@@ -0,0 +1,71 @@
+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, options={}, &block)
+        if IOStreams.writer_stream?(file_name_or_io)
+          block.call(new(file_name_or_io, options))
+        else
+          ::File.open(file_name_or_io, 'wb') do |io|
+            block.call(new(io, options))
+          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
+      #
+      #   options
+      #     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, options={})
+        @output_stream       = output_stream
+        options              = options.dup
+        @delimiter           = options.has_key?(:delimiter) ? options.delete(:delimiter) : $/.dup
+        @encoding            = options.has_key?(:encoding) ? options.delete(:encoding) : UTF8_ENCODING
+        @strip_non_printable = options.delete(:strip_non_printable)
+        @strip_non_printable = @strip_non_printable.nil? && (@encoding == UTF8_ENCODING)
+        raise ArgumentError.new("Unknown IOStreams::Delimited::Writer#initialize options: #{options.inspect}") if options.size > 0
+        @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

data/lib/io_streams/file/reader.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Reader
       # Read from a file or stream
       def self.open(file_name_or_io, _=nil, &block)
-        unless file_name_or_io.respond_to?(:read)
+        unless IOStreams.reader_stream?(file_name_or_io)
           ::File.open(file_name_or_io, 'rb', &block)
         else
           block.call(file_name_or_io)
@@ -12,4 +12,4 @@ module IOStreams
 
     end
   end
-end
+end

data/lib/io_streams/file/writer.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Writer
       # Write to a file or stream
       def self.open(file_name_or_io, _=nil, &block)
-        unless file_name_or_io.respond_to?(:write)
+        unless IOStreams.writer_stream?(file_name_or_io)
           ::File.open(file_name_or_io, 'wb', &block)
         else
           block.call(file_name_or_io)
@@ -12,4 +12,4 @@ module IOStreams
 
     end
   end
-end
+end

data/lib/io_streams/gzip/reader.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Reader
       # Read from a gzip file or stream, decompressing the contents as it is read
       def self.open(file_name_or_io, _=nil, &block)
-        unless file_name_or_io.respond_to?(:read)
+        unless IOStreams.reader_stream?(file_name_or_io)
           ::Zlib::GzipReader.open(file_name_or_io, &block)
         else
           begin
@@ -17,4 +17,4 @@ module IOStreams
 
     end
   end
-end
+end

data/lib/io_streams/gzip/writer.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Writer
       # Write to a file / stream, compressing with GZip
       def self.open(file_name_or_io, _=nil, &block)
-        unless file_name_or_io.respond_to?(:write)
+        unless IOStreams.writer_stream?(file_name_or_io)
           Zlib::GzipWriter.open(file_name_or_io, &block)
         else
           begin
@@ -17,4 +17,4 @@ module IOStreams
 
     end
   end
-end
+end

data/lib/io_streams/io_streams.rb

@@ -1,7 +1,7 @@
-require 'thread_safe'
+require 'concurrent'
 module IOStreams
   # A registry to hold formats for processing files during upload or download
-  @@extensions = ThreadSafe::Hash.new
+  @@extensions = Concurrent::Hash.new
 
   UTF8_ENCODING   = Encoding.find('UTF-8').freeze
   BINARY_ENCODING = Encoding.find('BINARY').freeze
@@ -110,7 +110,7 @@ module IOStreams
   #   IOStreams.reader('myfile.csv.enc', [:enc]) do |stream|
   #     puts stream.read
   #   end
-  def self.reader(file_name_or_io, streams=nil, &block)
+  def self.reader(file_name_or_io, streams = nil, &block)
     stream(:reader, file_name_or_io, streams, &block)
   end
 
@@ -162,7 +162,7 @@ module IOStreams
   #   IOStreams.writer('myfile.csv.zip', zip: { zip_file_name: 'myfile.csv' }) do |stream|
   #     stream.write(data)
   #   end
-  def self.writer(file_name_or_io, streams=nil, &block)
+  def self.writer(file_name_or_io, streams = nil, &block)
     stream(:writer, file_name_or_io, streams, &block)
   end
 
@@ -185,6 +185,42 @@ module IOStreams
     bytes
   end
 
+  # Returns [true|false] whether the supplied file_name_or_io is a reader stream
+  def self.reader_stream?(file_name_or_io)
+    file_name_or_io.respond_to?(:read)
+  end
+
+  # Returns [true|false] whether the supplied file_name_or_io is a reader stream
+  def self.writer_stream?(file_name_or_io)
+    file_name_or_io.respond_to?(:write)
+  end
+
+  # Returns [true|false] whether the file is compressed
+  # Note: Currently only looks at the file name extension
+  def self.compressed?(file_name)
+    !(file_name =~ /\.(zip|gz|gzip|xls.|)\z/i).nil?
+  end
+
+  # Deletes the specified stream from the supplied streams if present
+  # Returns deleted stream, or nil if not found
+  def self.delete_stream(stream, streams)
+    raise(ArgumentError, "Argument :stream must be a symbol: #{stream.inspect}") unless stream.is_a?(Symbol)
+
+    Array(streams).delete_if do |_stream|
+      stream_key = _stream.is_a?(Symbol) ? _stream : _stream.keys.first
+      stream == stream_key
+    end
+  end
+
+  # Returns [true|false] whether the stream starts with a delimited reader or writer
+  def self.delimited_stream?(streams)
+    stream = Array(streams).first
+    return false unless stream
+
+    # TODO Need to figure out a way so that this is not hard-coded
+    [:xlsx, :xlsm, :delimited].include?(stream.is_a?(Symbol) ? stream : stream.keys.first)
+  end
+
   ##########################################################################
   private
 
@@ -192,7 +228,7 @@ module IOStreams
   StreamStruct = Struct.new(:klass, :options)
 
   # Returns a reader or writer stream
-  def self.stream(type, file_name_or_io, streams=nil, &block)
+  def self.stream(type, file_name_or_io, streams = nil, &block)
     unless streams
       respond_to = type == :reader ? :read : :write
       streams    = file_name_or_io.respond_to?(respond_to) ? [:file] : streams_for_file_name(file_name_or_io)
@@ -239,9 +275,13 @@ module IOStreams
 
   # Register File extensions
   # @formatter:off
-  register_extension(:enc,  SymmetricEncryption::Reader, SymmetricEncryption::Writer) if defined?(SymmetricEncryption)
-  register_extension(:file, IOStreams::File::Reader,         IOStreams::File::Writer)
-  register_extension(:gz,   IOStreams::Gzip::Reader,         IOStreams::Gzip::Writer)
-  register_extension(:gzip, IOStreams::Gzip::Reader,         IOStreams::Gzip::Writer)
-  register_extension(:zip,  IOStreams::Zip::Reader,          IOStreams::Zip::Writer)
+  register_extension(:enc,       SymmetricEncryption::Reader,  SymmetricEncryption::Writer) if defined?(SymmetricEncryption)
+  register_extension(:file,      IOStreams::File::Reader,      IOStreams::File::Writer)
+  register_extension(:gz,        IOStreams::Gzip::Reader,      IOStreams::Gzip::Writer)
+  register_extension(:gzip,      IOStreams::Gzip::Reader,      IOStreams::Gzip::Writer)
+  register_extension(:zip,       IOStreams::Zip::Reader,       IOStreams::Zip::Writer)
+  register_extension(:delimited, IOStreams::Delimited::Reader, IOStreams::Delimited::Writer)
+  register_extension(:xlsx,      IOStreams::Xlsx::Reader,      nil)
+  register_extension(:xlsm,      IOStreams::Xlsx::Reader,      nil)
+  #register_extension(:csv,       IOStreams::CSV::Reader,       IOStreams::CSV::Writer)
 end

data/lib/io_streams/streams.rb

@@ -0,0 +1,109 @@
+module IOStreams
+  # Contains behavior for streams
+  #
+  # When a file is being read the streams are processed from right to left.
+  # When writing a file streams are processed left to right.
+  # For example:
+  #   file.gz.enc ==> [:gz, :enc]
+  #     Read:  Unencrypt, then Gunzip
+  #     Write: GZip, then Encrypt
+  class Streams
+
+    # Returns [Streams] collection of streams to process against the file
+    #
+    def self.streams_for_file_name(file_name)
+
+    end
+
+    # Create a processing stream given:
+    # - No stream. Defaults to :file
+    # - A single String implies a file_name and the streams will be created based on the file_name
+    # - One or more symbols or hashes for a stream
+    # - One or more arrays for streams
+    def initialize(*args)
+      if args.size == 0
+        @streams = [:file]
+      elsif args.size == 1
+        stream = args.first
+        if stream
+          @stream = stream.is_a?(String) ? streams_for_file_name(stream) : Array(stream)
+        else
+          @streams = [:file]
+        end
+      else
+        @streams = streams
+      end
+      @streams.flatten!
+    end
+
+    def delimited?
+
+    end
+
+    def delete(stream)
+
+    end
+
+    # Add another stream for processing
+    def <<(stream)
+
+    end
+
+    # Add a stream for processing
+    def unshift(stream)
+
+    end
+
+    private
+
+    # Return the Stream klass for the specified hash or symbol
+    # Parameters
+    #   stream [Hash|Symbol]
+    def stream_for(stream)
+      if stream.is_a?(Symbol)
+        registered_klass(stream, {})
+      else
+        registered_klass(@stream.first)
+      end
+    end
+
+    # Returns [Array] the formats required to process the file by looking at
+    # its extension(s)
+    #
+    # Extensions supported:
+    #   .zip       Zip File                                   [ :zip ]
+    #   .gz, .gzip GZip File                                  [ :gzip ]
+    #   .enc       File Encrypted using symmetric encryption  [ :enc ]
+    #   other      All other extensions will be returned as:  [ :file ]
+    #
+    # When a file is encrypted, it may also be compressed:
+    #   .zip.enc  [ :zip, :enc ]
+    #   .gz.enc   [ :gz,  :enc ]
+    #
+    # Example Zip file:
+    #   RocketJob::Formatter::Formats.streams_for_file_name('myfile.zip')
+    #   => [ :zip ]
+    #
+    # Example Encrypted Gzip file:
+    #   RocketJob::Formatter::Formats.streams_for_file_name('myfile.csv.gz.enc')
+    #   => [ :gz, :enc ]
+    #
+    # Example plain text / binary file:
+    #   RocketJob::Formatter::Formats.streams_for_file_name('myfile.csv')
+    #   => [ :file ]
+    def streams_for_file_name(file_name)
+      raise ArgumentError.new("RocketJob Cannot detect file format when uploading to stream: #{file_name.inspect}") if file_name.respond_to?(:read)
+
+      parts      = file_name.split('.')
+      extensions = []
+      while extension = parts.pop
+        break unless @@extensions[extension.to_sym]
+        extensions.unshift(extension.to_sym)
+      end
+      extensions << :file if extensions.size == 0
+      extensions
+    end
+
+
+  end
+end

data/lib/io_streams/version.rb

@@ -1,3 +1,3 @@
 module IOStreams #:nodoc
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/lib/io_streams/xlsx/reader.rb

@@ -1,9 +1,3 @@
-begin
-  require 'creek'
-rescue LoadError => e
-  puts "Install the 'creek' gem for xlsx streaming support"
-  raise(e)
-end
 require 'csv'
 
 module IOStreams
@@ -11,17 +5,7 @@ module IOStreams
     class Reader
       attr_reader :worksheet
 
-      def initialize(workbook)
-        @worksheet = workbook.sheets[0]
-      end
-
-      def each_line(&block)
-        worksheet.rows.each do |row|
-          block.call(row.values.to_csv(row_sep: nil))
-        end
-      end
-
-      # Read from a xlsx file or stream.
+      # Read from a xlsx, or xlsm file or stream.
       #
       # Example:
       #   IOStreams::Xlsx::Reader.open('spreadsheet.xlsx') do |spreadsheet_stream|
@@ -30,11 +14,17 @@ module IOStreams
       #     end
       #   end
       def self.open(file_name_or_io, options={}, &block)
+        begin
+          require 'creek' unless defined?(Creek::Book)
+        rescue LoadError => e
+          raise(LoadError, "Please install the 'creek' gem for xlsx streaming support. #{e.message}")
+        end
+
         options     = options.dup
         buffer_size = options.delete(:buffer_size) || 65536
         raise(ArgumentError, "Unknown IOStreams::Xlsx::Reader option: #{options.inspect}") if options.size > 0
 
-        if file_name_or_io.respond_to?(:read)
+        if IOStreams.reader_stream?(file_name_or_io)
           temp_file = Tempfile.new('rocket_job_xlsx')
           file_name = temp_file.to_path
 
@@ -50,6 +40,17 @@ module IOStreams
         temp_file.delete if temp_file
       end
 
+      def initialize(workbook)
+        @worksheet = workbook.sheets[0]
+      end
+
+      # Returns each [Array] row from the spreadsheet
+      def each(&block)
+        worksheet.rows.each { |row| block.call(row.values) }
+      end
+
+      alias_method :each_line, :each
+
     end
   end
 end

data/lib/io_streams/zip/reader.rb

@@ -18,7 +18,7 @@ module IOStreams
         raise(ArgumentError, "Unknown IOStreams::Zip::Reader option: #{options.inspect}") if options.size > 0
 
         # File name supplied
-        return read_file(file_name_or_io, &block) unless file_name_or_io.respond_to?(:read)
+        return read_file(file_name_or_io, &block) unless IOStreams.reader_stream?(file_name_or_io)
 
         # Stream supplied
         begin

data/lib/io_streams/zip/writer.rb

@@ -4,10 +4,11 @@ module IOStreams
       # Write a single file in Zip format to the supplied output file name
       #
       # Parameters
-      #   zip_file_name [String]
+      #   file_name_or_io [String]
       #     Full path and filename for the output zip file
       #
-      #   file_name [String]
+      # Options
+      #   :file_name [String]
       #     Name of the file within the Zip Stream
       #
       # The stream supplied to the block only responds to #write
@@ -23,7 +24,7 @@ module IOStreams
       #   is automatically created under the covers
       def self.open(file_name_or_io, options={}, &block)
         options       = options.dup
-        zip_file_name = options.delete(:zip_file_name)
+        zip_file_name = options.delete(:file_name) || options.delete(:zip_file_name)
         buffer_size   = options.delete(:buffer_size) || 65536
         raise(ArgumentError, "Unknown IOStreams::Zip::Writer option: #{options.inspect}") if options.size > 0
 
@@ -32,7 +33,7 @@ module IOStreams
         zip_file_name ||= 'file'
 
         # File name supplied
-        return write_file(file_name_or_io, zip_file_name, &block) unless file_name_or_io.respond_to?(:write)
+        return write_file(file_name_or_io, zip_file_name, &block) unless IOStreams.writer_stream?(file_name_or_io)
 
         # Stream supplied
         begin
@@ -83,4 +84,4 @@ module IOStreams
 
     end
   end
-end
+end

data/lib/iostreams.rb

@@ -1,5 +1,9 @@
 require 'io_streams/version'
 module IOStreams
+  module CSV
+    autoload :Reader, 'io_streams/csv/reader'
+    autoload :Writer, 'io_streams/csv/writer'
+  end
   module File
     autoload :Reader, 'io_streams/file/reader'
     autoload :Writer, 'io_streams/file/writer'

data/test/csv_reader_test.rb

@@ -0,0 +1,34 @@
+require_relative 'test_helper'
+
+# Unit Test for IOStreams::File
+module Streams
+  class CSVReaderTest < Minitest::Test
+    describe IOStreams::CSV::Reader do
+      before do
+        @file_name = File.join(File.dirname(__FILE__), 'files', 'test.csv')
+        @data      = CSV.read(@file_name)
+      end
+
+      describe '.open' do
+        it 'file' do
+          rows = []
+          IOStreams::CSV::Reader.open(@file_name) do |io|
+            io.each { |row| rows << row }
+          end
+          assert_equal @data, rows
+        end
+
+        it 'stream' do
+          rows = []
+          File.open(@file_name) do |file|
+            IOStreams::CSV::Reader.open(file) do |io|
+              io.each { |row| rows << row }
+            end
+          end
+          assert_equal @data, rows
+        end
+      end
+
+    end
+  end
+end

data/test/csv_writer_test.rb

@@ -0,0 +1,35 @@
+require_relative 'test_helper'
+require 'csv'
+
+module Streams
+  class CSVWriterTest < Minitest::Test
+    describe IOStreams::CSV::Writer do
+      before do
+        @file_name    = File.join(File.dirname(__FILE__), 'files', 'test.csv')
+        @data         = ::CSV.read(@file_name)
+        @raw_csv_data = ::File.read(@file_name)
+      end
+
+      describe '.open' do
+        it 'file' do
+          temp_file = Tempfile.new('rocket_job')
+          file_name = temp_file.to_path
+          IOStreams::CSV::Writer.open(file_name) do |io|
+            @data.each { |row| io << row }
+          end
+          result = File.read(file_name)
+          assert_equal @raw_csv_data, result
+        end
+
+        it 'stream' do
+          io_string = StringIO.new
+          IOStreams::CSV::Writer.open(io_string) do |io|
+            @data.each { |row| io << row }
+          end
+          assert_equal @raw_csv_data, io_string.string
+        end
+      end
+
+    end
+  end
+end

data/test/delimited_reader_test.rb

@@ -3,7 +3,7 @@ require_relative 'test_helper'
 # Unit Test for IOStreams::File
 module Streams
   class DelimitedReaderTest < Minitest::Test
-    describe IOStreams::File::Reader do
+    describe IOStreams::Delimited::Reader do
       before do
         @file_name = File.join(File.dirname(__FILE__), 'files', 'text.txt')
         @data      = []
@@ -14,11 +14,11 @@ module Streams
         end
       end
 
-      describe '.open' do
+      describe '#each' do
         it 'each_line file' do
           lines = []
           IOStreams::Delimited::Reader.open(@file_name) do |io|
-            io.each_line { |line| lines << line }
+            io.each { |line| lines << line }
           end
           assert_equal @data, lines
         end
@@ -27,7 +27,7 @@ module Streams
           lines = []
           File.open(@file_name) do |file|
             IOStreams::Delimited::Reader.open(file) do |io|
-              io.each_line { |line| lines << line }
+              io.each { |line| lines << line }
             end
           end
           assert_equal @data, lines
@@ -38,34 +38,44 @@ module Streams
             lines  = []
             stream = StringIO.new(@data.join(delimiter))
             IOStreams::Delimited::Reader.open(stream, buffer_size: 15) do |io|
-              io.each_line { |line| lines << line }
+              io.each { |line| lines << line }
             end
             assert_equal @data, lines
           end
         end
 
         ['@', 'BLAH'].each do |delimiter|
-          it "read delimited #{delimiter.inspect}" do
+          it "reads delimited #{delimiter.inspect}" do
             lines  = []
             stream = StringIO.new(@data.join(delimiter))
             IOStreams::Delimited::Reader.open(stream, buffer_size: 15, delimiter: delimiter) do |io|
-              io.each_line { |line| lines << line }
+              io.each { |line| lines << line }
             end
             assert_equal @data, lines
           end
         end
 
-        it "read binary delimited" do
+        it 'reads binary delimited' do
           delimiter = "\x01"
           lines     = []
           stream    = StringIO.new(@data.join(delimiter))
           IOStreams::Delimited::Reader.open(stream, buffer_size: 15, delimiter: delimiter, encoding: IOStreams::BINARY_ENCODING) do |io|
-            io.each_line { |line| lines << line }
+            io.each { |line| lines << line }
           end
           assert_equal @data, lines
         end
       end
 
+      describe '.read' do
+        it 'reads without delimiter' do
+          result = IOStreams::Delimited::Reader.open(@file_name) do |io|
+            io.read
+          end
+          file = File.read(@file_name)
+          assert_equal file, result
+        end
+      end
+
     end
   end
 end

data/test/delimited_writer_test.rb

@@ -0,0 +1,44 @@
+require_relative 'test_helper'
+
+module Streams
+  class DelimitedWriterTest < Minitest::Test
+    describe IOStreams::Delimited::Writer do
+      before do
+        @file_name = File.join(File.dirname(__FILE__), 'files', 'text.txt')
+        @file      = File.read(@file_name)
+        @data      = @file.lines
+      end
+
+      describe '#<<' do
+        it 'file' do
+          temp_file = Tempfile.new('rocket_job')
+          file_name = temp_file.to_path
+          IOStreams::Delimited::Writer.open(file_name) do |io|
+            @data.each { |line| io << line.strip }
+          end
+          result = File.read(file_name)
+          assert_equal @file, result
+        end
+
+        it 'stream' do
+          io_string = StringIO.new
+          IOStreams::Delimited::Writer.open(io_string) do |io|
+            @data.each { |line| io << line.strip }
+          end
+          assert_equal @file, io_string.string
+        end
+      end
+
+      describe '.write' do
+        it 'writes without delimiter' do
+          io_string = StringIO.new
+          IOStreams::File::Writer.open(io_string) do |io|
+            io.write(@file)
+          end
+          assert_equal @file, io_string.string
+        end
+      end
+
+    end
+  end
+end

data/test/file_reader_test.rb

@@ -16,6 +16,7 @@ module Streams
           end
           assert_equal @data, result
         end
+
         it 'stream' do
           result = File.open(@file_name) do |file|
             IOStreams::File::Reader.open(file) do |io|

data/test/file_writer_test.rb

@@ -19,6 +19,7 @@ module Streams
           result = File.read(file_name)
           assert_equal @data, result
         end
+
         it 'stream' do
           io_string = StringIO.new
           IOStreams::File::Writer.open(io_string) do |io|

data/test/files/test.csv

@@ -0,0 +1,4 @@
+name, address, state, zip
+Joe Black, 23 Where Rd, FL, 12452
+Who is this, 42 Able Rd, GA, 23432
+Another's Person, 42 and 2nd St, NY, 17449

data/test/gzip_reader_test.rb

@@ -17,6 +17,7 @@ module Streams
           end
           assert_equal @data, result
         end
+
         it 'stream' do
           result = File.open(@file_name) do |file|
             IOStreams::Gzip::Reader.open(file) do |io|

data/test/gzip_writer_test.rb

@@ -20,6 +20,7 @@ module Streams
           temp_file.delete
           assert_equal @data, result
         end
+
         it 'stream' do
           io_string = StringIO.new(''.force_encoding('ASCII-8BIT'))
           IOStreams::Gzip::Writer.open(io_string) do |io|

data/test/xlsx_reader_test.rb

@@ -2,10 +2,12 @@ require_relative 'test_helper'
 
 module Streams
   describe IOStreams::Xlsx::Reader do
-    XLSX_CONTENTS = [
-      "first column,second column,third column",
-      "data 1,data 2,more data",
-    ]
+    before do
+      @xlsx_contents = [
+        ['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') }
@@ -18,9 +20,9 @@ module Streams
         it 'returns the contents of the file' do
           rows = []
           IOStreams::Xlsx::Reader.open(@file) do |spreadsheet|
-            spreadsheet.each_line { |row| rows << row }
+            spreadsheet.each { |row| rows << row }
           end
-          assert_equal(XLSX_CONTENTS, rows)
+          assert_equal(@xlsx_contents, rows)
         end
       end
 
@@ -30,11 +32,11 @@ module Streams
           rows = []
           File.open(file_name) do |file|
             IOStreams::Xlsx::Reader.open(file) do |spreadsheet|
-              spreadsheet.each_line { |row| rows << row }
+              spreadsheet.each { |row| rows << row }
             end
           end
 
-          assert_equal(XLSX_CONTENTS, rows)
+          assert_equal(@xlsx_contents, rows)
         end
       end
     end

data/test/zip_reader_test.rb

@@ -18,6 +18,7 @@ module Streams
           end
           assert_equal @data, result
         end
+
         it 'stream' do
           result = File.open(@file_name) do |file|
             IOStreams::Zip::Reader.open(file) do |io|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symmetric-encryption
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -47,21 +47,29 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- 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/streams.rb
 - lib/io_streams/version.rb
 - lib/io_streams/xlsx/reader.rb
 - lib/io_streams/zip/reader.rb
 - lib/io_streams/zip/writer.rb
 - lib/iostreams.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/text.txt
 - test/files/text.txt.gz
 - test/files/text.txt.gz.zip
@@ -97,10 +105,14 @@ signing_key:
 specification_version: 4
 summary: Ruby Input and Output streaming with support for Zip, Gzip, and Encryption.
 test_files:
+- 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/text.txt
 - test/files/text.txt.gz
 - test/files/text.txt.gz.zip
@@ -111,4 +123,3 @@ test_files:
 - test/xlsx_reader_test.rb
 - test/zip_reader_test.rb
 - test/zip_writer_test.rb
-has_rdoc: true