patchwork_csv_utils 0.1.18-x86_64-darwin → 0.1.20-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2093c7f1cfa6dd2f47a396db761689368dc2b3db8808c701865ccdeb03bbb4e9
-  data.tar.gz: f569e92156d8de5bbdd2046faa8c7ebc5df13c664064b1242f0d9cc73c7b4c2a
+  metadata.gz: cdf477614b412f9458bb7e3872f2445b8158aff33ea38ca7981f97009acd90cc
+  data.tar.gz: 9efc964090af17af18c8dc570f451b9e82de775bb9fb8c1414c54a4ba299db12
 SHA512:
-  metadata.gz: 6ba6857a9248f637a833e971e6b69765ea856aa7ea62d13ffeb7d8ef161694a8b6f1b6f87d1d1b48924ffbad93c66ffa2ae234e3fd45d92c70a8f30271da4e09
-  data.tar.gz: 477e67ef185683b93eb3a06f06e288536bb0e5bfc4ac5688fdbca720792378a2d02d20338484ed06289feafcaf96b162a9ad96feddaf913d0d56966727ab730b
+  metadata.gz: b7b9fa6efe358fd8769ab3b16fb7a9c1cbe18bb7330439e9c8c01110c861434cca94df136516d073a5a37b2260887c9d4bdf6c92a7ef92656d6f4a4627486a28
+  data.tar.gz: e2bd9b85b3277938ed6fddf211e9572399165dd8be8d078da6b0ebe48a8870428fa53448e6991f60a040f3141383b754e69272b4eab40e5d4bd425f667c8efbd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.18)
+    patchwork_csv_utils (0.1.20)
 
 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, 5))?;
-    module.define_singleton_method("transform_csv", function!(transform_csv, 5))?;
+    module.define_singleton_method("to_csv", function!(to_csv, 6))?;
+    module.define_singleton_method("transform_csv", function!(transform_csv, 6))?;
     Ok(())
 }

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

@@ -1,15 +1,16 @@
-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) -> magnus::error::Result<()> {
+                     status_exclusions: RArray,
+                     expected_trust_name: String,) -> 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()));
     }
@@ -40,6 +41,7 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
     let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
     let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
     let status = header_map.get("Status");
+    let trust_name = header_map.get("Trust").ok_or(missing_header(ruby, "Trust"))?;
 
     let mandatory_records = get_mandatory_records(&ruby, &mut csv, &headers_list, &mandatory_headers)?;
 
@@ -58,6 +60,8 @@ 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 i == *date {
                 let current = string_to_datetime(column_value).ok_or(to_datetime_error(ruby, column_value, ri, "Date"))?;
                 date_value = current;
@@ -84,10 +88,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,17 +2,18 @@ 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,
               exclusions: RArray,
               mandatory_headers: RArray,
               status_exclusions: RArray,
+              expected_trust_name: String,
 ) -> 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()));
@@ -22,11 +23,9 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
     let mandatory_headers: Vec<String> = RArray::to_vec(mandatory_headers)?;
     let status_exclusions = RArray::to_vec(status_exclusions)?;
 
-
     let mut workbook = open_workbook_auto(&xls_path)
         .map_err(|e| magnus_err(ruby, e, format!("could not open workbook: {}", xls_path).as_str()))?;
 
-
     let range = workbook.worksheet_range_at(0)
         .ok_or(magnus::Error::new(ruby.exception_standard_error(), "no worksheet found in xls".to_string()))
         .and_then(|r| r.map_err(|e| magnus_err(ruby, e, "could not read worksheet range")))?;
@@ -41,14 +40,15 @@ 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)
+    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions, expected_trust_name)
 }
 
 fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
                        header_map: HashMap<String, usize>, exclusions: Vec<String>,
                        mandatory_headers: Vec<String>,
                        headers_list: Vec<String>,
-                       status_exclusions: Vec<String>) -> magnus::error::Result<()> {
+                       status_exclusions: Vec<String>,
+                       expected_trust_name: String) -> 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"))?;
@@ -57,6 +57,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
     let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
     let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
     let status = header_map.get("Status");
+    let trust_name = header_map.get("Trust").ok_or(missing_header(ruby, "Trust"))?;
 
     let mandatory_rows = get_mandatory_records(ruby, range, &headers_list, &mandatory_headers)?;
 
@@ -70,7 +71,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)?;
+        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))?;
@@ -146,6 +147,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.18'
+  VERSION = '0.1.20'
 end

metadata

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