ndr_import 11.4.1 → 11.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126526e53b9a41befd988c332ee181142e5917c491daa0310341e1b9ee9d9728
-  data.tar.gz: 6fa42ce8d1bff9030f13b3498cbd3c783cd73484d04246a5ed2c6c8b48e66b07
+  metadata.gz: c96ccb2b8ec749a6f0b14836b2ba0e9006f50016988447ffd6833471ef2386ac
+  data.tar.gz: f0602bf4c5f5df488261792843951d4c939e7e05249ea818b0ded27172047741
 SHA512:
-  metadata.gz: d2ef81755bc31b84725d3e170ca4b88de89d78b98518eaae72b6e8048ec28ab3b39f01afe2bf61bc31362573d470b576529d8fb614c8e85dffbc5b5da209c5d9
-  data.tar.gz: f12ebb30d9943a653dcd9d97706678f03702072ab2de7e673e002d70c9dc1c113e8c1886b29d3870e2d8c40510ecf1316bd9531c7ea47f4cbaf1df594c7429e8
+  metadata.gz: 0aa09835563161998d8d86165bb94346d71528dbf07ee4830ed19c1887466d2b955a583f8ad5e264ae1bc46c69b4025d844c422de391ce72ef942624721e6b62
+  data.tar.gz: 61c1cb4a0959cdcab990f27120493fedf45e4df3c10e243a853ed77ada29374b33cc5aa0e7ab8a1a93d125e195c1e85d7881657f896c923ef80dbcea585c4a16

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [Unreleased]
+
 *no unreleased changes*
 
+## 11.5.0 / 2026-06-25
+### Fixed
+* Support Rails 8.1, Ruby 4.0. Drop support for Ruby 3.2
+* Allow direct assignment of `table.table_metadata`
+
 ## 11.4.1 / 2025-11-05
 ### Fixed
 * Support Ruby 3.4. Drop support for Ruby 3.0 and 3.1, Rails 6.1 and 7.0

data/SECURITY.md

@@ -0,0 +1,35 @@
+# Security
+
+NHS England takes security and the protection of private data extremely seriously. If you believe you have found a vulnerability or other issue which has compromised or could compromise the security of any of our systems and/or private data managed by our systems, please do not hesitate to contact us using the methods outlined below.
+
+## Table of Contents
+
+- [Security](#security)
+  - [Table of Contents](#table-of-contents)
+  - [Reporting a vulnerability](#reporting-a-vulnerability)
+    - [Email](#email)
+    - [NCSC](#ncsc)
+  - [General Security Enquiries](#general-security-enquiries)
+
+## Reporting a vulnerability
+
+Please note, email is our preferred method of receiving reports.
+
+### Email
+
+If you wish to notify us of a vulnerability via email, please include detailed information on the nature of the vulnerability and any steps required to reproduce it.
+
+You can reach us at:
+
+- [Brian.Shand@nhs.net](mailto:Brian.Shand@nhs.net)
+- [cybersecurity@nhs.net](mailto:cybersecurity@nhs.net)
+
+### NCSC
+
+You can send your report to the National Cyber Security Centre, who will assess your report and pass it on to NHS England if necessary.
+
+You can report vulnerabilities here: [https://www.ncsc.gov.uk/information/vulnerability-reporting](https://www.ncsc.gov.uk/information/vulnerability-reporting)
+
+## General Security Enquiries
+
+If you have general enquiries regarding our cybersecurity, please reach out to us at [cybersecurity@nhs.net](mailto:cybersecurity@nhs.net)

data/lib/ndr_import/table.rb

@@ -11,9 +11,9 @@ module NdrImport
     include NdrImport::Mapper
 
     def self.all_valid_options
-      %w[canonical_name delimiter liberal_parsing filename_pattern file_password last_data_column
-         tablename_pattern header_lines footer_lines format klass columns slurp row_identifier
-         significant_mapped_fields]
+      %w[canonical_name delimiter liberal_parsing filename_pattern file_password
+         last_data_column tablename_pattern header_lines footer_lines
+         format klass columns slurp row_identifier significant_mapped_fields table_metadata]
     end
 
     def all_valid_options

data/lib/ndr_import/universal_importer_helper.rb

@@ -72,7 +72,7 @@ module NdrImport
 
     # This method does the table row yielding for the extract method, setting the notifier
     # so that we can monitor progress
-    def yield_tables_and_their_content(filename, tables, &block)
+    def yield_tables_and_their_content(filename, tables, &)
       return enum_for(:yield_tables_and_their_content, filename, tables) unless block_given?
 
       tables.each do |tablename, table_content, file_metadata|
@@ -80,7 +80,9 @@ module NdrImport
         next if mapping.nil?
 
         mapping.notifier = get_notifier(record_total(filename, table_content))
-        mapping.table_metadata = file_metadata || {}
+        # 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)
       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.4.1'
+  VERSION = '11.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 11.4.1
+  version: 11.5.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -33,7 +33,7 @@ dependencies:
         version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: ndr_support
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +406,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - exe/pdf_acro_form_to_yaml
 - exe/pdf_to_text
 - exe/word_to_text
@@ -472,7 +473,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="