patchwork_csv_utils 0.1.21-x86_64-linux → 0.1.22-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05919ff686082e5b6623d95609a88ce8becf427d84ac5fd5b75f25fb805a886a'
-  data.tar.gz: 18a5291b26af0ab431f1ff0bcd7954459292caaaefee3c7c2eb71de89921aa5a
+  metadata.gz: 5b284ba3c70cec13c91ba655fb13145182d8da5bcc80c018a388eb630bc27865
+  data.tar.gz: 4bc87184786c705c5fe022e169bcd9f17243314f96a3c4a5c8132ca45a11330d
 SHA512:
-  metadata.gz: c2efa877128736c0a0e889a69b043f0736659ccb1adb7b37c883c05d636d8edeed74419437cc32e10c8ff625520d32f8c795a356bce93f61234b3885ca9011f9
-  data.tar.gz: 4562c3b6c7f4ed1abecc39e88465bcdff1a5689a4995ce6b42dac8623c07d7fa47736936e2f7df818281b8800e4764b40a93f6c53a7c57e607a92cdae08476d0
+  metadata.gz: 75133438e59bf485be49345ca0f9e6cb3ec3c60a85036069b2a6e0757bb9d326cc989f4d7ed822993ad1b50bcbea4e19f7e32f86dc4e995ff0964e94e3c8d092
+  data.tar.gz: c91c751ac4af03e02628fff0616c7da7d64d57bf57bec384a5799869b7f5fda1edb4550b80c7761f56227b83f6349eddf9b2ae0f8f4a6b80b75046a4a5c3645b

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: x86_64-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