patchwork_csv_utils 0.1.2-x86_64-linux → 0.1.4-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff133c08ede918bb08484b681b1f9a9e4c72b152832c3412149b7fee5f471a3e
-  data.tar.gz: 4c95c88b16c6461126bc8c5ec78927cb5d4c1150904a70dd1be9820f2f57fc43
+  metadata.gz: b9d62eb73016a46a3ec9caac2d43fd5db562a0856831c7f0e544e9c570e8d550
+  data.tar.gz: 1262e0f45c2b8cfe896be3d4bd6f1074db61aa2b252049f5090cec5feba05c1a
 SHA512:
-  metadata.gz: af89a3f2e701e6f77a5cb54d51f2284da6df01daa4386d637a4b913c486519d6789fe6c864063406cfdc406df5363fb0a2a8e242b0a884a081b7a14f0757477c
-  data.tar.gz: 59ce53357adf23fc29172f8e7b6e07fe9df121c9ad86133ff0abac4227264c2f971a736bb5ef308ad0450a764f22de2881125cbc8a45acfd54159f6fe38a7b45
+  metadata.gz: 4fca3c59b6ff0b5cfd1dcc2ad0ae6efdf8005716980c0a1d111bff0190a4fae3c9bc6b560086416c794be89e3eab46ae6ffc34bdfc408a806c4ac07fe1660608
+  data.tar.gz: 28454948d621cd2272b9a6790d735ce7e2d95da51202accb76a3d56f1a5b2b6bc9a274bf7473073bbc99fac25a64de818ed0a1b9839b94dc0893241ff0290c24

data/Gemfile.lock

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

data/ext/csv_utils/src/lib.rs

@@ -8,6 +8,6 @@ pub mod utils;
 fn init() -> Result<(), magnus::Error> {
     let module = define_module("CsvUtils")?;
     module.define_singleton_method("dedup", function!(dedup, 3))?;
-    module.define_singleton_method("to_csv", function!(to_csv, 3))?;
+    module.define_singleton_method("to_csv", function!(to_csv, 2))?;
     Ok(())
 }

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

@@ -8,13 +8,15 @@ use magnus::Ruby;
 
 use crate::utils::{FileExtension, magnus_err};
 
-pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String, sheet_name: String) -> magnus::error::Result<()> {
+pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: 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()));
     }
 
     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 range = workbook.worksheet_range(sheet_name.as_str()).map_err(|e| magnus_err(ruby, e, "Error"))?;
+    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")))?;
 
     let headers = range.headers().ok_or(magnus::Error::new(ruby.exception_standard_error(), "no headers found in xls".to_string()))?;
     let header_map: HashMap<String, usize> = headers.iter().enumerate().map(|(i, h)| (h.to_string(), i)).collect();
@@ -28,13 +30,17 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
     let n = range.get_size().1 - 1;
     for (ri, r) in range.rows().enumerate() {
         let mut date_value = Utc::now().naive_utc();
-        for (i, c) in r.iter().enumerate() {
-            let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
-            let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
-            let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
-            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"))?;
 
+        if skip_empty_rows(r) { continue; }
+        if skip_rows_with_no_request_id(&header_map, r) { continue; }
+
+        let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
+        let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
+        let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
+        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"))?;
+
+        for (i, c) in r.iter().enumerate() {
             match *c {
                 Data::Empty => Ok(()),
                 Data::String(ref s) | Data::DateTimeIso(ref s) | Data::DurationIso(ref s) => {
@@ -63,6 +69,22 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
     Ok(())
 }
 
+fn skip_empty_rows(r: &[Data]) -> bool {
+    if r.iter().all(|c| c == &Data::Empty) {
+        return true;
+    }
+    false
+}
+
+fn skip_rows_with_no_request_id(header_map: &HashMap<String, usize>, r: &[Data]) -> bool {
+    if let Some(request_id) = header_map.get("Request Id") {
+        if r[*request_id] == Data::Empty {
+            return true;
+        }
+    }
+    false
+}
+
 fn missing_header(ruby: &Ruby, header: &str) -> magnus::Error {
     magnus::Error::new(ruby.exception_standard_error(), format!("Missing '{}' header in xls", header))
 }
@@ -83,4 +105,5 @@ fn clean_strings(s: &str) -> String {
     s.replace("\n", " ")
         .replace("\r", " ")
         .replace("\"", "")
+        .replace("'", "")
 }

data/lib/csv_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: