patchwork_csv_utils 0.1.21-aarch64-linux → 0.1.22-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca603756d24698f85aee053ff0d3684216d2b209c246ae46d695864f9b69229
-  data.tar.gz: 3077975203564e253de4ec9968611d58f3d486e9a16100ebe2df913fc1d5fe26
+  metadata.gz: f47a66e8363f4700e55172d0d4782391fbf15356853399996637731cd81f1f26
+  data.tar.gz: cf21b536ed09c1991099f6fa995b2143566786288f9a74e0751cf80bae27f9d8
 SHA512:
-  metadata.gz: 177c8082986e0e48ab4852f11fd082475117cd0aef6c13fbf44951ca9f6712202b641224a070f339fb288c0c264aec5d0a9a9df711c1e8e3bdc0905dc751b53b
-  data.tar.gz: f6132a683eede976ae4788bb9126322e2de9b262d9c1ef4ac6d63b9a402a66e98d72dbe4f2269e3c40650519145903791cf4929c642a3d0e8c38f008644adbed
+  metadata.gz: c1544d5660c24abd3fa55ad574026c8a0dc4643f5f3b09dc1276d00d28a229d06e5a4531f24f26595926e2c6d063be78e2d3561d96c2adf8b0c61db773b254e4
+  data.tar.gz: 645a6abb5c5e42f0466a2113055fae71ae03cf8b6001d2c03f82928852364d2f41c8cdddacd165433649f2b2d8fafebf11e7b41fa5aeaec3fa8b47209ec0f4ce

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.21)
+    patchwork_csv_utils (0.1.22)
 
 GEM
   remote: https://rubygems.org/
@@ -56,6 +56,7 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

data/ext/csv_utils/src/utils/csv.rs

@@ -6,8 +6,10 @@ use std::fs::File;
 
 use crate::utils::{check_mandatory_headers, create_header_map, headers_as_byte_record, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, to_datetime_error, FileExtension};
 
-pub fn transform_csv(ruby: &Ruby, csv_path: String,
-                     target_path: String, exclusions: RArray,
+pub fn transform_csv(ruby: &Ruby,
+                     csv_path: String,
+                     target_path: String,
+                     exclusions: RArray,
                      mandatory_headers: RArray,
                      status_exclusions: RArray,
                      expected_trust_name: String,
@@ -48,7 +50,7 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
 
     for (ri, record) in mandatory_records.iter().enumerate() {
 
-        if skip_excluded_rows(request_id, &record, &exclusions) { continue; }
+        if skip_excluded_rows(request_id, &status, &record, &exclusions) { continue; }
         if skip_excluded_status_rows(&status, &record, &status_exclusions) { continue; }
         if has_empty_row_skip(&record) { continue; }
         if has_empty_first_col_skip_row(&record) { continue; }
@@ -140,7 +142,15 @@ fn get_column_name(inverse_header_map: &HashMap<usize, String>, i: &usize) -> St
     column_name.to_string()
 }
 
-fn skip_excluded_rows(request_id: &usize, r: &StringRecord, exclusions: &Vec<String>) -> bool {
+fn skip_excluded_rows(request_id: &usize, status: &Option<&usize>, r: &StringRecord, exclusions: &Vec<String>) -> bool {
+    if let Some(status_index) = status {
+        if let Some(status) = r.get(**status_index) {
+            if status.eq("Recalled") {
+                return false
+            }
+        }
+    }
+
     let value = r.get(*request_id).unwrap_or_default();
     exclusions.contains(&value.to_string())
 }

data/ext/csv_utils/src/utils/xls.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 
-use calamine::{open_workbook_auto, Data, Range, Reader};
+use calamine::{open_workbook_auto, Data, DataType, Range, Reader};
 use chrono::{NaiveDateTime, Timelike, Utc};
 use magnus::{RArray, Ruby};
 
@@ -66,7 +66,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
     for (ri, r) in mandatory_rows.into_iter().enumerate() {
         let mut date_value = Utc::now().naive_utc();
 
-        if skip_excluded_rows(&request_id, &r, &exclusions) { continue; }
+        if skip_excluded_rows(&request_id, &status, &r, &exclusions) { continue; }
         if skip_excluded_status_rows(&status, &r, &status_exclusions) { continue; }
         if skip_empty_rows(&r) { continue; }
         if skip_rows_with_no_request_id(&request_id, &r) { continue; }
@@ -185,7 +185,17 @@ fn date_value_is_not_present(date: &usize, r: &Vec<&Data>) -> bool {
     r[*date] == &Data::Empty
 }
 
-fn skip_excluded_rows(request_id: &usize, r: &Vec<&Data>, exclusions: &Vec<String>) -> bool {
+fn skip_excluded_rows(request_id: &usize, status: &Option<&usize>, r: &Vec<&Data>, exclusions: &Vec<String>) -> bool {
+    if let Some(status_index) = status {
+        if let Some(status) = r.get(**status_index) {
+            if let Some(status_str) = status.as_string() {
+                if status_str.eq("Recalled") {
+                    return false
+                }
+            }
+        }
+    }
+
     let value = r[*request_id].to_string();
     exclusions.contains(&value.to_string())
 }

data/lib/csv_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CsvUtils
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: aarch64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email:
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Cargo.lock
 - Cargo.toml
 - Gemfile