patchwork_csv_utils 0.1.17-arm64-darwin → 0.1.19-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5977699b20c42ee8e272bbec4d59cb5f8ee94becfbb0f89706a5175a38ddf3af
-  data.tar.gz: 445dac8eeccda255f28c2d6ddf055473f4f7388b8ac4180e8b1c9dfa549d66c5
+  metadata.gz: 60d84851df3ef3364e26a5af872bb7fe9781c2b05d625baee7c9743a33fe57e4
+  data.tar.gz: 42340e0703f5f0cb1b23263a2a2a091ef2a0de999291575efa30f86552743549
 SHA512:
-  metadata.gz: 3d9a437b3f2e3e6caf52db149d0995c48afd7c2ed39275d319472a3450de97d9591b0117b9fa4fef3114bcb5ca473705e8da3f131e6b94b693573b9a502e1159
-  data.tar.gz: a699982a4a5a2981d38558535da903b50be775c59b4600b467bb85d0d2318a275f321f981ce77e0f61e6fc8d2eb8705c88f400ce0c7e9da382c419ed78d6fc66
+  metadata.gz: a7dbe612bc5f3bad6b2dd188cdbbd699222792829efdfbe776b3e595e57379fc6d3854a413dcfe5c513c005be8eea58ddf93452cef35c53c641458a08c22d6d5
+  data.tar.gz: b664a10d5db88a5b6e2c0994fb84d398e2406e5b3c59add1f1e52a8078a420a344d4cd9792689084c69d07df9667510d46817398779a2cd71be1763adc712fb7

data/Gemfile.lock

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

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};
@@ -15,15 +15,17 @@ pub fn to_csv(ruby: &Ruby, xls_path: String,
               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")))?;
@@ -77,10 +79,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 +212,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.19'
 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.19
 platform: arm64-darwin
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-26 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: