ndr_import 11.6.0 → 11.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7ea78a292f3c2ee622bda06d341329c97af0dd0edd36c039ee349a08b74284
-  data.tar.gz: 1dae1db120f401a1cfb85b5d243563fd9ba26f290b313d561d4b6b3327b732b8
+  metadata.gz: 42a13d9464123749bb78650658d058a47b23f59c75d611c2bebe127a056e705c
+  data.tar.gz: ba30f77ba569506765a14d514e0b021a9d30a0f097fab18b38dc002ff6c53634
 SHA512:
-  metadata.gz: bb20b9455c14347bd9ce894858693f94f3c7d8d3fa2c2eac390bb948011db5ae1001513ce6654cca1ca2bdbad40cf5dbd5e6c3bb491def911893159447f7fbe9
-  data.tar.gz: 5683e42c10156785a8e58f13269250f59f90c81ca46613840e405f6f7e6c80a7f203e3ccdb4b49fef0eeb1d300394f5120464cb5d5bd193950505f6f36365281
+  metadata.gz: 94ac6dd14da96864fb812129036ee81a2715fef3b464279e43341434f4a70cf82142a89abbc324d0b9ce6a9a784e89c60422c5a6176073b635b49997977ad4e2
+  data.tar.gz: 56b8b030cea738fdf43e654cc91251a5eefd7a6ee3b58e5482d4c6a8cc8a1484b48a9a2e04ba84f80599f67725400e93d3aae3533ee617b141069dc18b443886

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 * no unreleased changes
 
+## 11.7.0 / 2026-09-24
+### Added
+* Added the ability to define a virtual :filename column
+
 ## 11.6.0 / 2026-09-08
 ### Fixed
 * `NdrImport::File::SevenZip` was extracting files one directory level too deep

data/lib/ndr_import/table.rb

@@ -237,7 +237,10 @@ module NdrImport
 
     # returns the column names as we expect to receive them
     def column_names(column_mappings)
-      column_mappings.map { |c| (c['column'] || c['standard_mapping']).try(:downcase) }
+      column_mappings.map do |c|
+        name = c['column'] || c['standard_mapping']
+        name.to_s.downcase unless name.is_a?(Regexp)
+      end
     end
 
     # If specified in the mapping, stop transforming data at a given index (column)

data/lib/ndr_import/universal_importer_helper.rb

@@ -83,7 +83,28 @@ module NdrImport
         # Merge file_metadata (from VCF or XML) with directly assigned table_metadata
         # to form `table_metadata`
         mapping.table_metadata = (mapping.table_metadata || {}).merge(file_metadata || {})
-        yield(mapping, table_content)
+
+        augmented_table_content = filename_augmented_rows(mapping, table_content, filename)
+
+        yield(mapping, augmented_table_content)
+      end
+    end
+
+    def filename_augmented_rows(table, rows, filename)
+      return enum_for(:filename_augmented_rows, table, rows, filename) unless block_given?
+
+      filename_column_position = table.columns.index { |c| c['column'] == :filename }
+
+      rows.each.with_index do |row, i|
+        if filename_column_position
+          if i < table.header_lines
+            row.insert(filename_column_position, :filename)
+          else
+            row.insert(filename_column_position, ::File.basename(filename))
+          end
+        end
+
+        yield row
       end
     end
 

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 = '11.6.0'
+  VERSION = '11.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 11.6.0
+  version: 11.7.0
 platform: ruby
 authors:
 - NCRS Development Team