patchwork_csv_utils 0.1.7-x86_64-linux → 0.1.8-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c481a9b1277460f51834e1b1b0f7c9dd95a99d0878a03dd4f556532537598262
-  data.tar.gz: 8c124c3f8bd535d3ae10d9b5618f0161349efb49d9c1751410f74bc5e929e569
+  metadata.gz: 557cec4f7b89652d9701343e28ff47c43d379c8dbee9f4614964a91dc7f26cf2
+  data.tar.gz: 62cd2db2316ad54621d110ef397e45aa645a42e7c8ae26eba049ef69d57edb92
 SHA512:
-  metadata.gz: ceab7828e522af6071cb642a5966908366dc08983dd8ae8d59320a81756747c3ee583f88172245bff05946d4563a162e0e3e26d3560f447bf3ba16881a0e1f8d
-  data.tar.gz: b0ca956f8b46e3267ba80a5b5784c0a61926a69ddb0a414299f538e8d0e46aa68b521cd9ee33ca76e8732d88fab89eb7e92fcdca865a3ae6fa1f471fdb93e8b6
+  metadata.gz: 5c237bb939e377dfe6448053edac10c54a9eefbaf8216c844fd78ffba3af9a7b493f8ea6afd1b05ce818b623339b41ea80b468c4b3f86b285225381f54d642cb
+  data.tar.gz: 735cf9537f306962790b7066c7f619f6691cff530ad72b7b8d6b3c402c58fe00f2dd43e4c481fdbeb32307812f00fc6df425eeda9b2bcf7ba047580f1f5b5b38

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.7)
+    patchwork_csv_utils (0.1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -67,4 +67,4 @@ DEPENDENCIES
   rubocop (~> 1.21)
 
 BUNDLED WITH
-   2.4.4
+   2.4.10

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

@@ -19,6 +19,7 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
     let mut wtr = Writer::from_path(target_path).map_err(|e| magnus_err(ruby, e, "target_path"))?;
     let headers = csv.headers().map_err(|e| magnus_err(ruby, e, "csv_path headers"))?;
     let header_map: HashMap<String, usize> = headers.iter().enumerate().map(|(i, h)| (h.to_string(), i)).collect();
+    let inverse_header_map: HashMap<usize, String> = headers.iter().enumerate().map(|(i, h)| (i, h.to_string())).collect();
 
     wtr.write_byte_record(headers.as_byte_record()).map_err(|e| magnus_err(ruby, e, "write_byte_record"))?;
 
@@ -41,11 +42,14 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
         let record = record.iter().enumerate().map(|(i, c)| {
             let c = c.trim_end();
             if i == *date {
-                let current = string_to_datetime(c).ok_or(to_datetime_error(ruby, c, ri, i))?;
+                let current = string_to_datetime(c).ok_or(to_datetime_error(ruby, c, ri, "Date"))?;
                 date_value = current;
                 Ok(current.to_string())
             } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
-                let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, i))?;
+                if c.is_empty() { return Ok(c.to_string()); }
+                let unknown = "Unknown".to_string();
+                let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
+                let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
                 let datetime = transform_time_to_datetime(date_value, current_time);
                 Ok(datetime.to_string())
             } else {
@@ -79,7 +83,7 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveTime) -> NaiveDateTime
     NaiveDateTime::new(t1.date(), t2)
 }
 
-fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: usize) -> magnus::Error {
+fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
     magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
 }
 

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

@@ -44,6 +44,9 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
         if skip_excluded_rows(&request_id, r, &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) {
+            return Err(magnus::Error::new(ruby.exception_standard_error(), format!("Date value is not present in row: {}", ri)));
+        }
 
         for (i, c) in r.iter().enumerate() {
             match *c {
@@ -53,7 +56,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
                 }
                 Data::Float(ref f) => write!(dest, "{}", f),
                 Data::DateTime(ref d) => {
-                    let mut current = d.as_datetime().unwrap_or_default();
+                    let mut current = d.as_datetime().ok_or(to_datetime_error(ruby, &d.to_string(), ri, "Date"))?;
                     if i == *date {
                         date_value = current;
                     } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
@@ -74,6 +77,10 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
     Ok(())
 }
 
+fn date_value_is_not_present(date: &usize, r: &[Data]) -> bool {
+    r[*date] == Data::Empty
+}
+
 fn skip_excluded_rows(request_id: &usize, r: &[Data], exclusions: &Vec<String>) -> bool {
     let value = r[*request_id].to_string();
     exclusions.contains(&value.to_string())
@@ -91,6 +98,10 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveDateTime) -> NaiveDate
     NaiveDateTime::new(t1.date(), t2.time())
 }
 
+fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
+    magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
+}
+
 fn handle_commas<W: Write>(dest: &mut W, s: &str) -> std::io::Result<()> {
     if s.contains(",") {
         write!(dest, "{:?}", clean_strings(s).trim_end())

data/lib/csv_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse