patchwork_csv_utils 0.1.2-x86_64-darwin → 0.1.4-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f473b13bf5283e219ea795ba8e4eeb5cbb5dc3a569a7411c6755fb105bef445
-  data.tar.gz: a11fbf681c5cc965b5d076d2ccc3f7980c57dd282cbe29859836e0282dda8978
+  metadata.gz: 3c6776e830a462f49749ef223d12ae26fa218c1f05dd3d6e5dd45ab814ea9b00
+  data.tar.gz: ef8b2c7b2e15701c18f5ab5382ba95ac8419b2e22b4af5e9973cedb9fe812148
 SHA512:
-  metadata.gz: 21c8ad2e8f381e79205fb553a1ecdac9287d2958e42d7ba4aeb1da897572bc4c63d448ee574668d9243c1427bad806f0159552f51580b75d1a1a1abeb40ef3a9
-  data.tar.gz: f34aca05f572db52ae9d0aab81a6d97a1f12316b02a59294d4ba00e1d4150137ce0e09166725e0a4c48681ba4a210d8343a7f702d80fae3c29f6b5f0a0e1e878
+  metadata.gz: 033761efc132f629f3eab8c9946ba470cc0a73b35402281eac75927cadb39d898d7a955993b3e1cd1393a8d7e5dad36d005aefec9a6e9f7fc93e87fa64389134
+  data.tar.gz: d9f2a12777a9e9541e6ab6e8056964f2cf1b0c3e98454dc8083de2d2336e9b5097367cd998c98a4cfaa065f1a122bc28f63d06ce050dfcd42a8992a5a8b87a38

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-darwin
 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: