ndr_import 11.0.0 → 11.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ae4b12ab514a7bda584c93b3124fdeab03cea5292424c0e380c92f6e3a3c1a
-  data.tar.gz: 4b9dff76aa434bb87e542bcf694d4f99a91b2cd69e2eeaf6730a32b78fe61cc9
+  metadata.gz: ab2194b39d6226b9c8883f89ef30045c714fe276cdd5312f0b53f643cebbc003
+  data.tar.gz: 54433f513c6a6fb546f2f1b217d711214e44e1c30f488d1d00f9a67f41b94c0b
 SHA512:
-  metadata.gz: 27e3c4578ab466ae9977727de5b972e8e5bf7e2f9fa62ab53cd60437e4d7232e5da3ce3afbcf6b94dd943b219b051ccc6177b73189e736ecf8d10f582f6f0bc9
-  data.tar.gz: b06ef69bba53f56314574ff9749011289180624d0f73f7660537610ba29e3ec01114810bc781ccb8c67440c30f1406a05c56e508299a026a7467bb7968d4cb16
+  metadata.gz: 6c60e8a7a9abd7e30ff754898e6c332f150133488ab5837cdf030bff483db6b3eda6196bb42a2bb42099104690d2621c1b9ad39580313ff82c66f813043f2843
+  data.tar.gz: 4094561f3f994b0a82ee974f5eba00f6e70fdf219c311534ab070dc5da8f861a4dbe73d67842db2231766a18d0a1721cd13e9a8e46a9910987e450f388f06369

data/CHANGELOG.md

@@ -1,12 +1,21 @@
 ## [Unreleased]
 =======
-*no unreleased changes*
+* no unreleased changes*
+
+## 11.0.2 / 2024-02-06
+### Fixed
+* Resolve Rails 7 deprecation warnings
+* Fix XML parsing with latest `nokogiri` 1.16.0
+
+## 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
 ### Fixed
-* Replace unsupported seven_zip_ruby gem with seven-zip fork
+* Replace unsupported `seven_zip_ruby` gem with seven-zip fork
 
 ## 10.3.0 / 2023-09-07
 ### Added

data/lib/ndr_import/file/excel.rb

@@ -46,7 +46,7 @@ module NdrImport
       end
 
       def cast_excel_datetime_as_date(raw_value)
-        raw_value.to_s(:db)
+        raw_value.to_formatted_s(:db)
       end
 
       private

data/lib/ndr_import/helpers/file/excel.rb

@@ -32,7 +32,7 @@ module NdrImport
         end
 
         def cast_excel_datetime_as_date(raw_value)
-          raw_value.to_s(:db)
+          raw_value.to_formatted_s(:db)
         end
 
         # Iterate through the file table by table, yielding each one in turn.

data/lib/ndr_import/helpers/file/xml.rb

@@ -22,6 +22,11 @@ module NdrImport
           doc = nil
 
           escaping_control_chars_if_necessary(preserve_control_chars, file_data) do
+            if Nokogiri::XML('<?xml version="1.0" encoding="UTF-16"?><body/>').
+               errors.first.message.match?(/Blank needed here\z/)
+              # Nokogiri 1.16.0 workaround for UTF-16 data.
+              file_data.sub!('UTF-16', 'UTF-8')
+            end
             doc = Nokogiri::XML(file_data, &:huge)
             doc.encoding = 'UTF-8'
             emulate_strict_mode_fatal_check!(doc)

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.2'
 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.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: NDR Import