ndr_import 11.0.1 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3b3b485a77caed57442e97c7391c4d95b68ee4a9ae5af1a6e53b9a1fd95987
-  data.tar.gz: fbf1799920b70ddcbc6014c269e90a6d3d9689f01a306042ab2cac7152637eff
+  metadata.gz: 1acf9db0301b6da991e890e74db10573ff666dd732eda4b58ba90e03370bb32a
+  data.tar.gz: eba9da2d2d9f5fa98c3a7f8745086f3945c363844f4d1f8fc1dc6c38ab4bcb5b
 SHA512:
-  metadata.gz: b06f9293e925ef74ecb96a1ae24f7732bf057ff6642a29245ad99f51b6bd48d608257575c48a2bbe89a509de1f9db44a457567175e9f3a354840f48fe5d1e92c
-  data.tar.gz: 37c8145eea0bb9f6f1788f202524cd233a7b542088b7d540f5d7d236ca910dcaf950ffd0adf6a4619afb64a6f4b7082c478d90a4b7bf19dba8016b6ab3fba07b
+  metadata.gz: 8509511d4f54f36344e09d380da53f168f8fa94efd4eec2d73e29c80811bd644d853bb82a835bf7ddf2820202b8abad28cbe0d265de3557e2af8adca4f12b178
+  data.tar.gz: 384d8365d4e6ba741bf6b76a1ecfe1bf1bb92c6fd0e737489d2d3a13047d9e557b883c339ff2f89f372071140a071bcbedfdd303b588dda79d58870bab0be2e6

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 ## [Unreleased]
 =======
-*no unreleased changes*
+* no unreleased changes *
+
+## 11.1.0 / 2024-03-07
+### Added
+* XML table should not expect column mappings for empty nodes/elements
+
+## 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
@@ -10,7 +19,7 @@
 ### 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.1'
+  VERSION = '11.1.0'
 end

data/lib/ndr_import/xml/table.rb

@@ -169,6 +169,8 @@ module NdrImport
         xpaths = []
 
         line.xpath('.//*[not(child::*)]').each do |node|
+          next unless populated?(node)
+
           xpath = node.path.sub("#{line.path}/", '')
           if node.attributes.any?
             node.attributes.each_key { |key| xpaths << "#{xpath}/@#{key}" }
@@ -179,6 +181,12 @@ module NdrImport
         xpaths
       end
 
+      def populated?(node)
+        node.element_children.empty? &&
+          !node.is_a?(Nokogiri::XML::Comment) && !node.text? && !node.cdata? &&
+          !(node.attributes.empty? && node.content.strip.blank?)
+      end
+
       def build_xpath_from(column)
         column_name = column_name_from(column)
         column['xml_cell'].presence ? relative_path_from(column, column_name) : column_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 11.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2024-03-07 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.3
 signing_key:
 specification_version: 4
 summary: NDR Import