patchwork_csv_utils 0.1.20-x86_64-linux → 0.1.21-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b55f28de4e8edc679fdef4dbe72c9dbca5a61d6d66d836afad18aa74fa8929e
-  data.tar.gz: fa95157d02d5b4efad84f98deac9d13d85ce9af880435185bd40875e144aff0c
+  metadata.gz: '05919ff686082e5b6623d95609a88ce8becf427d84ac5fd5b75f25fb805a886a'
+  data.tar.gz: 18a5291b26af0ab431f1ff0bcd7954459292caaaefee3c7c2eb71de89921aa5a
 SHA512:
-  metadata.gz: 9f1735171dadf789156570f968a12dccff8091249329845383ef5915cb443530c0c78d01e9613e2a2cc5e918118760d4365dca7cdadde2780df3b33e0d205794
-  data.tar.gz: aa8be283c479af4ab01571a3f93d32cd2debced7f901eb5de803ad89303a43b607976a00c2f1d688f428325cb3d19d67d5fb022465414649ca6ace3f0a67f484
+  metadata.gz: c2efa877128736c0a0e889a69b043f0736659ccb1adb7b37c883c05d636d8edeed74419437cc32e10c8ff625520d32f8c795a356bce93f61234b3885ca9011f9
+  data.tar.gz: 4562c3b6c7f4ed1abecc39e88465bcdff1a5689a4995ce6b42dac8623c07d7fa47736936e2f7df818281b8800e4764b40a93f6c53a7c57e607a92cdae08476d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.20)
+    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

@@ -10,7 +10,8 @@ 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, 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"))?;

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

@@ -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))?;

data/lib/csv_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CsvUtils
-  VERSION = '0.1.20'
+  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.20
+  version: 0.1.21
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-05 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: