patchwork_csv_utils 0.1.18-aarch64-linux → 0.1.19-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c402fe95d5858f8b8b66502e10fa977ff7ad157c9f1e5135a90016c4ccc1ad4
-  data.tar.gz: 579c14c8945599bd049ec74134b7e44dd52d5f4a02aba9b8d86fc4cac9465f4a
+  metadata.gz: fa54e06aaf8f6362bd81907cb306fc9ea9902eb3d5b982bdbae1072aacf45900
+  data.tar.gz: 8170940b29f5645a025f9d26cb993c164a55420e743baa5f02625eddd3007311
 SHA512:
-  metadata.gz: c446558ecc285ef89e96e37e3e84d81373125f759cdaf1a28961a605299da845933316c26f98e12f69bb1af3c9d589586b621dce1f1056c12b606ecd5c5c5624
-  data.tar.gz: 3dd424cbae55b66aa5af594b40a9bc6efd873974dbd1e49494e34e6193ad522f8cfde9725b7170104d283cff0402827835f2f1689d7820cbadd5e2564e3e3f3e
+  metadata.gz: d763fe6736161b6cddccd6903f9dbdde639a61c2fd47b5693d88d77a6a702e266bcbd626acf4ed6357c4c6dcc7f35c46848ad4c7e9bdee07c0331e488ccb96a5
+  data.tar.gz: c288c9298ca2944a485dff58a2553933f85c25383919301a311b56878ebfeb5c2476920de77f78fc1aa86fc554781ddf8bf4ba25e0d5ff641c6489784f7560f0

data/Gemfile.lock

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

@@ -9,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()));
     }
@@ -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, 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;

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","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))?;

data/lib/csv_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CsvUtils
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 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.19
 platform: aarch64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: