patchwork_csv_utils 0.1.19-arm64-darwin → 0.1.21-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d84851df3ef3364e26a5af872bb7fe9781c2b05d625baee7c9743a33fe57e4
-  data.tar.gz: 42340e0703f5f0cb1b23263a2a2a091ef2a0de999291575efa30f86552743549
+  metadata.gz: eb9ba1cfb3930c7586b62182de0c6c9a2f1207d186bf1a7a2c578a8cfc294bf7
+  data.tar.gz: aec2801daf163c9de70c96d77aaabf62feaa70483785afed01b12d8546fd069b
 SHA512:
-  metadata.gz: a7dbe612bc5f3bad6b2dd188cdbbd699222792829efdfbe776b3e595e57379fc6d3854a413dcfe5c513c005be8eea58ddf93452cef35c53c641458a08c22d6d5
-  data.tar.gz: b664a10d5db88a5b6e2c0994fb84d398e2406e5b3c59add1f1e52a8078a420a344d4cd9792689084c69d07df9667510d46817398779a2cd71be1763adc712fb7
+  metadata.gz: e79a8ae7df6fb41bfb309d89faf850a9122b60c0754ef58736fabc684964eda9e7b7b2a6a1e6948fd107ede13275ba636d7b4e56212425da35582c1d16a7befc
+  data.tar.gz: e4f7e61799ef6dc6153acb32dd4ecc589671a96e40c95c71e92105ad199a9a6b75f05631a10b6fb13389937c665513ef1d96e6edbf1833bbff3defe174896a68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.19)
+    patchwork_csv_utils (0.1.21)
 
 GEM
   remote: https://rubygems.org/

data/ext/csv_utils/src/lib.rs

@@ -9,7 +9,7 @@ pub mod utils;
 fn init() -> Result<(), magnus::Error> {
     let module = define_module("CsvUtils")?;
     module.define_singleton_method("dedup", function!(dedup, 4))?;
-    module.define_singleton_method("to_csv", function!(to_csv, 6))?;
-    module.define_singleton_method("transform_csv", function!(transform_csv, 6))?;
+    module.define_singleton_method("to_csv", function!(to_csv, 7))?;
+    module.define_singleton_method("transform_csv", function!(transform_csv, 7))?;
     Ok(())
 }

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

@@ -1,16 +1,17 @@
-use std::collections::HashMap;
-use std::fs::File;
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use csv::{Reader, StringRecord, Writer};
 use magnus::{Error, RArray, Ruby};
+use std::collections::HashMap;
+use std::fs::File;
 
-use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error, check_mandatory_headers, create_header_map, missing_value, headers_as_byte_record, index_of_header_in_mandatory_list};
+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,
                      mandatory_headers: RArray,
                      status_exclusions: RArray,
-                     expected_trust_name: String,) -> magnus::error::Result<()> {
+                     expected_trust_name: String,
+                     is_streamed_file: bool) -> magnus::error::Result<()> {
     if !csv_path.has_extension(&["csv"]) {
         return Err(Error::new(ruby.exception_standard_error(), "csv_path must be a csv file".to_string()));
     }
@@ -60,7 +61,9 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
             let column_value = record.get(*column_index).ok_or(missing_value(ruby, column))?;
             let column_value = column_value.trim_end();
 
-            validate_trust_name(ruby, &expected_trust_name, trust_name, ri, i, &column_value.to_string())?;
+            if !is_streamed_file {
+                validate_trust_name(ruby, &expected_trust_name, trust_name, i, &column_value.to_string())?;
+            }
 
             if i == *date {
                 let current = string_to_datetime(column_value).ok_or(to_datetime_error(ruby, column_value, ri, "Date"))?;
@@ -88,10 +91,11 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
 }
 
 
-fn validate_trust_name(ruby: &Ruby, expected_trust_name: &String, trust_name: &usize, ri: usize, i: usize, s: &String) -> magnus::error::Result<()> {
+fn validate_trust_name(ruby: &Ruby, expected_trust_name: &String, trust_name: &usize, i: usize, s: &String) -> magnus::error::Result<()> {
     if i == *trust_name {
+        let s = s.trim();
         if s != &expected_trust_name.clone() {
-            return Err(magnus::Error::new(ruby.exception_standard_error(), format!("Trust actual name: '{}' is not as expected: '{}'", s, expected_trust_name)));
+            return Err(Error::new(ruby.exception_standard_error(), format!("Trust actual name: '{}' is not as expected: '{}'", s, expected_trust_name)));
         }
     }
     Ok(())

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

@@ -2,11 +2,11 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 
-use calamine::{Data, open_workbook, Range, Reader, Xls, open_workbook_auto};
+use calamine::{open_workbook_auto, Data, Range, Reader};
 use chrono::{NaiveDateTime, Timelike, Utc};
 use magnus::{RArray, Ruby};
 
-use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error, check_mandatory_headers, missing_value, index_of_header_in_mandatory_list};
+use crate::utils::{check_mandatory_headers, index_of_header_in_mandatory_list, magnus_err, missing_header, missing_value, to_datetime_error, FileExtension};
 
 pub fn to_csv(ruby: &Ruby, xls_path: String,
               target_path: String,
@@ -14,6 +14,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
               mandatory_headers: RArray,
               status_exclusions: RArray,
               expected_trust_name: String,
+              is_streamed_file: bool
 ) -> magnus::error::Result<()> {
     if !xls_path.has_extension(&["xls","xlsx"]) {
         return Err(magnus::Error::new(ruby.exception_standard_error(), "xls_path must be an xls or xlsx file".to_string()));
@@ -40,7 +41,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
     let csv_out_file = File::create(target_path.clone()).map_err(|e| magnus_err(ruby, e, format!("could not create csv file: {}", target_path).as_str()))?;
     let mut dest = BufWriter::new(csv_out_file);
 
-    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions, expected_trust_name)
+    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions, expected_trust_name, is_streamed_file)
 }
 
 fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
@@ -48,7 +49,8 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
                        mandatory_headers: Vec<String>,
                        headers_list: Vec<String>,
                        status_exclusions: Vec<String>,
-                       expected_trust_name: String) -> magnus::error::Result<()> {
+                       expected_trust_name: String,
+                       is_streamed_file: bool) -> magnus::error::Result<()> {
     let n = mandatory_headers.len() - 1;
     let request_id = header_map.get("Request Id").ok_or(missing_header(ruby, "Request Id"))?;
     let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
@@ -71,7 +73,10 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
         if date_value_is_not_present(&date, &r) {
             return Err(magnus::Error::new(ruby.exception_standard_error(), format!("Date value is not present in row: {}", ri)));
         }
-        validate_trust_name(ruby, &expected_trust_name, trust_name, ri, &r)?;
+
+        if !is_streamed_file {
+            validate_trust_name(ruby, &expected_trust_name, trust_name, ri, &r)?;
+        }
 
         for (i, c) in mandatory_headers.iter().enumerate() {
             let column_index = header_map.get(c).ok_or(missing_header(ruby, c))?;
@@ -147,6 +152,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
 fn validate_trust_name(ruby: &Ruby, expected_trust_name: &String, trust_name: &usize, ri: usize, r: &Vec<&Data>) -> magnus::error::Result<()> {
     if ri > 0 {
         let s = r[*trust_name].to_string();
+        let s = s.trim();
         if s != expected_trust_name.clone() {
             return Err(magnus::Error::new(ruby.exception_standard_error(), format!("Trust actual name: '{}' is not as expected: '{}'", s, expected_trust_name)));
         }

data/lib/csv_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: arm64-darwin
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: