patchwork_csv_utils 0.1.16-x86_64-linux → 0.1.17-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd0a5a1fac5fc48723b28f4b0922ee10468b2bcf26bb6da77a7abdcb9c3882f
-  data.tar.gz: b9be825c7c520ef319c940814863f71e71c41d0ed2be062179e665110dfcb0d6
+  metadata.gz: f651263457993e883e97d83546cac1a67e20bc27803fb50ae696c7a8cbba01b5
+  data.tar.gz: f2c54d9821a1681f0c4f1558bae989430a10e05fd3e0aa9fb15b111f782faab6
 SHA512:
-  metadata.gz: f2419b94893570ef960dd9be99ed2d530b3b8d201b05a8373dd8a5a2b679e6c9f078e26ebc6f8a43f649158e2984ed9c10dad5d8c7ebac80ffe6b927ca2250fc
-  data.tar.gz: bb87188b17f9e95e3cdf7db797cf9ae067bb322151069f70b6caaa7c8749ec9c2ecdb068136c55c0a010a0f67b5de9990192b4ca94fd6ec5b8e0d73da71a2ed9
+  metadata.gz: 33405ba1d371558c4d86e2be3ad2d5607764cd7a20c0e5ae00c505392b44587a814d0f1907dcfa9f18cc1be335fa3dde27ac44f407a0b66fa800609432e5377c
+  data.tar.gz: 48d09709995deffa38a6381b43640075b390e6863023aeaf4f4a40b4d385bf02ec626c31b4d4c28fe8cd0b3432928fc8fda3657f70a509be13d75c535373de26

data/Gemfile.lock

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

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

@@ -4,7 +4,7 @@ use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use csv::{Reader, StringRecord, Writer};
 use magnus::{Error, RArray, Ruby};
 
-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, validate_trust_name};
+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};
 
 pub fn transform_csv(ruby: &Ruby, csv_path: String,
                      target_path: String, exclusions: RArray,
@@ -87,6 +87,16 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
     Ok(())
 }
 
+
+fn validate_trust_name(ruby: &Ruby, expected_trust_name: &String, trust_name: &usize, ri: usize, i: usize, s: &String) -> magnus::error::Result<()> {
+    if i == *trust_name {
+        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)));
+        }
+    }
+    Ok(())
+}
+
 fn get_mandatory_records(ruby: &Ruby, csv: &mut Reader<File>, csv_header_list: &Vec<String>, mandatory_headers_list: &Vec<String>) -> magnus::error::Result<Vec<StringRecord>> {
     let inverse_header_map: HashMap<usize, String> = csv_header_list.iter().enumerate().map(|(i, h)| (i, h.to_string())).collect();
 

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

@@ -9,15 +9,6 @@ pub mod csv;
 pub mod dedup;
 pub mod xls;
 
-fn validate_trust_name(ruby: &Ruby, expected_trust_name: &String, trust_name: &usize, ri: usize, i: usize, s: &String) -> magnus::error::Result<()> {
-    if ri > 0 && i == *trust_name {
-        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)));
-        }
-    }
-    Ok(())
-}
-
 fn missing_header(ruby: &Ruby, header: &str) -> magnus::Error {
     magnus::Error::new(ruby.exception_standard_error(), format!("Missing '{}' header", header))
 }

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

@@ -6,7 +6,7 @@ use calamine::{Data, open_workbook, Range, Reader, Xls};
 use chrono::{NaiveDateTime, 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, validate_trust_name};
+use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error, check_mandatory_headers, missing_value, index_of_header_in_mandatory_list};
 
 pub fn to_csv(ruby: &Ruby, xls_path: String,
               target_path: String,
@@ -69,6 +69,7 @@ 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)?;
 
         for (i, c) in mandatory_headers.iter().enumerate() {
             let column_index = header_map.get(c).ok_or(missing_header(ruby, c))?;
@@ -77,7 +78,6 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
             match *c {
                 Data::Empty => Ok(()),
                 Data::String(ref s) | Data::DateTimeIso(ref s) | Data::DurationIso(ref s) => {
-                    validate_trust_name(ruby, &expected_trust_name, trust_name, ri, i, s)?;
                     handle_commas(dest, s)
                 }
                 Data::Float(ref f) => write!(dest, "{}", f),
@@ -103,6 +103,16 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
     Ok(())
 }
 
+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();
+        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)));
+        }
+    }
+    Ok(())
+}
+
 fn get_mandatory_records<'a>(ruby: &Ruby, range: &'a Range<Data>, csv_header_list: &Vec<String>, mandatory_headers_list: &Vec<String>) -> magnus::error::Result<Vec<Vec<&'a Data>>> {
     let inverse_header_map: HashMap<usize, String> = csv_header_list.iter().enumerate().map(|(i, h)| (i, h.to_string())).collect();
 

data/lib/csv_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: