libis-tools 0.9.53 → 0.9.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667255e887aea8734fdf80072ee77be74e273d71
-  data.tar.gz: ca652b57931ae459cb239ad9f4f453f0615d588e
+  metadata.gz: ae389ef2e44feca0bd78fd597d72d6739e78fa04
+  data.tar.gz: ab0cb4d78009eb1bf655d6c7827b3a6ca3617a9e
 SHA512:
-  metadata.gz: 43623c49d7afe2e8db4ee7a0413555053253141d01c62230df19d67901663116711eac7dc0870d2614b55ee9695f04887cb9b493aeaed746381fd90bc584452d
-  data.tar.gz: aeb56f8c2f27da55b40e5c288f2bcffdcf8a8d5699fa7c71ef031d4457fe8cce95f0de6ec0c4d17cf89c67451ecfc700157cb699a438671b5912beb1466b60fe
+  metadata.gz: fca49440deb07099c2e8c4ae630930cc07c15ad740632bb71f5834e0bd6c9524ceacdbe5d7cdbbd6ee8c681c502750159123377c2808312fd68dd8fdbbde64d3
+  data.tar.gz: d0b17ee117419c096f35a99fb959dc75dcf33270a515e1b439d24516ce630be01ad5e727670e58a59fcd65f540f8514a59f985428646347918904d2ea926747c

data/lib/libis/tools/spreadsheet.rb

@@ -38,14 +38,14 @@ module Libis
       # @param [Hash] opts
       def initialize(file_name, opts = {})
         options = {
-            csv_options: [:encoding, :col_sep, :quote_char].inject({}) do |h, k|
-              h[k] = opts.delete(k) if opts[k]
-              h
-            end.merge(
+            csv_options: {
                 encoding: 'UTF-8',
                 col_sep: ',',
                 quote_char: '"',
-            ),
+            }.merge([:encoding, :col_sep, :quote_char].inject({}) do |h, k|
+              h[k] = opts.delete(k) if opts[k]
+              h
+            end)
         }.merge(opts)
 
         required_headers = options.delete(:required) || []

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.53'
+    VERSION = '0.9.54'
   end
 end

data/spec/data/test-headers.tsv

@@ -0,0 +1,2 @@
+FirstName	LastName	address
+John	Smith	mystreet 1, myplace

data/spec/data/test-noheaders.tsv

@@ -0,0 +1 @@
+John	Smith	mystreet 1, myplace

data/spec/spreadsheet_spec.rb

@@ -6,11 +6,13 @@ require 'libis/tools/spreadsheet'
 describe 'Libis::Tools::Spreadsheet' do
 
   let(:path) {File.absolute_path('data', File.dirname(__FILE__))}
+  let(:options) { {} }
   let(:ss) {
     Libis::Tools::Spreadsheet.new(
         File.join(path, file_name),
-        required: required_headers,
+        { required: required_headers,
         optional: optional_headers
+        }.merge(options)
     )
   }
 
@@ -240,6 +242,237 @@ describe 'Libis::Tools::Spreadsheet' do
 
   end
 
+  context 'TSV file' do
+
+    let(:options) { {
+        col_sep: "\t",
+        extension: 'csv'
+    }}
+
+    context 'with headers' do
+
+      let(:file_name) {'test-headers.tsv'}
+
+      context 'well-formed' do
+
+        let(:required_headers) {%w'FirstName LastName'}
+
+        it 'opens correctly' do
+          expect {ss}.not_to raise_error
+        end
+
+        it 'contains expected headers' do
+          required_headers.each do |header|
+            expect(ss.headers).to include header
+          end
+          expect(ss.headers).to eq %w'FirstName LastName address'
+        end
+
+        it '#shift returns Hash object' do
+          row = ss.shift
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+        it '#parse returns Array of Hash objects' do
+          rows = ss.parse
+          expect(rows).to be_a Array
+          expect(rows.size).to eq 1
+          row = rows[0]
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+      end
+
+      context 'not specified' do
+
+        let(:required_headers) {[]}
+
+        it 'opens correctly' do
+          expect {ss}.not_to raise_error
+        end
+
+        it 'contains expected headers' do
+          expect(ss.headers).to eq %w'FirstName LastName address'
+        end
+
+        it '#shift returns Hash object' do
+          row = ss.shift
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+        it '#parse returns Array of Hash objects' do
+          rows = ss.parse
+          expect(rows).to be_a Array
+          expect(rows.size).to eq 1
+          row = rows[0]
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+      end
+
+      context 'not well-formed' do
+
+        let(:required_headers) {%w'FirstName LastName address phone'}
+
+        it 'throws error when opened' do
+          expect {ss}.to raise_error(RuntimeError, 'Headers not found: ["phone"].')
+        end
+      end
+
+    end
+
+    context 'without headers' do
+      let(:file_name) {'test-noheaders.tsv'}
+
+      context 'well-formed and strict' do
+        let(:required_headers) {%w'FirstName LastName'}
+
+        it 'opens correctly' do
+          expect {ss}.not_to raise_error
+        end
+
+        it 'contains only required headers' do
+          required_headers.each do |header|
+            expect(ss.headers).to include header
+          end
+          expect(ss.headers).to eq %w'FirstName LastName'
+        end
+
+        it '#shift returns Hash object' do
+          row = ss.shift
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to be_nil
+          expect(row['phone']).to be_nil
+        end
+
+        it '#parse returns Array of Hash objects' do
+          rows = ss.parse
+          expect(rows).to be_a Array
+          expect(rows.size).to eq 1
+          row = rows[0]
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to be_nil
+          expect(row['phone']).to be_nil
+        end
+
+      end
+
+      context 'well-formed with optional headers' do
+        let(:required_headers) {%w'FirstName LastName'}
+        let(:optional_headers) {%w'address'}
+
+        it 'opens correctly' do
+          expect {ss}.not_to raise_error
+        end
+
+        it 'contains required and optional headers' do
+          required_headers.each do |header|
+            expect(ss.headers).to include header
+          end
+          optional_headers.each do |header|
+            expect(ss.headers).to include header
+          end
+          expect(ss.headers).to eq %w'FirstName LastName address'
+        end
+
+        it '#shift returns Hash object' do
+          row = ss.shift
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+        it '#parse returns Array of Hash objects' do
+          rows = ss.parse
+          expect(rows).to be_a Array
+          expect(rows.size).to eq 1
+          row = rows[0]
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+      end
+
+      context 'missing optional headers' do
+
+        let(:required_headers) {%w'FirstName LastName address'}
+        let(:optional_headers) {%w'phone'}
+
+        it 'opens correctly' do
+          expect {ss}.not_to raise_error
+        end
+
+        it 'contains only required headers' do
+          required_headers.each do |header|
+            expect(ss.headers).to include header
+          end
+          optional_headers.each do |header|
+            expect(ss.headers).not_to include header
+          end
+          expect(ss.headers).to eq %w'FirstName LastName address'
+        end
+
+        it '#shift returns Hash object' do
+          row = ss.shift
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+        it '#parse returns Array of Hash objects' do
+          rows = ss.parse
+          expect(rows).to be_a Array
+          expect(rows.size).to eq 1
+          row = rows[0]
+          expect(row).to be_a Hash
+          expect(row['FirstName']).to eq 'John'
+          expect(row['LastName']).to eq 'Smith'
+          expect(row['address']).to eq 'mystreet 1, myplace'
+          expect(row['phone']).to be_nil
+        end
+
+      end
+
+      context 'missing required header' do
+        let(:required_headers) {%w'FirstName LastName address phone'}
+
+        it 'throws error when opened' do
+          expect {ss}.to raise_error(RuntimeError, 'Sheet does not contain enough columns.')
+        end
+
+      end
+
+    end
+
+  end
+
   context 'XLSX file' do
 
     let(:real_headers) {%w'Date Amount Code Remark'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.53
+  version: 0.9.54
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -332,7 +332,9 @@ files:
 - spec/csv_spec.rb
 - spec/data/MetadataMapping.xlsx
 - spec/data/test-headers.csv
+- spec/data/test-headers.tsv
 - spec/data/test-noheaders.csv
+- spec/data/test-noheaders.tsv
 - spec/data/test.data
 - spec/data/test.xlsx
 - spec/data/test.xml
@@ -395,7 +397,9 @@ test_files:
 - spec/csv_spec.rb
 - spec/data/MetadataMapping.xlsx
 - spec/data/test-headers.csv
+- spec/data/test-headers.tsv
 - spec/data/test-noheaders.csv
+- spec/data/test-noheaders.tsv
 - spec/data/test.data
 - spec/data/test.xlsx
 - spec/data/test.xml