patchwork_csv_utils 0.1.3-arm64-darwin → 0.1.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc5b0905c8210cfdad65db324e93a40623ad1aaefe2a2d05165b8df796272186
-  data.tar.gz: b1e4a1262e1e49ed970482433ac193610ec105d1bf024d123551063607bdbd40
+  metadata.gz: f2ad80848ade16844e3fca6c549a43738f7ac7a40241073725ce7bdc0ecdcf25
+  data.tar.gz: 4dd8f233d6c0716064365cfcb9b565acdc9169b5a02ea3482375c26d24f72d29
 SHA512:
-  metadata.gz: c7a88eed7af4705c554dfb41b1159b2eeba01657daf572fb2d188fd86d051977e5e6c401ae43a5b5401756a2bef8a56cbe28eb93dca389760ac0004946746478
-  data.tar.gz: b98944299828a21085c531f9d76602a3dc1dfb4ef9db03cf93a2d44fd1d9c55481617c16a5fe65cbb8b9509794430916252abfbfa98df18b6cce7d1aa2e2a0b8
+  metadata.gz: 23babd70402e83a357c685a6a16d5a6b3e4b0eed3dbee34ec274865fd223bceb0fbc9cb96985399abdd4ec9c6ad465f5d22541ed0807cb74208c53a2618435aa
+  data.tar.gz: 710b787a80d6e73c5c242330fa2864c7f0201799227536e4691e61b1a1bd689f21b855f176d65baf2ebfd65ec5177ddb8d2fa8d8c0ef91f7506e4c2ef05f3b36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.3)
+    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();
@@ -29,17 +31,16 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
     for (ri, r) in range.rows().enumerate() {
         let mut date_value = Utc::now().naive_utc();
 
-        if r.iter().all(|c| c == &Data::Empty) {
-            continue;
-        }
+        if skip_empty_rows(r) { continue; }
+        if skip_rows_with_no_request_id(&header_map, r) { continue; }
 
-        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"))?;
+        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) => {
@@ -68,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))
 }

data/lib/csv_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: arm64-darwin
 authors:
 - kingsley.hendrickse