iostreams 1.0.0.beta → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158fef0e14167719cd27b7b1cb0445bfb08403a3afc4490fad74a0e0fc9ab67b
-  data.tar.gz: b1f3db75a4773591507706befa66122204ffda1642136c79427671a4bf240605
+  metadata.gz: 4469de3d596bf7fd0485de78878ad8188c0a60c8a3b52cfbd2dcd207ec4e8e92
+  data.tar.gz: 25e2e16fa02f1d8b964cd8bdb521576a106148fd6446ebddf832735e5006d403
 SHA512:
-  metadata.gz: 556a898a859c9447822cb0d3aeea58ce6d839536d43fe3ef46fdf94fb1794d50d596da713fd6eef4203ef84ed94790ad8d69581d54c6a167bc9cea57e4d6b976
-  data.tar.gz: 7c38374f8ec37252a3b5428472235cf44a3a6379b5190776d766f447f339f16f3f85b69713c77592601466f82eac998c227de8136cecc64f82081e00f540314b
+  metadata.gz: 37456322483004e740a678a46a32bae7dc1fd02d9ad1363a0ce02c95502cb0fb68d07295280193277b5b252b3ae39162a019ba3f85f1483c3e5503011ae68419
+  data.tar.gz: ea9cd84e99f50b7771d7429f78da254b15ffd1b08cb7cadfa4cb7c9033bb3cc6f59064addd3824e4bcf5f1072669268916c16cd2116d7e5b6e822bd34f6f4415

data/lib/io_streams/encode/reader.rb

@@ -7,7 +7,9 @@ module IOStreams
       # Builtin strip options to apply after encoding the read data.
       CLEANSE_RULES = {
         # Strips all non printable characters
-        printable: ->(data) { data.gsub!(NOT_PRINTABLE, '') || data }
+        printable: ->(data, _) { data.gsub!(NOT_PRINTABLE, '') || data },
+        # Replaces non printable characters with the value specified in the `replace` option.
+        replace_non_printable: ->(data, replace) { data.gsub!(NOT_PRINTABLE, replace || '') || data }
       }.freeze
 
       # Read a line at a time from a file or stream
@@ -46,6 +48,7 @@ module IOStreams
         @cleaner          = self.class.extract_cleaner(cleaner)
         @encoding         = encoding.nil? || encoding.is_a?(Encoding) ? encoding : Encoding.find(encoding)
         @encoding_options = replace.nil? ? {} : {invalid: :replace, undef: :replace, replace: replace}
+        @replace          = replace
 
         # More efficient read buffering only supported when the input stream `#read` method supports it.
         if replace.nil? && !@input_stream.method(:read).arity.between?(0, 1)
@@ -75,7 +78,7 @@ module IOStreams
         return unless block
 
         block = block.encode(@encoding, @encoding_options) unless block.encoding == @encoding
-        block = @cleaner.call(block) if @cleaner
+        block = @cleaner.call(block, @replace) if @cleaner
         block
       end
 

data/lib/io_streams/encode/writer.rb

@@ -40,6 +40,7 @@ module IOStreams
         @cleaner          = ::IOStreams::Encode::Reader.send(:extract_cleaner, cleaner)
         @encoding         = encoding.nil? || encoding.is_a?(Encoding) ? encoding : Encoding.find(encoding)
         @encoding_options = replace.nil? ? {} : {invalid: :replace, undef: :replace, replace: replace}
+        @replace          = replace
       end
 
       # Write a line to the output stream
@@ -66,7 +67,7 @@ module IOStreams
 
         data  = data.to_s
         block = data.encoding == @encoding ? data : data.encode(@encoding, @encoding_options)
-        block = @cleaner.call(block) if @cleaner
+        block = @cleaner.call(block, @replace) if @cleaner
         @output_stream.write(block)
       end
     end

data/lib/io_streams/io_streams.rb

@@ -47,13 +47,14 @@ module IOStreams
   # IOStreams.path('blah.zip').stream(:zip).stream(:pgp, passphrase: 'receiver_passphrase').reader(&:read)
   # IOStreams.path('blah.zip').stream(:zip).stream(:encode, encoding: 'BINARY').reader(&:read)
   #
-  def self.path(*elements)
-    return elements.first if (elements.size == 1) && elements.first.is_a?(IOStreams::Path)
+  def self.path(*elements, **args)
+    return elements.first if (elements.size == 1) && args.empty? && elements.first.is_a?(IOStreams::Path)
 
-    elements = elements.collect(&:to_s)
-    path     = ::File.join(*elements)
-    uri      = URI.parse(path)
-    scheme(uri.scheme).new(path)
+    elements         = elements.collect(&:to_s)
+    path             = ::File.join(*elements)
+    extracted_scheme = path.include?("://") ? URI.parse(path).scheme : nil
+    klass            = scheme(extracted_scheme)
+    args.empty? ? klass.new(path) : klass.new(path, **args)
   end
 
   # For an existing IO Stream

data/lib/io_streams/line/reader.rb

@@ -9,9 +9,9 @@ module IOStreams
       LINEFEED_REGEXP = Regexp.compile(/\r\n|\n|\r/).freeze
 
       # Read a line at a time from a stream
-      def self.stream(input_stream, original_file_name: nil, **args, &block)
+      def self.stream(input_stream, original_file_name: nil, **args)
         # Pass-through if already a line reader
-        return block.call(input_stream) if input_stream.is_a?(self.class)
+        return yield(input_stream) if input_stream.is_a?(self.class)
 
         yield new(input_stream, **args)
       end

data/lib/io_streams/line/writer.rb

@@ -4,9 +4,9 @@ module IOStreams
       attr_reader :delimiter
 
       # Write a line at a time to a stream.
-      def self.stream(output_stream, original_file_name: nil, **args, &block)
+      def self.stream(output_stream, **args)
         # Pass-through if already a line writer
-        return block.call(output_stream) if output_stream.is_a?(self.class)
+        return yield(output_stream) if output_stream.is_a?(self.class)
 
         yield new(output_stream, **args)
       end
@@ -24,7 +24,7 @@ module IOStreams
       #     Add the specified delimiter after every record when writing it
       #     to the output stream
       #     Default: OS Specific. Linux: "\n"
-      def initialize(output_stream, delimiter: $/)
+      def initialize(output_stream, delimiter: $/, original_file_name: nil)
         super(output_stream)
         @delimiter = delimiter
       end

data/lib/io_streams/path.rb

@@ -1,6 +1,6 @@
 module IOStreams
   class Path < IOStreams::Stream
-    attr_reader :path
+    attr_accessor :path
 
     def initialize(path)
       raise(ArgumentError, 'Path cannot be nil') if path.nil?
@@ -18,11 +18,11 @@ module IOStreams
 
       elements = elements.collect(&:to_s)
       relative = ::File.join(*elements)
-      if relative.start_with?(path)
-        self.class.new(relative)
-      else
-        self.class.new(::File.join(path, relative))
-      end
+
+      new_path         = dup
+      new_path.streams = nil
+      new_path.path    = relative.start_with?(path) ? relative : ::File.join(path, relative)
+      new_path
     end
 
     def relative?
@@ -103,7 +103,6 @@ module IOStreams
     end
 
     # Returns [IOStreams::Path] the directory for this file.
-    # Returns `nil` if no `file_name` was set.
     #
     # If `path` does not include a directory name then "." is returned.
     #
@@ -114,8 +113,10 @@ module IOStreams
     #   IOStreams.path("test").directory            #=> "."
     #   IOStreams.path(".profile").directory        #=> "."
     def directory
-      file_name = streams.file_name
-      self.class.new(::File.dirname(file_name)) if file_name
+      new_path         = dup
+      new_path.streams = nil
+      new_path.path    = ::File.dirname(path)
+      new_path
     end
 
     # When path is a file, deletes this file.
@@ -166,12 +167,12 @@ module IOStreams
 
     # Paths are sortable by name
     def <=>(other)
-      path <=> other.to_s
+      path <=> other.path
     end
 
     # Compare by path name, ignore streams
     def ==(other)
-      path == other.to_s
+      path == other.path
     end
 
     def inspect

data/lib/io_streams/paths/http.rb

@@ -3,7 +3,7 @@ require 'uri'
 module IOStreams
   module Paths
     class HTTP < IOStreams::Path
-      attr_reader :username, :password, :http_redirect_count
+      attr_reader :username, :password, :http_redirect_count, :url
 
       # Stream to/from a remote file over http(s).
       #
@@ -34,7 +34,12 @@ module IOStreams
         @username            = username || uri.user
         @password            = password || uri.password
         @http_redirect_count = http_redirect_count
-        super(url)
+        @url                 = url
+        super(uri.path)
+      end
+
+      def to_s
+        url
       end
 
       # Read a file using an http get.
@@ -48,7 +53,7 @@ module IOStreams
       # Notes:
       # * Since Net::HTTP download only supports a push stream, the data is streamed into a tempfile first.
       def reader(&block)
-        handle_redirects(path, http_redirect_count, &block)
+        handle_redirects(url, http_redirect_count, &block)
       end
 
       def handle_redirects(uri, http_redirect_count, &block)

data/lib/io_streams/paths/s3.rb

@@ -3,14 +3,14 @@ require "uri"
 module IOStreams
   module Paths
     class S3 < IOStreams::Path
-      attr_reader :bucket_name, :key, :client
+      attr_reader :bucket_name, :client
 
       # Arguments:
       #
       # url: [String]
       #   Prefix must be: `s3://`
       #   followed by bucket name,
-      #   followed by path and file_name (key).
+      #   followed by key.
       #   Examples:
       #     s3://my-bucket-name/file_name.txt
       #     s3://my-bucket-name/some_path/file_name.csv
@@ -62,9 +62,6 @@ module IOStreams
       # @option params [String] :grant_write_acp
       #   Allows grantee to write the ACL for the applicable object.
       #
-      # @option params [required, String] :key
-      #   Object key for which the PUT operation was initiated.
-      #
       # @option params [Hash<String,String>] :metadata
       #   A map of metadata to store with the object in S3.
       #
@@ -134,21 +131,25 @@ module IOStreams
         raise "Invalid URI. Required Format: 's3://<bucket_name>/<key>'" unless uri.scheme == 's3'
 
         @bucket_name = uri.host
-        @key         = uri.path.sub(%r{\A/}, '')
+        key          = uri.path.sub(%r{\A/}, '')
         @client      = client || ::Aws::S3::Client.new
         @options     = args
-        super(url)
+        super(key)
+      end
+
+      def to_s
+        ::File.join("s3://", bucket_name, path)
       end
 
       def delete
-        client.delete_object(bucket: bucket_name, key: key)
+        client.delete_object(bucket: bucket_name, key: path)
         self
       rescue Aws::S3::Errors::NotFound
         self
       end
 
       def exist?
-        client.head_object(bucket: bucket_name, key: key)
+        client.head_object(bucket: bucket_name, key: path)
         true
       rescue Aws::S3::Errors::NotFound
         false
@@ -162,9 +163,9 @@ module IOStreams
         target = IOStreams.new(target_path)
         return super(target) unless target.is_a?(self.class)
 
-        source_name = ::File.join(bucket_name, key)
+        source_name = ::File.join(bucket_name, path)
         # TODO: Does/should it also copy metadata?
-        client.copy_object(bucket: target.bucket_name, key: target.key, copy_source: source_name)
+        client.copy_object(bucket: target.bucket_name, key: target.path, copy_source: source_name)
         delete
         target
       end
@@ -179,7 +180,7 @@ module IOStreams
       end
 
       def size
-        client.head_object(bucket: bucket_name, key: key).content_length
+        client.head_object(bucket: bucket_name, key: path).content_length
       rescue Aws::S3::Errors::NotFound
         nil
       end
@@ -199,7 +200,7 @@ module IOStreams
       # Shortcut method if caller has a filename already with no other streams applied:
       def read_file(file_name)
         ::File.open(file_name, 'wb') do |file|
-          client.get_object(@options.merge(response_target: file, bucket: bucket_name, key: key))
+          client.get_object(@options.merge(response_target: file, bucket: bucket_name, key: path))
         end
       end
 
@@ -226,11 +227,11 @@ module IOStreams
         if ::File.size(file_name) > 5 * 1024 * 1024
           # Use multipart file upload
           s3  = Aws::S3::Resource.new(client: client)
-          obj = s3.bucket(bucket_name).object(key)
+          obj = s3.bucket(bucket_name).object(path)
           obj.upload_file(file_name)
         else
           ::File.open(file_name, 'rb') do |file|
-            client.put_object(@options.merge(bucket: bucket_name, key: key, body: file))
+            client.put_object(@options.merge(bucket: bucket_name, key: path, body: file))
           end
         end
       end

data/lib/io_streams/paths/sftp.rb

@@ -3,12 +3,12 @@ module IOStreams
     class SFTP < IOStreams::Path
       include SemanticLogger::Loggable if defined?(SemanticLogger)
 
-      attr_reader :hostname, :username, :file_name, :create_path, :options
+      attr_reader :hostname, :username, :create_path, :options, :url
 
       # Stream to a remote file over sftp.
       #
-      # file_name: [String]
-      #   Name of file to write to.
+      # url: [String]
+      #   "sftp://<host_name>/<file_name>"
       #
       # username: [String]
       #   Name of user to login with.
@@ -39,7 +39,6 @@ module IOStreams
         raise(ArgumentError, "Invalid URL. Required Format: 'sftp://<host_name>/<file_name>'") unless uri.scheme == 'sftp'
 
         @hostname              = uri.hostname
-        @file_name             = uri.path
         @mkdir                 = false
         @username              = username || uri.user
         @create_path           = create_path
@@ -51,7 +50,11 @@ module IOStreams
         options[:max_pkt_size] = max_pkt_size
         options[:password]     = password || uri.password
         @options               = options
-        super(file_name)
+        super(uri.path)
+      end
+
+      def to_s
+        url
       end
 
       def mkdir
@@ -73,7 +76,7 @@ module IOStreams
       def reader(&block)
         result = nil
         Net::SFTP.start(hostname, username, options) do |sftp|
-          result = sftp.file.open(file_name, 'rb', &block)
+          result = sftp.file.open(path, 'rb', &block)
         end
         result
       end
@@ -89,8 +92,8 @@ module IOStreams
       def writer(&block)
         result = nil
         Net::SFTP.start(hostname, username, options) do |sftp|
-          sftp.session.exec!("mkdir -p '#{::File.dirname(file_name)}'") if create_path
-          result = sftp.file.open(file_name, 'wb', &block)
+          sftp.session.exec!("mkdir -p '#{::File.dirname(path)}'") if create_path
+          result = sftp.file.open(path, 'wb', &block)
         end
         result
       end

data/lib/io_streams/record/reader.rb

@@ -7,9 +7,9 @@ module IOStreams
       # Read a record at a time from a line stream
       # Note:
       # - The supplied stream _must_ already be a line stream, or a stream that responds to :each
-      def self.stream(line_reader, original_file_name: nil, **args, &block)
+      def self.stream(line_reader, original_file_name: nil, **args)
         # Pass-through if already a record reader
-        return block.call(line_reader) if line_reader.is_a?(self.class)
+        return yield(line_reader) if line_reader.is_a?(self.class)
 
         yield new(line_reader, **args)
       end

data/lib/io_streams/record/writer.rb

@@ -9,9 +9,9 @@ module IOStreams
       # Write a record as a Hash at a time to a stream.
       # Note:
       # - The supplied stream _must_ already be a line stream, or a stream that responds to :<<
-      def self.stream(line_writer, original_file_name: nil, **args, &block)
-        # Pass-through if already a row writer
-        return block.call(line_writer) if line_writer.is_a?(self.class)
+      def self.stream(line_writer, original_file_name: nil, **args)
+        # Pass-through if already a record writer
+        return yield(line_writer) if line_writer.is_a?(self.class)
 
         yield new(line_writer, **args)
       end

data/lib/io_streams/row/reader.rb

@@ -5,9 +5,9 @@ module IOStreams
       # Read a line as an Array at a time from a stream.
       # Note:
       # - The supplied stream _must_ already be a line stream, or a stream that responds to :each
-      def self.stream(line_reader, original_file_name: nil, **args, &block)
+      def self.stream(line_reader, original_file_name: nil, **args)
         # Pass-through if already a row reader
-        return block.call(line_reader) if line_reader.is_a?(self.class)
+        return yield(line_reader) if line_reader.is_a?(self.class)
 
         yield new(line_reader, **args)
       end

data/lib/io_streams/row/writer.rb

@@ -14,7 +14,7 @@ module IOStreams
       # - The supplied stream _must_ already be a line stream, or a stream that responds to :<<
       def self.stream(line_writer, original_file_name: nil, **args)
         # Pass-through if already a row writer
-        return block.call(line_writer) if line_writer.is_a?(self.class)
+        return yield(line_writer) if line_writer.is_a?(self.class)
 
         yield new(line_writer, **args)
       end

data/lib/io_streams/stream.rb

@@ -58,50 +58,6 @@ module IOStreams
     end
 
     # Returns a Reader for reading a file / stream
-    #
-    # Parameters
-    #   file_name_or_io [String|IO]
-    #     The file_name of the file to write to, or an IO Stream that implements
-    #     #read.
-    #
-    #   streams [Symbol|Array]
-    #     The formats/streams that be used to convert the data whilst it is
-    #     being read.
-    #     When nil, the file_name will be inspected to try and determine what
-    #     streams should be applied.
-    #     Default: nil
-    #
-    #   file_name [String]
-    #     When `streams` is not supplied, `file_name` can be used for determining the streams
-    #     to apply to read the file/stream.
-    #     This is particularly useful when `file_name_or_io` is a stream, or a temporary file name.
-    #     Default: nil
-    #
-    # Example: Zip
-    #   IOStreams.reader('myfile.zip') do |stream|
-    #     puts stream.read
-    #   end
-    #
-    # Example: Encrypted Zip
-    #   IOStreams.reader('myfile.zip.enc') do |stream|
-    #     puts stream.read
-    #   end
-    #
-    # Example: Explicitly set the streams
-    #   IOStreams.reader('myfile.zip.enc', [:zip, :enc]) do |stream|
-    #     puts stream.read
-    #   end
-    #
-    # Example: Supply custom options
-    #   # Encrypt the file and get Symmetric Encryption to also compress it
-    #   IOStreams.reader('myfile.csv.enc', streams: enc: {compress: true}) do |stream|
-    #     puts stream.read
-    #   end
-    #
-    # Note:
-    # * Passes the file_name_or_io as-is into the block if it is already a reader stream AND
-    #   no streams are passed in.
-    #
     def reader(&block)
       streams.reader(io_stream, &block)
     end
@@ -141,12 +97,12 @@ module IOStreams
     def copy_from(source, convert: true)
       if convert
         stream = IOStreams.new(source)
-        streams.writer(io_stream) do |target|
+        writer do |target|
           stream.reader { |src| IO.copy_stream(src, target) }
         end
       else
         stream = source.is_a?(Stream) ? source.dup : IOStreams.new(source)
-        streams.dup.stream(:none).writer(io_stream) do |target|
+        dup.stream(:none).writer do |target|
           stream.stream(:none).reader { |src| IO.copy_stream(src, target) }
         end
       end
@@ -182,26 +138,6 @@ module IOStreams
     end
 
     # Returns [Hash] of every record in a file or stream with support for headers.
-    #
-    # Reading a delimited stream and converting to tabular form.
-    #
-    # Each record / line is returned one at a time so that very large files
-    # can be read without having to load the entire file into memory.
-    #
-    # Embedded lines (within double quotes) will be skipped if
-    #   1. The file name contains .csv
-    #   2. Or the embedded_within argument is set
-    #
-    # Example: Supply custom options
-    #   IOStreams.each_record(file_name, embedded_within: '"') do |line|
-    #     puts line
-    #   end
-    #
-    # Example:
-    #   file_name = 'customer_data.csv.pgp'
-    #   IOStreams.each_record(file_name) do |hash|
-    #     p hash
-    #   end
     def each_record(**args, &block)
       record_reader(**args) { |record_stream| record_stream.each(&block) }
     end
@@ -229,57 +165,6 @@ module IOStreams
     end
 
     # Returns a Writer for writing to a file / stream
-    #
-    # Parameters
-    #   file_name_or_io [String|IO]
-    #     The file_name of the file to write to, or an IO Stream that implements
-    #     #write.
-    #
-    #   streams [Symbol|Array]
-    #     The formats/streams that be used to convert the data whilst it is
-    #     being written.
-    #     When nil, the file_name will be inspected to try and determine what
-    #     streams should be applied.
-    #     Default: nil
-    #
-    # Stream types / 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
-    #   IOStreams.writer('myfile.zip') do |stream|
-    #     stream.write(data)
-    #   end
-    #
-    # Example: Encrypted Zip
-    #   IOStreams.writer('myfile.zip.enc') do |stream|
-    #     stream.write(data)
-    #   end
-    #
-    # Example: Explicitly set the streams
-    #   IOStreams.writer('myfile.zip.enc', [:zip, :enc]) do |stream|
-    #     stream.write(data)
-    #   end
-    #
-    # Example: Supply custom options
-    #   IOStreams.writer('myfile.csv.enc', [enc: { compress: true }]) do |stream|
-    #     stream.write(data)
-    #   end
-    #
-    # Example: Set internal filename when creating a zip file
-    #   IOStreams.writer('myfile.csv.zip', zip: { zip_file_name: 'myfile.csv' }) do |stream|
-    #     stream.write(data)
-    #   end
-    #
-    # Note:
-    # * Passes the file_name_or_io as-is into the block if it is already a writer stream AND
-    #   no streams are passed in.
     def writer(&block)
       streams.writer(io_stream, &block)
     end
@@ -295,22 +180,32 @@ module IOStreams
       writer { |stream| stream.write(data) }
     end
 
-    def line_writer(**args)
-      writer { |io| yield IOStreams::Line::Writer.new(io, **args) }
+    def line_writer(**args, &block)
+      return block.call(io_stream) if io_stream && io_stream.is_a?(IOStreams::Line::Writer)
+
+      writer { |io| IOStreams::Line::Writer.stream(io, **args, &block) }
     end
 
-    def row_writer(delimiter: $/, **args)
-      line_writer(delimiter: delimiter) { |io| yield IOStreams::Row::Writer.new(io, **args) }
+    def row_writer(delimiter: $/, **args, &block)
+      return block.call(io_stream) if io_stream && io_stream.is_a?(IOStreams::Row::Writer)
+
+      line_writer(delimiter: delimiter) { |io| IOStreams::Row::Writer.stream(io, **args, &block) }
     end
 
-    def record_writer(delimiter: $/, **args)
-      line_writer(delimiter: delimiter) { |io| yield IOStreams::Record::Writer.new(io, **args) }
+    def record_writer(delimiter: $/, **args, &block)
+      return block.call(io_stream) if io_stream && io_stream.is_a?(IOStreams::Record::Writer)
+
+      line_writer(delimiter: delimiter) { |io| IOStreams::Record::Writer.stream(io, **args, &block) }
     end
 
     # Set/get the original file_name
     def file_name(file_name = :none)
-      file_name == :none ? streams.file_name : streams.file_name = file_name
-      self
+      if file_name == :none
+        streams.file_name
+      else
+        streams.file_name = file_name
+        self
+      end
     end
 
     # Set/get the original file_name

data/lib/io_streams/version.rb

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

data/test/stream_test.rb

@@ -97,19 +97,313 @@ class StreamTest < Minitest::Test
     describe '.each_record' do
     end
 
-    describe '.writer' do
-    end
+    describe '#writer' do
+      describe "#write" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream.write("Hello World")
+          end
+          assert_equal "Hello World", io.string
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream.write("He")
+            stream.write("l")
+            stream.write("lo ")
+            stream.write("World")
+          end
+          assert_equal "Hello World", io.string
+        end
+
+        it 'empty blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream.write("")
+            stream.write("He")
+            stream.write("")
+            stream.write("l")
+            stream.write("")
+            stream.write("lo ")
+            stream.write("World")
+            stream.write("")
+          end
+          assert_equal "Hello World", io.string
+        end
+
+        it 'nil blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream.write(nil)
+            stream.write("He")
+            stream.write(nil)
+            stream.write("l")
+            stream.write(nil)
+            stream.write("lo ")
+            stream.write("World")
+            stream.write(nil)
+          end
+          assert_equal "Hello World", io.string
+        end
+      end
+
+      describe "#<<" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream << "Hello World"
+          end
+          assert_equal "Hello World", io.string
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream << "He"
+            stream << "l" << "lo " << "World"
+          end
+          assert_equal "Hello World", io.string
+        end
+
+        it 'empty blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream << ""
+            stream << "He" << "" << "l" << ""
+            stream << "lo " << "World"
+            stream << ""
+          end
+          assert_equal "Hello World", io.string
+        end
 
-    describe '.writer' do
+        it 'nil blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).writer do |stream|
+            stream << nil
+            stream << "He" << nil << "l" << nil
+            stream << "lo " << "World"
+            stream << nil
+          end
+          assert_equal "Hello World", io.string
+        end
+      end
     end
 
-    describe '.line_writer' do
+    describe '#line_writer' do
+      describe "#write" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream.write("Hello World")
+          end
+          assert_equal "Hello World\n", io.string
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream.write("He")
+            stream.write("l")
+            stream.write("lo ")
+            stream.write("World")
+          end
+          assert_equal "He\nl\nlo \nWorld\n", io.string
+        end
+
+        it 'empty blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream.write("")
+            stream.write("He")
+            stream.write("")
+            stream.write("l")
+            stream.write("")
+            stream.write("lo ")
+            stream.write("World")
+            stream.write("")
+          end
+          assert_equal "\nHe\n\nl\n\nlo \nWorld\n\n", io.string, io.string.inspect
+        end
+
+        it 'nil blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream.write(nil)
+            stream.write("He")
+            stream.write(nil)
+            stream.write("l")
+            stream.write(nil)
+            stream.write("lo ")
+            stream.write("World")
+            stream.write(nil)
+          end
+          assert_equal "\nHe\n\nl\n\nlo \nWorld\n\n", io.string, io.string.inspect
+        end
+      end
+
+      describe "#<<" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream << "Hello World"
+          end
+          assert_equal "Hello World\n", io.string
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream << "He"
+            stream << "l" << "lo " << "World"
+          end
+          assert_equal "He\nl\nlo \nWorld\n", io.string
+        end
+
+        it 'empty blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream << ""
+            stream << "He" << "" << "l" << ""
+            stream << "lo " << "World"
+            stream << ""
+          end
+          assert_equal "\nHe\n\nl\n\nlo \nWorld\n\n", io.string
+        end
+
+        it 'nil blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream << nil
+            stream << "He" << nil << "l" << nil
+            stream << "lo " << "World"
+            stream << nil
+          end
+          assert_equal "\nHe\n\nl\n\nlo \nWorld\n\n", io.string
+        end
+      end
+
+      describe "line writers within line writers" do
+        it 'uses existing line writer' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).line_writer do |stream|
+            stream.write("Before")
+            IOStreams::Stream.new(stream).line_writer do |inner|
+              stream.write("Inner")
+              assert_equal inner.object_id, stream.object_id
+            end
+            stream.write("After")
+          end
+          assert_equal "Before\nInner\nAfter\n", io.string, io.string.inspect
+        end
+      end
     end
 
-    describe '.row_writer' do
+    describe '#row_writer' do
+      describe "#write" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).row_writer do |stream|
+            stream << %w[Hello World]
+          end
+          assert_equal "Hello,World\n", io.string
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).row_writer do |stream|
+            stream << %w[He]
+            stream << %w[l lo\  World]
+            stream << ["He", "", "l", ""]
+            stream << ["lo ", "World"]
+          end
+          assert_equal "He\nl,lo ,World\nHe,\"\",l,\"\"\nlo ,World\n", io.string, io.string.inspect
+        end
+
+        it 'empty blocks' do
+          # skip "TODO"
+          io = StringIO.new
+          IOStreams::Stream.new(io).row_writer do |stream|
+            stream << %w[He]
+            stream << []
+            stream << %w[l lo\  World]
+            stream << ["He", "", "l", ""]
+            stream << ["lo ", "World"]
+            stream << []
+          end
+          assert_equal "He\n\nl,lo ,World\nHe,\"\",l,\"\"\nlo ,World\n\n", io.string, io.string.inspect
+        end
+
+        it 'nil values' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).row_writer do |stream|
+            stream << %w[He]
+            stream << %w[l lo\  World]
+            stream << ["He", nil, "l", nil]
+            stream << ["lo ", "World"]
+          end
+          assert_equal "He\nl,lo ,World\nHe,,l,\nlo ,World\n", io.string, io.string.inspect
+        end
+
+        it 'empty leading array' do
+          skip "TODO"
+          io = StringIO.new
+          IOStreams::Stream.new(io).row_writer do |stream|
+            stream << []
+            stream << %w[He]
+            stream << %w[l lo\  World]
+            stream << ["He", "", "l", ""]
+            stream << ["lo ", "World"]
+            stream << []
+          end
+          assert_equal "\nHe\n\nl\n\nlo \nWorld\n\n", io.string, io.string.inspect
+        end
+      end
     end
 
-    describe '.record_writer' do
+    describe '#record_writer' do
+      describe "#write" do
+        it 'one block' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).record_writer do |stream|
+            stream << {first_name: "Jack", last_name: "Johnson"}
+          end
+          assert_equal  "first_name,last_name\nJack,Johnson\n", io.string, io.string.inspect
+        end
+
+        it 'multiple blocks' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).record_writer do |stream|
+            stream << {first_name: "Jack", last_name: "Johnson"}
+            stream << {first_name: "Able", last_name: "Smith"}
+          end
+          assert_equal  "first_name,last_name\nJack,Johnson\nAble,Smith\n", io.string, io.string.inspect
+        end
+
+        it 'empty hashes' do
+          io = StringIO.new
+          IOStreams::Stream.new(io).record_writer do |stream|
+            stream << {first_name: "Jack", last_name: "Johnson"}
+            stream << {} << {first_name: "Able", last_name: "Smith"}
+            stream << {}
+          end
+          assert_equal "first_name,last_name\nJack,Johnson\n\n{:first_name=>\"Able\", :last_name=>\"Smith\"}\n\n", io.string, io.string.inspect
+        end
+
+        it 'nil values' do
+          skip "TODO"
+          io = StringIO.new
+          IOStreams::Stream.new(io).record_writer do |stream|
+            stream << {first_name: "Jack", last_name: "Johnson"}
+            stream << {} << {first_name: "Able", last_name: "Smith"}
+            stream << {first_name: "Able", last_name: nil}
+            stream << {}
+          end
+          assert_equal "first_name,last_name\nJack,Johnson\n\n{:first_name=>\"Able\", :last_name=>\"Smith\"}\n\n", io.string, io.string.inspect
+        end
+
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: