sort with usenull

lib/kiba/extend/transforms/clean.rb

@@ -36,6 +36,8 @@ def process(row)
           private
 
           def process_for_sort(val)
+            return val.gsub('%NULLVALUE%', 'zzzzzzzzzzzzzz').downcase.gsub(/[^[:alnum:][:space:]]/, '') if @usenull
+
             val.downcase.gsub(/[^[:alnum:][:space:]]/, '')
           end
 

lib/kiba/extend/transforms/helpers.rb

@@ -45,7 +45,7 @@ def field_values(row:, fields:, discard: %i[nil empty delim], delim: DELIM, usen
         # @return [Array(Symbol)] of names of fields that should be kept, based on given discard
         #   and usenull param values and the field values
         private_class_method def keep_fields(field_vals, discard, delim, usenull)
-          field_vals.transform_values!{ |val| val.gsub('%NULLVALUE%', '') } if usenull
+          field_vals = field_vals.transform_values{ |val| val.gsub('%NULLVALUE%', '') } if usenull
           field_vals = field_vals.reject{ |field, val| val.empty? } if discard.any?(:empty)
           field_vals = field_vals.reject{ |field, val| delim_only?(val, delim) } if discard.any?(:delim)
           field_vals.keys

spec/kiba/extend/transforms/clean_spec.rb

@@ -54,6 +54,38 @@
         end
       end
     end
+
+    context 'when usenull = true' do
+      let(:usenull) { true }
+      it 'sorts as expected' do
+        expected = [
+          'Organization;Person;unmapped',
+          ';',
+          nil,
+          '',
+          'notmapped;Person',
+          'apple;%NULLVALUE%',
+          'oatmeal;%NULLVALUE%'
+        ]
+        expect(result.map{ |res| res[:type] }).to eq(expected)
+      end
+
+      context 'when direction = :desc' do
+        let(:direction) { :desc }
+        it 'sorts as expected' do
+          expected = [
+            'unmapped;Person;Organization',
+            ';',
+            nil,
+            '',
+            'Person;notmapped',
+            '%NULLVALUE%;apple',
+            '%NULLVALUE%;oatmeal'
+          ]
+          expect(result.map{ |res| res[:type] }).to eq(expected)
+        end
+      end
+    end
   end
 
   describe 'ClearFields' do