patchwork_csv_utils 0.1.14-aarch64-linux → 0.1.16-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422d2afff63c53510b9a1bb0c88247f744f9d5f9069d95826a3e08f4fcbf2fa4
-  data.tar.gz: 6bdd3003161ce3be0a7a5eae1063246652655f3cbe0eab8bb141b159ec95c7b3
+  metadata.gz: 303f1fba53339dc1c5a34072eec44649460de79d8d594f3a59a9a656d302d63c
+  data.tar.gz: 4c41792380ad3da07de17b366b09b934063dfa660e7b6b3b165b39e53f80dcb3
 SHA512:
-  metadata.gz: 8225046c33463cabea12bc3cf36c50b9a7cb729586df4df54f05b37d46df70989ee881afc2251cf0a645ec87279847688c36f9be6dd2f168450841622529ef70
-  data.tar.gz: 3177cfa282238919c6e81f40f000cc24b6f4c797c3890c2f4b757979c95e05b12119d876a164c62cba03c27ffd7a8c4b4f9f122b22d6dfe5ea69bb3d2846f635
+  metadata.gz: 0d9938712374b5409eafcd42eebcaa21b0fe220f4198aab91e3da44cf3052c4a5baf9c90e34b307c542de4667a1edeb7f1d64025061fe27d5a693b85900f1b67
+  data.tar.gz: d11877e4bc89460b2090f4f1853ef3b82403ff744b3b55ad1ec7a4aea961b42ed38d4f121f36f4ed647f7af0cc9e88ba338b969f8d71146939a706b9bbbcbfb1

data/Gemfile.lock

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

data/README.md

@@ -14,8 +14,8 @@ gem install patchwork_csv_utils
 ```irb
 require 'csv_utils'
 CsvUtils.dedup('file1.csv', 'file2.csv', 'output.csv', ['mandatory_headers'])
-CsvUtils.to_csv('file1.xls', 'output_file1.csv', ['request_ids_to_skip'], ['mandatory_headers'])
-CsvUtils.transform_csv('file1.xls', 'output_file1.csv', ['request_ids_to_skip'], ['mandatory_headers'])
+CsvUtils.to_csv('file1.xls', 'output_file1.csv', ['request_ids_to_skip'], ['mandatory_headers'], ['status_exclusions'])
+CsvUtils.transform_csv('file1.xls', 'output_file1.csv', ['request_ids_to_skip'], ['mandatory_headers'], ['status_exclusions'])
 ```
 
 ## Release

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, 4))?;
-    module.define_singleton_method("transform_csv", function!(transform_csv, 4))?;
+    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,20 +1,22 @@
 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 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::{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};
 
 pub fn transform_csv(ruby: &Ruby, csv_path: String,
                      target_path: String, exclusions: RArray,
-                     mandatory_headers: RArray, ) -> magnus::error::Result<()> {
+                     mandatory_headers: RArray,
+                     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()));
     }
 
     let exclusions = RArray::to_vec(exclusions)?;
+    let status_exclusions = RArray::to_vec(status_exclusions)?;
     let mandatory_headers: Vec<String> = RArray::to_vec(mandatory_headers)?;
 
     let csv_file = File::open(csv_path).map_err(|e| magnus_err(ruby, e, "csv_path"))?;
@@ -38,12 +40,15 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String,
     let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
     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)?;
 
     for (ri, record) in mandatory_records.iter().enumerate() {
 
         if skip_excluded_rows(request_id, &record, &exclusions) { continue; }
+        if skip_excluded_status_rows(&status, &record, &status_exclusions) { continue; }
         if has_empty_row_skip(&record) { continue; }
         if has_empty_first_col_skip_row(&record) { continue; }
 
@@ -55,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;
@@ -124,6 +131,12 @@ fn skip_excluded_rows(request_id: &usize, r: &StringRecord, exclusions: &Vec<Str
     exclusions.contains(&value.to_string())
 }
 
+fn skip_excluded_status_rows(status: &Option<&usize>, r: &StringRecord, exclusions: &Vec<String>) -> bool {
+    status
+        .map(|index| exclusions.contains(&r[*index].to_string()))
+        .unwrap_or(false)
+}
+
 fn string_to_datetime(s: &str) -> Option<NaiveDateTime> {
     let maybe_correct = correct_datetime(s);
     if maybe_correct.is_some() { return maybe_correct; }

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

@@ -9,6 +9,15 @@ 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,12 +6,14 @@ 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};
+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};
 
 pub fn to_csv(ruby: &Ruby, xls_path: String,
               target_path: String,
               exclusions: RArray,
-              mandatory_headers: 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()));
@@ -19,6 +21,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
 
     let exclusions = RArray::to_vec(exclusions)?;
     let mandatory_headers: Vec<String> = RArray::to_vec(mandatory_headers)?;
+    let status_exclusions = RArray::to_vec(status_exclusions)?;
 
     let mut workbook: Xls<_> = open_workbook(xls_path.clone()).map_err(|e| magnus_err(ruby, e, format!("could not open xls: {}", xls_path).as_str()))?;
     let range = workbook.worksheet_range_at(0)
@@ -26,7 +29,7 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
         .and_then(|r| r.map_err(|e| magnus_err(ruby, e, "could not read worksheet range")))?;
 
     let headers = range.headers().ok_or(magnus::Error::new(ruby.exception_standard_error(), "no headers found in xls".to_string()))?;
-    let headers_list : Vec<String> = headers.iter().map(|h| h.to_string()).collect();
+    let headers_list: Vec<String> = headers.iter().map(|h| h.to_string()).collect();
 
     if let Some(value) =
         check_mandatory_headers(ruby, &headers_list, &mandatory_headers, "csv") { return value; }
@@ -35,13 +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)
+    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>) -> magnus::error::Result<()> {
+                       headers_list: Vec<String>,
+                       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"))?;
@@ -49,6 +54,8 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
     let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
     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)?;
 
@@ -56,6 +63,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
         let mut date_value = Utc::now().naive_utc();
 
         if skip_excluded_rows(&request_id, &r, &exclusions) { continue; }
+        if skip_excluded_status_rows(&status, &r, &status_exclusions) { continue; }
         if skip_empty_rows(&r) { continue; }
         if skip_rows_with_no_request_id(&request_id, &r) { continue; }
         if date_value_is_not_present(&date, &r) {
@@ -63,13 +71,13 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
         }
 
         for (i, c) in mandatory_headers.iter().enumerate() {
-
             let column_index = header_map.get(c).ok_or(missing_header(ruby, c))?;
             let c = r.get(*column_index).ok_or(missing_value(ruby, c))?;
 
             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),
@@ -125,6 +133,12 @@ fn skip_excluded_rows(request_id: &usize, r: &Vec<&Data>, exclusions: &Vec<Strin
     exclusions.contains(&value.to_string())
 }
 
+fn skip_excluded_status_rows(status: &Option<&usize>, r: &Vec<&Data>, exclusions: &Vec<String>) -> bool {
+    status
+        .map(|index| exclusions.contains(&r[*index].to_string()))
+        .unwrap_or(false)
+}
+
 fn skip_empty_rows(r: &Vec<&Data>) -> bool {
     r.into_iter().all(|c| c == &&Data::Empty)
 }

data/lib/csv_utils/version.rb

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

metadata

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