patchwork_csv_utils 0.1.15-x86_64-linux → 0.1.17-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e996387ff4380d6fd613b82146c030db354bba2a6b922b1726c1bbbb41863554
-  data.tar.gz: 88feb5ae5c6847311576c69cc6f9f6dcdd4fedda10acc0adc2303239a59dab9e
+  metadata.gz: f651263457993e883e97d83546cac1a67e20bc27803fb50ae696c7a8cbba01b5
+  data.tar.gz: f2c54d9821a1681f0c4f1558bae989430a10e05fd3e0aa9fb15b111f782faab6
 SHA512:
-  metadata.gz: 558188ef57034619feae637bf5e561660635d656a2724441cc82b53075afef6b5de18035999359d9496ccb354f756048e8d7028936586ed85c0e966efe55ab88
-  data.tar.gz: 60ce7b849799296e6c9afc57c5fcbafa8753b33c2949c5fccd77a1f32c8d39f56eff817ac2fe438299531eef859e33ecaf9c051731778373e11e0c57de0d9a7d
+  metadata.gz: 33405ba1d371558c4d86e2be3ad2d5607764cd7a20c0e5ae00c505392b44587a814d0f1907dcfa9f18cc1be335fa3dde27ac44f407a0b66fa800609432e5377c
+  data.tar.gz: 48d09709995deffa38a6381b43640075b390e6863023aeaf4f4a40b4d385bf02ec626c31b4d4c28fe8cd0b3432928fc8fda3657f70a509be13d75c535373de26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.15)
+    patchwork_csv_utils (0.1.17)
 
 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,6 +1,5 @@
 use std::collections::HashMap;
 use std::fs::File;
-use calamine::Data;
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use csv::{Reader, StringRecord, Writer};
 use magnus::{Error, RArray, Ruby};
@@ -10,7 +9,8 @@ use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error,
 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()));
     }
@@ -41,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)?;
 
@@ -59,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, ri, 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,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/xls.rs

@@ -13,6 +13,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
               exclusions: RArray,
               mandatory_headers: RArray,
               status_exclusions: RArray,
+              expected_trust_name: String,
 ) -> magnus::error::Result<()> {
     if !xls_path.has_extension(&["xls"]) {
         return Err(magnus::Error::new(ruby.exception_standard_error(), "xls_path must be an xls file".to_string()));
@@ -37,14 +38,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"))?;
@@ -53,6 +55,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)?;
 
@@ -66,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))?;
@@ -99,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.15'
+  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.15
+  version: 0.1.17
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-31 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: