patchwork_csv_utils 0.1.4-arm64-darwin → 0.1.5-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ad80848ade16844e3fca6c549a43738f7ac7a40241073725ce7bdc0ecdcf25
-  data.tar.gz: 4dd8f233d6c0716064365cfcb9b565acdc9169b5a02ea3482375c26d24f72d29
+  metadata.gz: ccdea0ba6abfc936797f007183000983de9b15b9c195dfcdcfcd6ed3e63b5119
+  data.tar.gz: af20ff750dbbf82f86a3aaad20242770e1327db98218dd5e93381f3627f744bb
 SHA512:
-  metadata.gz: 23babd70402e83a357c685a6a16d5a6b3e4b0eed3dbee34ec274865fd223bceb0fbc9cb96985399abdd4ec9c6ad465f5d22541ed0807cb74208c53a2618435aa
-  data.tar.gz: 710b787a80d6e73c5c242330fa2864c7f0201799227536e4691e61b1a1bd689f21b855f176d65baf2ebfd65ec5177ddb8d2fa8d8c0ef91f7506e4c2ef05f3b36
+  metadata.gz: d134cfdfafab51d74fef17480c0aad78c1033d0fc3ae443cd57ad5ce838a76fdf44a05970c295177eb6b9b26f556c2d37a8a2b04f05d67fec194f22991da8628
+  data.tar.gz: dc188247d6c270c0640f3f3b88173b4e3ff97d23c4b077749219fcf33c0394616b1b95b3d22e9fd5126fb2741f72bea316c1d0f09a7798484e775663661c0daa

data/Gemfile.lock

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

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

@@ -33,12 +33,20 @@ pub fn dedup(ruby: &Ruby, previous_csv_path: String, new_csv_path: String, targe
     let mut previous_records = vec![];
     for previous_record in previous_csv.records() {
         let previous_record = previous_record.map_err(|e| magnus_err(ruby, e, "previous_record"))?;
+
+        if has_empty_row_skip(&previous_record) { continue; }
+        if has_empty_first_col_skip_row(&previous_record) { continue; }
+
         let previous_record = previous_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
         previous_records.push(previous_record)
     }
 
     for new_record in new_csv.records() {
         let new_record = new_record.map_err(|e| magnus_err(ruby, e, "new_record"))?;
+
+        if has_empty_row_skip(&new_record) { continue; }
+        if has_empty_first_col_skip_row(&new_record) { continue; }
+
         let new_record = new_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
         if !previous_records.contains(&new_record) {
             wtr.write_byte_record(new_record.as_byte_record()).unwrap();
@@ -50,4 +58,18 @@ pub fn dedup(ruby: &Ruby, previous_csv_path: String, new_csv_path: String, targe
     Ok(())
 }
 
+fn has_empty_first_col_skip_row(previous_record: &StringRecord) -> bool {
+    if previous_record[0].is_empty() {
+        return true;
+    }
+    false
+}
+
+fn has_empty_row_skip(record: &StringRecord) -> bool {
+    if record.iter().all(|r| r.is_empty()) {
+        return true;
+    }
+    false
+}
+
 

data/lib/csv_utils/version.rb

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

metadata

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