ndr_import 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ae4b12ab514a7bda584c93b3124fdeab03cea5292424c0e380c92f6e3a3c1a
-  data.tar.gz: 4b9dff76aa434bb87e542bcf694d4f99a91b2cd69e2eeaf6730a32b78fe61cc9
+  metadata.gz: 8b3b3b485a77caed57442e97c7391c4d95b68ee4a9ae5af1a6e53b9a1fd95987
+  data.tar.gz: fbf1799920b70ddcbc6014c269e90a6d3d9689f01a306042ab2cac7152637eff
 SHA512:
-  metadata.gz: 27e3c4578ab466ae9977727de5b972e8e5bf7e2f9fa62ab53cd60437e4d7232e5da3ce3afbcf6b94dd943b219b051ccc6177b73189e736ecf8d10f582f6f0bc9
-  data.tar.gz: b06ef69bba53f56314574ff9749011289180624d0f73f7660537610ba29e3ec01114810bc781ccb8c67440c30f1406a05c56e508299a026a7467bb7968d4cb16
+  metadata.gz: b06f9293e925ef74ecb96a1ae24f7732bf057ff6642a29245ad99f51b6bd48d608257575c48a2bbe89a509de1f9db44a457567175e9f3a354840f48fe5d1e92c
+  data.tar.gz: 37c8145eea0bb9f6f1788f202524cd233a7b542088b7d540f5d7d236ca910dcaf950ffd0adf6a4619afb64a6f4b7082c478d90a4b7bf19dba8016b6ab3fba07b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 =======
 *no unreleased changes*
 
+## 11.0.1 / 2023-10-30
+### Fixed
+* Ensure autogenerated XML column mappings are unique
+
 ## 11.0.0 / 2023-10-27
 ### Changed
 * XML enhancements. Breaking change, the enhancements are not backward compatible

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.0.0'
+  VERSION = '11.0.1'
 end

data/lib/ndr_import/xml/column_mapping.rb

@@ -57,19 +57,19 @@ module NdrImport
         end
       end
 
-      # Append "_1", "_2" etc to repeating rawtext and optionally mapped field names within a
-      # single record, so data is not overwritten
+      # Append "_1.1", "_2.1", "_1" etc to repeating rawtext and optionally mapped field names
+      # within a single record, so data is not overwritten
       def apply_new_rawtext_and_mapped_names_to(new_column)
         existing_rawtext        = existing_column['rawtext_name'] || existing_column['column']
         column_name_increment   = new_column['column'].scan(/\[(\d+)\]/)
         relative_path_increment = new_column.dig('xml_cell', 'relative_path').scan(/\[(\d+)\]/)
 
-        # Find all the increments (e.g. [1], [2]) from the new column and use their sum
-        # as the rawtext and column name increment
-        increment = (column_name_increment + relative_path_increment).flatten.map(&:to_i).sum
-        new_column['rawtext_name'] = existing_rawtext + "_#{increment}" unless increment.zero?
+        # Find all the increments (e.g. [1], [2]) from the new column and concatenate them to
+        # use as the rawtext and column name increment
+        increment = (column_name_increment + relative_path_increment).flatten.compact.join('.')
+        new_column['rawtext_name'] = existing_rawtext + "_#{increment}" if increment.present?
 
-        return unless !increment.zero? && increment_field_name
+        return unless increment.present? && increment_field_name
 
         new_column['mappings'] = incremented_mappings_for(new_column, increment)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel