ndr_import 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7781d10d01e028e81ddb0cccaacd8189a1e4e8dc
-  data.tar.gz: 1a0f2b9288d43be1f3caf0dcc68510b9feb95c22
+SHA256:
+  metadata.gz: bd7c8c33ac1629a8eb6db4b34e48753ec87bc4ba3e0ba610bdfa08a17093e571
+  data.tar.gz: 594f17bc6dffc97f379584102623a5e6797538194b0f7c19338e42157ffb853d
 SHA512:
-  metadata.gz: 40f73db1effc623fde1c36b43ab3a016edac4ae308bc36a9aac7b9f4c515e94e8891e99413b758e75c306b30c2f9609e8e41577b491678b89d1b48bb884addf2
-  data.tar.gz: d352544945d48ebee58e62dd0a72ad7ab12101578d4ef6ae740e2f8c15925d023a54f0ef85746e45a47e227d99f3ef14e93d6eebd97632af0eafba5005a5f93a
+  metadata.gz: 406c64776037455de6c6971e264d5ec632b269af7c7d4962aa14acc39e4318a10241b258efd511f93c9a76c54659898951ba05152619c67ba5842cc81a247591
+  data.tar.gz: 70cac273b5b2557d409f7706de1e20356f6909b344907e9d3a013b444841850962be584e7c24777f4330000d1cdbd9e90f5ed449ecd21f467388ddb70ae020d5

data/code_safety.yml

@@ -66,8 +66,8 @@ file safety:
     safe_revision: be12e57519d3737e8d3901d7b01485c6995708dd
   lib/ndr_import/file/all.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+    reviewed_by: josh.pencheon
+    safe_revision: 2104514689a1a1286195fff18144a8cecb93048b
   lib/ndr_import/file/base.rb:
     comments: 
     reviewed_by: timgentry
@@ -86,12 +86,16 @@ file safety:
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
   lib/ndr_import/file/registry.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 629a368e6a6a2aac3bec4616edbfc4c38184a923
+    reviewed_by: josh.pencheon
+    safe_revision: 2104514689a1a1286195fff18144a8cecb93048b
   lib/ndr_import/file/text.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: a8451809db86e0e023b0d93826114a33ff896c4f
+    reviewed_by: josh.pencheon
+    safe_revision: dfe367e64c6e0ff80495cd7989fc50311d5b258f
+  lib/ndr_import/file/unregistered_filetype.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 2104514689a1a1286195fff18144a8cecb93048b
   lib/ndr_import/file/word.rb:
     comments: 
     reviewed_by: timgentry
@@ -154,8 +158,8 @@ file safety:
     safe_revision: 63b1e8c275bd63377309d9b124176f39f75576a9
   lib/ndr_import/non_tabular/table.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
+    reviewed_by: josh.pencheon
+    safe_revision: f7670cf27e137064c19490abc7df020fb6e95801
   lib/ndr_import/non_tabular_file_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -175,7 +179,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: 5adc16ab99f43a20c1bedcea8724258188ab64bd
+    safe_revision: f55e0ff1dfcbb51b0f1284f50b7f0537f65e0c65
   ndr_import.gemspec:
     comments: 
     reviewed_by: josh.pencheon
@@ -199,7 +203,7 @@ file safety:
   test/file/registry_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 902f5326d85372d9632de9869d6f56fc02b83a10
+    safe_revision: dfe367e64c6e0ff80495cd7989fc50311d5b258f
   test/file/text_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -251,7 +255,7 @@ file safety:
   test/non_tabular/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 902f5326d85372d9632de9869d6f56fc02b83a10
+    safe_revision: f7670cf27e137064c19490abc7df020fb6e95801
   test/non_tabular_file_helper_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_import/file/all.rb

@@ -3,6 +3,7 @@ require_relative 'delimited'
 require_relative 'excel'
 require_relative 'pdf'
 require_relative 'text'
+require_relative 'unregistered_filetype'
 require_relative 'word'
 # # require_relative 'xml'
 require_relative 'zip'

data/lib/ndr_import/file/registry.rb

@@ -41,7 +41,7 @@ module NdrImport
           if klass
             klass.new(filename, format, options)
           else
-            fail "Error: Unknown file format #{format.inspect}"
+            UnregisteredFiletype.new(filename, format, options)
           end
         end
       end

data/lib/ndr_import/file/text.rb

@@ -47,6 +47,6 @@ module NdrImport
       end
     end
 
-    Registry.register(Text, 'txt') # TODO: Add 'nontabular'?
+    Registry.register(Text, 'txt', 'text', 'nontabular')
   end
 end

data/lib/ndr_import/file/unregistered_filetype.rb

@@ -0,0 +1,10 @@
+module NdrImport
+  module File
+    # This is a stub file handler for files with file extensions that aren't in the registry.
+    class UnregisteredFiletype < Base
+      def tables
+        raise "Error: Unknown file format #{@format.inspect}"
+      end
+    end
+  end
+end

data/lib/ndr_import/non_tabular/table.rb

@@ -20,7 +20,7 @@ module NdrImport
                                start_in_a_record end_in_a_record)
 
       def self.all_valid_options
-        super - %w(tablename_pattern header_lines footer_lines) + NON_TABULAR_OPTIONS
+        super - %w(delimiter tablename_pattern header_lines footer_lines) + NON_TABULAR_OPTIONS
       end
 
       attr_reader(*NON_TABULAR_OPTIONS)

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 = '6.0.0'.freeze
+  VERSION = '6.1.0'.freeze
 end

data/test/file/registry_test.rb

@@ -12,7 +12,7 @@ module NdrImport
 
       test 'Registry.handlers' do
         assert_instance_of Hash, NdrImport::File::Registry.handlers
-        assert_equal %w[csv delimited doc pdf txt xls xlsx zip],
+        assert_equal %w[csv delimited doc nontabular pdf text txt xls xlsx zip],
                      NdrImport::File::Registry.handlers.keys.sort
       end
 

data/test/non_tabular/table_test.rb

@@ -48,7 +48,7 @@ STR
 
   def test_all_valid_options
     valid_options = %w[
-      canonical_name capture_start_line columns delimiter end_in_a_record end_line_pattern
+      canonical_name capture_start_line columns end_in_a_record end_line_pattern
       filename_pattern format klass remove_lines start_in_a_record start_line_pattern
     ]
     assert_equal valid_options.sort,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -335,6 +335,7 @@ files:
 - lib/ndr_import/file/pdf.rb
 - lib/ndr_import/file/registry.rb
 - lib/ndr_import/file/text.rb
+- lib/ndr_import/file/unregistered_filetype.rb
 - lib/ndr_import/file/word.rb
 - lib/ndr_import/file/zip.rb
 - lib/ndr_import/fixed_width/table.rb
@@ -439,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: NDR Import