Merge pull request #17 from lyrasis/bugfix

Bugfix for `Merge::MultiRowLookup`
lyrasis · May 26, 2021 · e39b72c · e39b72c
2 parents 9a23a4f + 7428d88
commit e39b72c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kiba-extend (1.11.0)
+    kiba-extend (1.12.0)
       activesupport
       kiba (>= 4.0.0)
       kiba-common (>= 1.5.0)

diff --git a/lib/kiba/extend/transforms/merge.rb b/lib/kiba/extend/transforms/merge.rb
@@ -126,10 +126,12 @@ def initialize(fieldmap:, constantmap: {}, lookup:, keycolumn:,
           end
 
           def process(row)
-            id_data = row.fetch(@keycolumn)
-            ids = @multikey ? id_data.split(@delim) : [id_data]
             field_data = Kiba::Extend::Fieldset.new(@fieldmap.values)
 
+            id_data = row.fetch(@keycolumn, '')
+            id_data = id_data.nil? ? '' : id_data
+            ids = @multikey ? id_data.split(@delim) : [id_data]
+
 
             ids.each do |id|
               field_data.populate(rows_to_merge(id, row))

diff --git a/lib/kiba/extend/version.rb b/lib/kiba/extend/version.rb
@@ -1,5 +1,5 @@
 module Kiba
   module Extend
-    VERSION = "1.12.0"
+    VERSION = "1.12.1"
   end
 end
diff --git a/spec/kiba/extend/transforms/merge_spec.rb b/spec/kiba/extend/transforms/merge_spec.rb
@@ -196,7 +196,8 @@
         [2, 'Kernel', 'f', 'adopted'],
         [3, 'Boris', 'm', 'adopted'],
         [4, 'Earlybird', 'f', 'hatched'],
-        [5, 'Lazarus', 'm', 'adopted']
+        [5, 'Lazarus', 'm', 'adopted'],
+        [nil, 'Null', '', '']
       ] }
       lookup_rows = [
         ['id', 'date', 'treatment'],
@@ -236,9 +237,12 @@
            :date=>nil,
            :event=>nil},
           {:id=>'5', :name=>'Lazarus', :sex=>'m', :source=>'adopted',
+           :date=>nil,
+           :event=>nil} ,
+          {:id=>nil, :name=>'Null', :sex=>'', :source=>'',
            :date=>nil,
            :event=>nil}
-        ]
+       ]
         result = execute_job(filename: test_csv, xform: Merge::MultiRowLookup, xformopt: xformopt)
         expect(result).to eq(expected)
       end
@@ -265,6 +269,10 @@
            :event=>nil,
            :by=>nil, :loc=>nil},
           {:id=>'5', :name=>'Lazarus', :sex=>'m', :source=>'adopted',
+           :date=>nil,
+           :event=>nil,
+           :by=>nil, :loc=>nil},
+          {:id=>nil, :name=>'Null', :sex=>'', :source=>'',
            :date=>nil,
            :event=>nil,
            :by=>nil, :loc=>nil}
@@ -284,7 +292,8 @@
         ['a|b|c'],
         ['d'],
         ['e|f|g'],
-        ['h']
+        ['h'],
+        [nil]
       ] }
       lookup_rows = [
         ['single', 'double', 'triple'],
@@ -316,7 +325,8 @@
           {single: 'a|b|c', doubles: 'aa|bb|beebee|cc', triples: 'aaa|bbb||ccc'},
           {single: 'd', doubles: 'dd', triples: 'ddd'},
           {single: 'e|f|g', doubles: 'ee|', triples: 'eee|ggg'},
-          {single: 'h', doubles: nil, triples: nil}
+          {single: 'h', doubles: nil, triples: nil},
+          {single: nil, doubles: nil, triples: nil}
         ]
         result = execute_job(filename: test_csv, xform: Merge::MultiRowLookup, xformopt: xformopt)
         expect(result).to eq(expected)
@@ -328,7 +338,8 @@
           {single: 'a|b|c', doubles: 'aa|bb|beebee|cc', triples: 'aaa|bbb||ccc', quad: '4|4|4|4', pent: '5|5|5|5'},
           {single: 'd', doubles: 'dd', triples: 'ddd', quad: '4', pent: '5'},
           {single: 'e|f|g', doubles: 'ee|', triples: 'eee|ggg', quad: '4|4', pent: '5|5'},
-          {single: 'h', doubles: nil, triples: nil, quad: nil, pent: nil}
+          {single: 'h', doubles: nil, triples: nil, quad: nil, pent: nil},
+          {single: nil, doubles: nil, triples: nil, quad: nil, pent: nil}
         ]
         result = execute_job(filename: test_csv, xform: Merge::MultiRowLookup, xformopt: opt)
         expect(result).to eq(expected)