iostreams 0.15.0 → 0.16.0

data/test/tabular_test.rb

@@ -60,7 +60,7 @@ class TabularTest < Minitest::Test
 
         it 'raises exception for columns not in the whitelist' do
           tabular = IOStreams::Tabular.new(columns: ['   first ', 'Unknown Column', 'thirD   '], allowed_columns: @allowed_columns, skip_unknown: false)
-          exc     = assert_raises IOStreams::Tabular::Errors::InvalidHeader do
+          exc     = assert_raises IOStreams::Errors::InvalidHeader do
             tabular.cleanse_header!
           end
           assert_equal 'Unknown columns after cleansing: Unknown Column', exc.message
@@ -69,7 +69,7 @@ class TabularTest < Minitest::Test
         it 'raises exception missing required columns' do
           required = ['first', 'second', 'fifth']
           tabular  = IOStreams::Tabular.new(columns: ['   first ', 'Second', 'thirD   '], allowed_columns: @allowed_columns, required_columns: required)
-          exc      = assert_raises IOStreams::Tabular::Errors::InvalidHeader do
+          exc      = assert_raises IOStreams::Errors::InvalidHeader do
             tabular.cleanse_header!
           end
           assert_equal 'Missing columns after cleansing: fifth', exc.message
@@ -77,7 +77,7 @@ class TabularTest < Minitest::Test
 
         it 'raises exception when no columns left' do
           tabular = IOStreams::Tabular.new(columns: ['one', 'two', 'three'], allowed_columns: @allowed_columns)
-          exc     = assert_raises IOStreams::Tabular::Errors::InvalidHeader do
+          exc     = assert_raises IOStreams::Errors::InvalidHeader do
             tabular.cleanse_header!
           end
           assert_equal 'All columns are unknown after cleansing: one,two,three', exc.message
@@ -135,6 +135,47 @@ class TabularTest < Minitest::Test
         end
       end
 
+      describe ':fixed format' do
+        let :tabular do
+          layout = [
+            {key: 'name', size: 23},
+            {key: 'address', size: 40},
+            {key: 'zip', size: 5}
+          ]
+          IOStreams::Tabular.new(format: :fixed, format_options: {layout: layout})
+        end
+
+        it 'parses to hash' do
+          assert hash = tabular.record_parse('Jack                   over there                              34618')
+          assert_equal({'name' => 'Jack', 'address' => 'over there', 'zip' => '34618'}, hash)
+        end
+
+        it 'parses short string' do
+          # TODO: Raise exception on lines that are too short?
+          assert hash = tabular.record_parse('Jack                   over th')
+          assert_equal({'name' => 'Jack', 'address' => 'over th', 'zip' => ''}, hash)
+        end
+
+        it 'parses longer string' do
+          # TODO: Raise exception on lines that are too long?
+          assert hash = tabular.record_parse('Jack                   over there                              34618........................................')
+          assert_equal({'name' => 'Jack', 'address' => 'over there', 'zip' => '34618'}, hash)
+        end
+
+        it 'parses empty strings' do
+          assert hash = tabular.record_parse('                                                               34618')
+          assert_equal({'name' => '', 'address' => '', 'zip' => '34618'}, hash)
+        end
+
+        it 'parses nil data as nil' do
+          refute tabular.record_parse(nil)
+        end
+
+        it 'parses empty string as nil' do
+          refute tabular.record_parse('')
+        end
+      end
+
       it 'skips columns not in the whitelist' do
         tabular.header.allowed_columns = ['first', 'second', 'third', 'fourth', 'fifth']
         tabular.cleanse_header!
@@ -179,6 +220,41 @@ class TabularTest < Minitest::Test
           assert_equal 'a:b:c|:|23', psv_string
         end
       end
+
+      describe ':fixed format' do
+        let :tabular do
+          layout = [
+            {key: 'name', size: 23},
+            {key: 'address', size: 40},
+            {key: 'zip', size: 5}
+          ]
+          IOStreams::Tabular.new(format: :fixed, format_options: {layout: layout})
+        end
+
+        it 'renders fixed data' do
+          assert string = tabular.render({'name' => 'Jack', 'address' => 'over there', 'zip' => 34618, 'phone' => '5551231234'})
+          assert_equal 'Jack                   over there                              34618', string
+        end
+
+        it 'truncates long data' do
+          assert string = tabular.render({'name' => 'Jack', 'address' => 'over there', 'zip' => 3461832653653265, 'phone' => '5551231234'})
+          assert_equal 'Jack                   over there                              34618', string
+        end
+
+        it 'renders nil as empty string' do
+          assert string = tabular.render('zip' => 3461832653653265)
+          assert_equal '                                                               34618', string
+        end
+
+        it 'renders boolean' do
+          assert string = tabular.render({'name' => true, 'address' => false, 'zip' => nil, 'phone' => '5551231234'})
+          assert_equal 'true                   false                                        ', string
+        end
+
+        it 'renders no data as nil' do
+          refute tabular.render({})
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -8,7 +8,7 @@ require 'awesome_print'
 require 'symmetric-encryption'
 
 # Since PGP libraries use UTC for Dates
-ENV['TZ']='UTC'
+ENV['TZ'] = 'UTC'
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 

data/test/xlsx_reader_test.rb

@@ -1,4 +1,5 @@
 require_relative 'test_helper'
+require 'csv'
 
 class XlsxReaderTest
   describe IOStreams::Xlsx::Reader do
@@ -17,23 +18,19 @@ class XlsxReaderTest
       describe 'with a file path' do
         it 'returns the contents of the file' do
           rows = []
-          IOStreams::Xlsx::Reader.open(file_name) do |stream|
-            stream.each { |row| rows << row }
-          end
-          assert_equal xlsx_contents, rows
+          csv  = IOStreams::Xlsx::Reader.open(file_name, &:read)
+          assert_equal xlsx_contents, CSV.parse(csv)
         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 |stream|
-              stream.each { |row| rows << row }
-            end
+          csv = ''
+          File.open(file_name, 'rb') do |file|
+            csv = IOStreams::Xlsx::Reader.open(file, &:read)
           end
 
-          assert_equal xlsx_contents, rows
+          assert_equal xlsx_contents, CSV.parse(csv)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -36,6 +36,9 @@ files:
 - Rakefile
 - lib/io_streams/bzip2/reader.rb
 - lib/io_streams/bzip2/writer.rb
+- lib/io_streams/encode/reader.rb
+- lib/io_streams/encode/writer.rb
+- lib/io_streams/errors.rb
 - lib/io_streams/file/reader.rb
 - lib/io_streams/file/writer.rb
 - lib/io_streams/gzip/reader.rb
@@ -57,7 +60,6 @@ files:
 - 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
@@ -74,6 +76,8 @@ files:
 - lib/iostreams.rb
 - test/bzip2_reader_test.rb
 - test/bzip2_writer_test.rb
+- test/encode_reader_test.rb
+- test/encode_writer_test.rb
 - test/file_reader_test.rb
 - test/file_writer_test.rb
 - test/files/spreadsheet.xlsx
@@ -113,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,6 +136,7 @@ test_files:
 - test/row_writer_test.rb
 - test/zip_reader_test.rb
 - test/bzip2_writer_test.rb
+- test/encode_writer_test.rb
 - test/gzip_writer_test.rb
 - test/file_reader_test.rb
 - test/record_reader_test.rb
@@ -149,6 +154,7 @@ test_files:
 - test/files/text.txt.gz
 - test/files/text.txt
 - test/gzip_reader_test.rb
+- test/encode_reader_test.rb
 - test/test_helper.rb
 - test/file_writer_test.rb
 - test/tabular_test.rb

data/lib/io_streams/tabular/errors.rb

@@ -1,14 +0,0 @@
-module IOStreams
-  class Tabular
-    module Errors
-      class Error < StandardError;
-      end
-
-      class InvalidHeader < Error;
-      end
-
-      class TypeMismatch < Error;
-      end
-    end
-  end
-end