ndr_import 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496677e02a5e9158338a87a609ba84fc25480eaa
-  data.tar.gz: bded0053259c86581deb63744b2828953e991823
+  metadata.gz: 154d097959db5f976eb388923cb0ec092ca7a082
+  data.tar.gz: 5189ab2452d9faa4757d0217677edffb5e6b9f89
 SHA512:
-  metadata.gz: 29e2b2fbede907fa19dddb72ecd3f0b82addb5c031ad0f700c0e69b5dc144b681f27f7696fd9f2e9baf64f0207051932a62baeb25c602c7a68ae79b815d66419
-  data.tar.gz: f472aae5c16f48ce116e4447b42ac9775300161ff1985e5bf78d332391b498bf940c8d3e132abf8d0cb88c058ddd56ccd81cc20fc90e5efba8b848a482446672
+  metadata.gz: 604fe52d17f3741882d0402cd523db3461aa846f437c65f3afaad9e1ea9d7f080d46efa363175a027eedcf2502544f99b0cf144d70b28770e3d9d86c8adcc99d
+  data.tar.gz: ed7332ec167e80547d684a9b8df986f65cbf82de9c3f42e60fa49a8c5dfe060a6507fb0b9a213fa812ab1137121b5acaf390de614cef9fcd12cc6a58feb50f65

data/code_safety.yml

@@ -74,15 +74,15 @@ file safety:
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
   lib/ndr_import/file/excel.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+    reviewed_by: joshpencheon
+    safe_revision: 80ce15cc5ca15019400d4cd24c3353191bec00cc
   lib/ndr_import/file/pdf.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
   lib/ndr_import/file/registry.rb:
     comments: 
-    reviewed_by: timgentry
+    reviewed_by: joshpencheon
     safe_revision: 629a368e6a6a2aac3bec4616edbfc4c38184a923
   lib/ndr_import/file/text.rb:
     comments: 
@@ -102,8 +102,8 @@ file safety:
     safe_revision: 277e5d8159542b539fe7548fb30b449d9273c8f9
   lib/ndr_import/helpers/file/excel.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 277e5d8159542b539fe7548fb30b449d9273c8f9
+    reviewed_by: joshpencheon
+    safe_revision: 80ce15cc5ca15019400d4cd24c3353191bec00cc
   lib/ndr_import/helpers/file/pdf.rb:
     comments: 
     reviewed_by: timgentry
@@ -161,9 +161,9 @@ file safety:
     reviewed_by: timgentry
     safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
   lib/ndr_import/version.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: f2a3fe23b3f0fc5765a9a295d34d44146bb50143
+    comments: another check?
+    reviewed_by: joshpencheon
+    safe_revision: 03305d1e8a6fab607565886bdd7ce4d63a0cdba1
   ndr_import.gemspec:
     comments: 
     reviewed_by: josh.pencheon
@@ -178,8 +178,8 @@ file safety:
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
   test/file/excel_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+    reviewed_by: joshpencheon
+    safe_revision: 80ce15cc5ca15019400d4cd24c3353191bec00cc
   test/file/pdf_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -206,8 +206,8 @@ file safety:
     safe_revision: fd2904c1c8166b5284bd6213965401c40f292246
   test/helpers/file/excel_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: fd2904c1c8166b5284bd6213965401c40f292246
+    reviewed_by: joshpencheon
+    safe_revision: 80ce15cc5ca15019400d4cd24c3353191bec00cc
   test/helpers/file/pdf_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -244,6 +244,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
+  test/resources/blank_tab_test.xlsx:
+    comments: reviewed contents
+    reviewed_by: joshpencheon
+    safe_revision: 80ce15cc5ca15019400d4cd24c3353191bec00cc
   test/resources/bomd.csv:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_import/file/excel.rb

@@ -63,6 +63,7 @@ module NdrImport
       # Iterate through an xls sheet line by line, yielding each one in turn.
       def xls_rows(sheet)
         return enum_for(:xls_rows, sheet) unless block_given?
+        return unless sheet.first_row # NULL Sheet (TODO: perhaps XLSX only, use xlsx_rows...)
 
         sheet.first_row.upto(sheet.last_row) do |row|
           line = []

data/lib/ndr_import/helpers/file/excel.rb

@@ -95,6 +95,7 @@ module NdrImport
         # Iterate through an xls sheet line by line, yielding each one in turn.
         def xls_rows(sheet)
           return enum_for(:xls_rows, sheet) unless block_given?
+          return unless sheet.first_row # NULL Sheet (TODO: perhaps XLSX only, use xlsx_rows...)
 
           sheet.first_row.upto(sheet.last_row) do |row|
             line = []

data/lib/ndr_import/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # This stores the current version of the NdrImport gem
 module NdrImport
-  VERSION = '3.1.4'.freeze
+  VERSION = '3.1.5'.freeze
 end

data/test/file/excel_test.rb

@@ -29,6 +29,16 @@ module NdrImport
         end
       end
 
+      test 'should read xlsx file with null sheet' do
+        file_path = @permanent_test_files.join('blank_tab_test.xlsx')
+        handler   = NdrImport::File::Excel.new(file_path, nil)
+
+        handler.tables.each do |_tablename, sheet|
+          assert_instance_of Enumerator, sheet
+          assert sheet.to_a.is_a?(Array)
+        end
+      end
+
       test 'should read xlsx file with the incorrect xls extension' do
         file_path = @permanent_test_files.join('xlsx_file_xls_extension.xls')
         handler = NdrImport::File::Excel.new(file_path, nil)

data/test/helpers/file/excel_test.rb

@@ -25,6 +25,13 @@ class ExcelTest < ActiveSupport::TestCase
     assert_equal file_content.first, %w(1A 1B)
   end
 
+  test 'should read xlsx file with null sheet' do
+    file    = @permanenttestfiles.join('blank_tab_test.xlsx')
+    content = @importer.send(:read_excel_file, file, 'Sheet3')
+
+    assert content.is_a?(Array)
+  end
+
   test 'read_excel_file helper should read xlsx file with the incorrect xls extension' do
     file_path = @permanenttestfiles.join('xlsx_file_xls_extension.xls')
     file_content = @importer.send(:read_excel_file, file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -348,6 +348,7 @@ files:
 - test/non_tabular/table_test.rb
 - test/non_tabular_file_helper_test.rb
 - test/readme_test.rb
+- test/resources/blank_tab_test.xlsx
 - test/resources/bomd.csv
 - test/resources/broken.csv
 - test/resources/filesystem_paths.yml
@@ -428,6 +429,7 @@ test_files:
 - test/non_tabular/table_test.rb
 - test/non_tabular_file_helper_test.rb
 - test/readme_test.rb
+- test/resources/blank_tab_test.xlsx
 - test/resources/bomd.csv
 - test/resources/broken.csv
 - test/resources/filesystem_paths.yml