patchwork_csv_utils 0.1.17-x86_64-darwin → 0.1.18-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439ab3bf8ec06c55a28602b5b64ece16308e0c9d568e067f7c1a541537e310c2
-  data.tar.gz: 953bc26c08024b45fbf3ca37f4b4d3b8c583497c58f7218933fe57a9238252d5
+  metadata.gz: 2093c7f1cfa6dd2f47a396db761689368dc2b3db8808c701865ccdeb03bbb4e9
+  data.tar.gz: f569e92156d8de5bbdd2046faa8c7ebc5df13c664064b1242f0d9cc73c7b4c2a
 SHA512:
-  metadata.gz: d1fa09fa1933d6071fd402c3e34000d8fdd3697a13385e65a5b67659845fddaf93a0fdf629b21fe6ac3023412279fdb5f94d3b34d80ff84bf4af46607ae596cf
-  data.tar.gz: ce7a9d68c134d74e7296e38122976e5d0e3b10263d0e5cc538486e903ae2df479bf5e2d24a4dc765fa0b6ed0b4bb803f583d91423f4eb94e4550201cade08b0d
+  metadata.gz: 6ba6857a9248f637a833e971e6b69765ea856aa7ea62d13ffeb7d8ef161694a8b6f1b6f87d1d1b48924ffbad93c66ffa2ae234e3fd45d92c70a8f30271da4e09
+  data.tar.gz: 477e67ef185683b93eb3a06f06e288536bb0e5bfc4ac5688fdbca720792378a2d02d20338484ed06289feafcaf96b162a9ad96feddaf913d0d56966727ab730b

data/Gemfile.lock

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

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

@@ -9,8 +9,7 @@ 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,
-                     expected_trust_name: String,) -> magnus::error::Result<()> {
+                     status_exclusions: RArray) -> 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,7 +40,6 @@ 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)?;
 
@@ -60,8 +58,6 @@ 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/mod.rs

@@ -65,6 +65,7 @@ fn create_header_map(headers: &Vec<String>) -> HashMap<String, usize> {
 
 pub trait FileExtension {
     fn has_extension<S: AsRef<str>>(&self, extensions: &[S]) -> bool;
+    fn extension(&self) -> Option<&str>;
 }
 
 impl<P: AsRef<Path>> FileExtension for P {
@@ -77,5 +78,8 @@ impl<P: AsRef<Path>> FileExtension for P {
 
         false
     }
+    fn extension(&self) -> Option<&str> {
+        self.as_ref().extension().and_then(OsStr::to_str)
+    }
 }
 

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

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 
-use calamine::{Data, open_workbook, Range, Reader, Xls};
-use chrono::{NaiveDateTime, Utc};
+use calamine::{Data, open_workbook, Range, Reader, Xls, open_workbook_auto};
+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};
@@ -13,17 +13,20 @@ 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()));
+    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()));
     }
 
     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 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")))?;
@@ -38,15 +41,14 @@ 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, expected_trust_name)
+    write_csv(ruby, &mut dest, &range, header_map, exclusions, mandatory_headers, headers_list, status_exclusions)
 }
 
 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>,
-                       expected_trust_name: String) -> magnus::error::Result<()> {
+                       status_exclusions: Vec<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"))?;
@@ -55,7 +57,6 @@ 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)?;
 
@@ -69,7 +70,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))?;
@@ -77,10 +78,49 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>,
 
             match *c {
                 Data::Empty => Ok(()),
-                Data::String(ref s) | Data::DateTimeIso(ref s) | Data::DurationIso(ref s) => {
+                Data::String(ref s) | Data::DurationIso(ref s) => {
                     handle_commas(dest, s)
                 }
                 Data::Float(ref f) => write!(dest, "{}", f),
+                Data::DateTimeIso(ref s) => {
+                    // Normalize the string to ensure manageable precision
+                    let normalized_s = if s.contains('.') {
+                        let parts: Vec<&str> = s.split('.').collect();
+                        format!("{}.{}", parts[0], &parts[1][..std::cmp::min(parts[1].len(), 6)]) // Keep up to 6 fractional seconds
+                    } else {
+                        s.to_string()
+                    };
+
+                    // Attempt to parse the normalized string as a full datetime
+                    let mut current = NaiveDateTime::parse_from_str(&normalized_s, "%Y-%m-%dT%H:%M:%S%.f")
+                        .or_else(|_| {
+                            // If parsing as datetime fails, try parsing as date-only
+                            NaiveDateTime::parse_from_str(&format!("{}T00:00:00", normalized_s), "%Y-%m-%dT%H:%M:%S%.f")
+                        })
+                        .or_else(|_| {
+                            // If parsing as time-only fails, try parsing as time-only
+                            NaiveDateTime::parse_from_str(&format!("1970-01-01T{}", normalized_s), "%Y-%m-%dT%H:%M:%S%.f")
+                        })
+                        .map_err(|_| to_datetime_error(ruby, s, ri, "Date or Time"))?;
+
+                    // Apply the same logic as for Data::DateTime
+                    if i == *date {
+                        date_value = current;
+                    } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
+                        current = transform_time_to_datetime(date_value, current);
+                    }
+
+                    // Round up to the next second if we have any fractional seconds
+                    let adjusted_time = if current.nanosecond() > 0 {
+                        current + chrono::Duration::seconds(1) - chrono::Duration::nanoseconds(current.nanosecond() as i64)
+                    } else {
+                        current
+                    };
+
+                    // Format the output to ensure consistent precision
+                    let formatted_output = adjusted_time.format("%Y-%m-%d %H:%M:%S").to_string();
+                    write!(dest, "{}", formatted_output)
+                }
                 Data::DateTime(ref d) => {
                     let mut current = d.as_datetime().ok_or(to_datetime_error(ruby, &d.to_string(), ri, "Date"))?;
                     if i == *date {
@@ -171,7 +211,7 @@ fn handle_commas<W: Write>(dest: &mut W, s: &str) -> std::io::Result<()> {
 
 fn clean_strings(s: &str) -> String {
     s.replace("\n", " ")
-        .replace("\r", " ")
+        .replace("\r", "")
         .replace("\"", "")
 }
 

data/lib/csv_utils/version.rb

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

metadata

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