ndr_import 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9c5c86bbcd00af6877225040d6beb01007575d
-  data.tar.gz: 7dabb1d68c3467314e90f916f7ccb573be33ea1a
+  metadata.gz: 0b9dfb908b8fd54add87023de9f374e6b3a74af9
+  data.tar.gz: a0d67ce391abf53242f15e221df6cb297f83cb14
 SHA512:
-  metadata.gz: d9a13b367b3b094c041221b989456af8dfa1571395fd0b4ba11e1fcae10d830ea6b50b89a8f59f7bd72bc49209419c3f9bfbbfe86f9c0b47cbdf600b5e754508
-  data.tar.gz: a8da74311916a789f8203407fc1bfd7db5540940efdf28a1d96b615fa8f52321f7c541596d82a69f8ee704ad50863bf547ec812a86d138d82dfda59d79ba3b9d
+  metadata.gz: 46478e258b56cf0cebe45f8255087bbd48371bb0f4e5a1c30ce69e2b40d1500fa24427f8eea949a21a72ab22ef6e5e147283706d99fbe900f490502422b2b5a5
+  data.tar.gz: de540d72430687fd0c2731bd810910fc65ba0edf0c05798e6970f437ebbc451b58f9c7a77df35862b830e5b31f973fb3bc264d9646967de42d62a6d6d5db5d41

data/.rubocop.yml

@@ -11,6 +11,10 @@ HashSyntax:
     - ruby19
     - hash_rockets
 
+# Override HoundCI's preference for double quotes:
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
 # Would enforce "-> { }", which we cannot use yet.
 Lambda:
   Enabled: false

data/code_safety.yml

@@ -10,8 +10,8 @@ file safety:
     safe_revision: df3c0be0e655f4fc95c86d4a57bda6eef1fb8955
   ".rubocop.yml":
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 899c079b3a8aaa60cddebc062f072f8d7074cdc8
+    reviewed_by: joshpencheon
+    safe_revision: ac40ad6e6a9d79d139ba063681f3fe6093c73b14
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
@@ -158,12 +158,12 @@ file safety:
     safe_revision: 3c7f827d17aacbf7b811eea67e27553f3b039070
   lib/ndr_import/table.rb:
     comments: uses File.basename
-    reviewed_by: timgentry
-    safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
+    reviewed_by: joshpencheon
+    safe_revision: e70ece909c44b26208eaff3cf27ada7145e03f11
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: joshpencheon
-    safe_revision: 04a29ed03b6772091d7208403f0acc5032117149
+    safe_revision: 00e02b83f5ae640becdb98d378eddfb67f8ae5c5
   ndr_import.gemspec:
     comments: 
     reviewed_by: josh.pencheon
@@ -394,8 +394,8 @@ file safety:
     safe_revision: 3c7f827d17aacbf7b811eea67e27553f3b039070
   test/table_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 6bb588c17d33a604c96c648c6eebfe2d063dfbc0
+    reviewed_by: joshpencheon
+    safe_revision: e70ece909c44b26208eaff3cf27ada7145e03f11
   test/test_helper.rb:
     comments: 
     reviewed_by: joshpencheon

data/lib/ndr_import/table.rb

@@ -46,6 +46,7 @@ module NdrImport
 
       @row_index = 0
       @header_valid = false
+      @header_best_guess = nil
       @notifier.try(:started)
 
       skip_footer_lines(lines, footer_lines).each do |line|
@@ -63,7 +64,7 @@ module NdrImport
       if @row_index < header_lines
         validate_header(line, @columns)
       else
-        fail 'Header is not valid' if header_lines > 0 && !header_valid?
+        fail_unless_header_complete(@columns)
         transform_line(line, @row_index, &block)
       end
 
@@ -165,10 +166,37 @@ module NdrImport
     # if there is a header, then check the column headings are as expected in the correct order
     def validate_header(line, column_mappings)
       columns = column_names(column_mappings)
-      fail 'Number of columns does not match' if line.length != columns.length
 
-      return unless line.map(&:downcase) == columns
-      @header_valid = true
+      unless line.length == columns.length
+        fail "Number of columns does not match; expected #{columns.length}, got #{line.length}!"
+      end
+
+      header_guess = line.map(&:downcase)
+
+      @header_best_guess = header_guess if header_guess.any?(&:present?)
+      @header_valid      = true         if header_guess == columns
+    end
+
+    def fail_unless_header_complete(column_mappings)
+      return unless header_lines > 0 && !header_valid?
+
+      expected_names = column_names(column_mappings)
+      received_names = @header_best_guess || []
+
+      unexpected = received_names - expected_names
+      missing    = expected_names - received_names
+
+      fail header_message_for(missing, unexpected)
+    end
+
+    def header_message_for(missing, unexpected)
+      message = ['Header is not valid!']
+
+      message << "missing: #{missing.inspect}"       if missing.any?
+      message << "unexpected: #{unexpected.inspect}" if unexpected.any?
+      message << '(out of order)' if missing.none? && unexpected.none?
+
+      message.join(' ')
     end
 
     # returns the column names as we expect to receive them

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 = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/test/table_test.rb

@@ -243,6 +243,66 @@ class TableTest < ActiveSupport::TestCase
     assert_equal expected_output, output
   end
 
+  def test_invalid_header_length
+    lines = [
+      %w(NOTHEADING1 NOTHEADING2 UHOH3 UHOH4),
+      %w(ONE TWO),
+      %w(DEFINITELYNOTHEADING1 DEFINITELYNOTHEADING2)
+    ].each
+
+    table = NdrImport::Table.new(:header_lines => 3, :footer_lines => 0,
+                                 :klass => 'SomeTestKlass',
+                                 :columns => [{ 'column' => 'one' }, { 'column' => 'two' }])
+
+    exception = assert_raises(RuntimeError) { table.transform(lines).to_a }
+    assert_match(/expected 2, got 4/, exception.message)
+  end
+
+  def test_jumbled_header
+    lines = [
+      %w(NOTHEADING1 NOTHEADING2 NOTHEADING3),
+      %w(ONE THREE TWO),
+      %w(DATA ROW HERE)
+    ].each
+
+    table = NdrImport::Table.new(
+      :header_lines => 2,
+      :footer_lines => 0,
+      :klass => 'SomeTestKlass',
+      :columns => [
+        { 'column' => 'one' },
+        { 'column' => 'two' },
+        { 'column' => 'three' }
+      ]
+    )
+
+    exception = assert_raises(RuntimeError) { table.transform(lines).to_a }
+    assert_equal('Header is not valid! (out of order)', exception.message)
+  end
+
+  def test_wrong_header_names
+    lines = [
+      %w(NOTHEADING1 NOTHEADING2 NOTHEADING3),
+      %w(FUN TWO TREE),
+      %w(DATA ROW HERE)
+    ].each
+
+    table = NdrImport::Table.new(
+      :header_lines => 2,
+      :footer_lines => 0,
+      :klass => 'SomeTestKlass',
+      :columns => [
+        { 'column' => 'one' },
+        { 'column' => 'two' },
+        { 'column' => 'three' }
+      ]
+    )
+
+    exception = assert_raises(RuntimeError) { table.transform(lines).to_a }
+    assert_equal('Header is not valid! missing: ' \
+                 '["one", "three"] unexpected: ["fun", "tree"]', exception.message)
+  end
+
   private
 
   def simple_deserialized_table

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport