ndr_import 10.1.1 → 10.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2463ac35899a6db81e345b75b0ea10186530f559460dfca1211ba7694f52b760
-  data.tar.gz: 2f2cf39e959beeb3cfe6bcad033eb2c0695486dce3b640fe3de8b0c2b9b88a2f
+  metadata.gz: '0080a6cf08b7832f1af6261ff2c774a0fd8629b02c363869ac852389f239731c'
+  data.tar.gz: f1f986e3e1d59d65cb260cd555e5c17716228cc3ba61ff58fc2df40fc9abb19e
 SHA512:
-  metadata.gz: c6eca601043ff01ebe910375a36131bdf55ebd3f18664e3db3c07180f007b0f06dc50cc3016634a12764befc1e28d621a09a7b382392f67608aa4d21c83c7f2d
-  data.tar.gz: dc568494bfc4b39b7ee47c7738511274cb85ad9532e380f3c27870682a1a21d2acda4d7d8d855597abdd0643b8afe0ed6e161b74f201fa53640b5c9641f895c5
+  metadata.gz: bf67d9b21781db778b92e245af52182dab5e1cc41d1637a87f82df953aaeae017fc14254b3e3caa3dcb9e6459489e3661f5610277f04af79e6aaedd00109b299
+  data.tar.gz: '08dc2fe4d3dc4b0dcd34cc361285f04eeacf11afb244fc117d1b6abc125218305f092676c89b94547aa9f6711bcc9682671a74e0c5ed39714e8651b98ad9dfc6'

data/.github/workflows/test.yml

@@ -1,6 +1,13 @@
 name: Test
 
-on: [push]
+on:
+  # Run on all master branch commits
+  push:
+    branches:
+      - master
+
+  # Run against all PRs (from the main repo, or forks)
+  pull_request:
 
 jobs:
   test:

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 10.1.2 / 2021-09-28
+### Fixed
+* Bump to `nokogiri` to address CVE-2021-41098
+* Bump `seven_zip_ruby` requirement for Ruby 2.7 support
+
 ## 10.1.1 / 2021-03-15
 ### Fixed
 * XML: ensure invalid control character *references* are also escaped (#64)

data/code_safety.yml

@@ -10,8 +10,8 @@ file safety:
     safe_revision: b64ff21375dcde2b8fefe622ee9861f0fea21487
   ".github/workflows/test.yml":
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: b64ff21375dcde2b8fefe622ee9861f0fea21487
+    reviewed_by: ollietulllch
+    safe_revision: c3dd24e8abefe61f04fa9d3bb71ec9d0ac109bbe
   ".gitignore":
     comments: whole file re-reviewed
     reviewed_by: josh.pencheon
@@ -26,8 +26,8 @@ file safety:
     safe_revision: b09e268ff9c8349b914aa1b7ba888e1d39f97e4a
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 47fa3633ec2e48f1ee9fb12aad03e817e73c54bf
+    reviewed_by: ollietulloch
+    safe_revision: e938689d115b75074313541ec9d6b2bc60475add
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -67,7 +67,7 @@ file safety:
   docs/Gemfile.lock:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: ea0149c7739676463a252ffd9fbe4af238762b2b
+    safe_revision: 75877ddc14e99a10e5e751b7034964a9c7a9d1ef
   docs/_config.yml:
     comments: 
     reviewed_by: josh.pencheon
@@ -279,8 +279,8 @@ file safety:
     safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
   lib/ndr_import/non_tabular/table.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: f9df064adcfd38f09d83ad8c5496c84188faed98
+    reviewed_by: ollietulloch
+    safe_revision: 66cff59af2f078152f7459c436d51b57cb93f28e
   lib/ndr_import/non_tabular_file_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -295,8 +295,8 @@ file safety:
     safe_revision: 3c7f827d17aacbf7b811eea67e27553f3b039070
   lib/ndr_import/table.rb:
     comments: uses File.basename
-    reviewed_by: josh.pencheon
-    safe_revision: 3cf7473181f7f835b3dfe7822f6833d751805eaf
+    reviewed_by: ollietulloch
+    safe_revision: 66cff59af2f078152f7459c436d51b57cb93f28e
   lib/ndr_import/universal_importer_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -307,8 +307,8 @@ file safety:
     safe_revision: 5cd2cd0b3a1e254d30d4acc28c6731825a1f84f5
   lib/ndr_import/version.rb:
     comments: another check?
-    reviewed_by: josh.pencheon
-    safe_revision: 47fa3633ec2e48f1ee9fb12aad03e817e73c54bf
+    reviewed_by: ollietulloch
+    safe_revision: da0aed5e8a8659c5f70254f6d76264f8e780d835
   lib/ndr_import/xml/control_char_escaper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -319,8 +319,8 @@ file safety:
     safe_revision: 4ab72f84201c2d5f0147b7dfd041f488f6ff0422
   ndr_import.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 95e6ee9997d06471fe6f2f169c3c701471086371
+    reviewed_by: ollietulloch
+    safe_revision: 3b437f0ca271fa962121edecd4559017c2446a3a
   test/csv_library_test.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -667,5 +667,5 @@ file safety:
     safe_revision: 9a6cc769abce5f9bfa5b4f8bd5cda52dfe18b12b
   test/xml/table_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 4ab72f84201c2d5f0147b7dfd041f488f6ff0422
+    reviewed_by: ollietulloch
+    safe_revision: 66cff59af2f078152f7459c436d51b57cb93f28e

data/lib/ndr_import/non_tabular/table.rb

@@ -17,7 +17,7 @@ module NdrImport
       include UTF8Encoding
 
       TABULAR_ONLY_OPTIONS = %w[delimiter last_data_column liberal_parsing tablename_pattern
-                                header_lines footer_lines xml_record_xpath].freeze
+                                header_lines footer_lines xml_record_xpath slurp].freeze
 
       NON_TABULAR_OPTIONS = %w[capture_end_line capture_start_line start_line_pattern
                                end_line_pattern remove_lines start_in_a_record

data/lib/ndr_import/table.rb

@@ -11,7 +11,7 @@ module NdrImport
 
     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 xml_record_xpath
+         tablename_pattern header_lines footer_lines format klass columns xml_record_xpath slurp
          row_identifier]
     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 = '10.1.1'
+  VERSION = '10.1.2'
 end

data/ndr_import.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ooxml_decrypt'
   spec.add_dependency 'pdf-reader', '~> 2.1'
   spec.add_dependency 'roo-xls'
-  spec.add_dependency 'seven_zip_ruby', '~> 1.2'
+  spec.add_dependency 'seven_zip_ruby', '~> 1.3'
   spec.add_dependency 'spreadsheet', '1.2.6'
 
   spec.required_ruby_version = '>= 2.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 10.1.1
+  version: 10.1.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -188,14 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement