patchwork_csv_utils 0.1.19-arm64-darwin → 0.1.20-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d84851df3ef3364e26a5af872bb7fe9781c2b05d625baee7c9743a33fe57e4
-  data.tar.gz: 42340e0703f5f0cb1b23263a2a2a091ef2a0de999291575efa30f86552743549
+  metadata.gz: 5963fbd06904a0d616f477d98322a0f44bae1e3d08e98c6320c30465ce09078f
+  data.tar.gz: f7664eeb3db7208beb529807037867e68b275a15a277957ae8dc70d7b0dab2be
 SHA512:
-  metadata.gz: a7dbe612bc5f3bad6b2dd188cdbbd699222792829efdfbe776b3e595e57379fc6d3854a413dcfe5c513c005be8eea58ddf93452cef35c53c641458a08c22d6d5
-  data.tar.gz: b664a10d5db88a5b6e2c0994fb84d398e2406e5b3c59add1f1e52a8078a420a344d4cd9792689084c69d07df9667510d46817398779a2cd71be1763adc712fb7
+  metadata.gz: 9b7a1e4b63f59b710dd7404b6197a7ec3176df61e9b8ddac39620195ab2b75e1abdf443d39e69192fd5cb93cd641a9b31e41cade5128c57b1f15fb148f350aa2
+  data.tar.gz: 361761b70a831d47762c53655d6073ccba6854ecf5184e76c6c948914ebf10e7c3ae002916f14227773366ce9cfd8593fb6492c6719045d761c2d5d7e57e2407

data/Gemfile.lock

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

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

@@ -1,10 +1,10 @@
-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,
@@ -60,7 +60,7 @@ 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())?;
+            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"))?;
@@ -88,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,11 +2,11 @@ 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,
@@ -147,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.19'
+  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.19
+  version: 0.1.20
 platform: arm64-darwin
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-04 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: