patchwork_csv_utils 0.1.3-arm64-darwin → 0.1.5-arm64-darwin

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cc5b0905c8210cfdad65db324e93a40623ad1aaefe2a2d05165b8df796272186
4
- data.tar.gz: b1e4a1262e1e49ed970482433ac193610ec105d1bf024d123551063607bdbd40
3
+ metadata.gz: ccdea0ba6abfc936797f007183000983de9b15b9c195dfcdcfcd6ed3e63b5119
4
+ data.tar.gz: af20ff750dbbf82f86a3aaad20242770e1327db98218dd5e93381f3627f744bb
5
5
  SHA512:
6
- metadata.gz: c7a88eed7af4705c554dfb41b1159b2eeba01657daf572fb2d188fd86d051977e5e6c401ae43a5b5401756a2bef8a56cbe28eb93dca389760ac0004946746478
7
- data.tar.gz: b98944299828a21085c531f9d76602a3dc1dfb4ef9db03cf93a2d44fd1d9c55481617c16a5fe65cbb8b9509794430916252abfbfa98df18b6cce7d1aa2e2a0b8
6
+ metadata.gz: d134cfdfafab51d74fef17480c0aad78c1033d0fc3ae443cd57ad5ce838a76fdf44a05970c295177eb6b9b26f556c2d37a8a2b04f05d67fec194f22991da8628
7
+ data.tar.gz: dc188247d6c270c0640f3f3b88173b4e3ff97d23c4b077749219fcf33c0394616b1b95b3d22e9fd5126fb2741f72bea316c1d0f09a7798484e775663661c0daa
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- patchwork_csv_utils (0.1.3)
4
+ patchwork_csv_utils (0.1.5)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -8,6 +8,6 @@ pub mod utils;
8
8
  fn init() -> Result<(), magnus::Error> {
9
9
  let module = define_module("CsvUtils")?;
10
10
  module.define_singleton_method("dedup", function!(dedup, 3))?;
11
- module.define_singleton_method("to_csv", function!(to_csv, 3))?;
11
+ module.define_singleton_method("to_csv", function!(to_csv, 2))?;
12
12
  Ok(())
13
13
  }
@@ -33,12 +33,20 @@ pub fn dedup(ruby: &Ruby, previous_csv_path: String, new_csv_path: String, targe
33
33
  let mut previous_records = vec![];
34
34
  for previous_record in previous_csv.records() {
35
35
  let previous_record = previous_record.map_err(|e| magnus_err(ruby, e, "previous_record"))?;
36
+
37
+ if has_empty_row_skip(&previous_record) { continue; }
38
+ if has_empty_first_col_skip_row(&previous_record) { continue; }
39
+
36
40
  let previous_record = previous_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
37
41
  previous_records.push(previous_record)
38
42
  }
39
43
 
40
44
  for new_record in new_csv.records() {
41
45
  let new_record = new_record.map_err(|e| magnus_err(ruby, e, "new_record"))?;
46
+
47
+ if has_empty_row_skip(&new_record) { continue; }
48
+ if has_empty_first_col_skip_row(&new_record) { continue; }
49
+
42
50
  let new_record = new_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
43
51
  if !previous_records.contains(&new_record) {
44
52
  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
50
58
  Ok(())
51
59
  }
52
60
 
61
+ fn has_empty_first_col_skip_row(previous_record: &StringRecord) -> bool {
62
+ if previous_record[0].is_empty() {
63
+ return true;
64
+ }
65
+ false
66
+ }
67
+
68
+ fn has_empty_row_skip(record: &StringRecord) -> bool {
69
+ if record.iter().all(|r| r.is_empty()) {
70
+ return true;
71
+ }
72
+ false
73
+ }
74
+
53
75
 
@@ -8,13 +8,15 @@ use magnus::Ruby;
8
8
 
9
9
  use crate::utils::{FileExtension, magnus_err};
10
10
 
11
- pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String, sheet_name: String) -> magnus::error::Result<()> {
11
+ pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String) -> magnus::error::Result<()> {
12
12
  if !xls_path.has_extension(&["xls"]) {
13
13
  return Err(magnus::Error::new(ruby.exception_standard_error(), "xls_path must be an xls file".to_string()));
14
14
  }
15
15
 
16
16
  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()))?;
17
- let range = workbook.worksheet_range(sheet_name.as_str()).map_err(|e| magnus_err(ruby, e, "Error"))?;
17
+ let range = workbook.worksheet_range_at(0)
18
+ .ok_or(magnus::Error::new(ruby.exception_standard_error(), "no worksheet found in xls".to_string()))
19
+ .and_then(|r| r.map_err(|e| magnus_err(ruby, e, "could not read worksheet range")))?;
18
20
 
19
21
  let headers = range.headers().ok_or(magnus::Error::new(ruby.exception_standard_error(), "no headers found in xls".to_string()))?;
20
22
  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
29
31
  for (ri, r) in range.rows().enumerate() {
30
32
  let mut date_value = Utc::now().naive_utc();
31
33
 
32
- if r.iter().all(|c| c == &Data::Empty) {
33
- continue;
34
- }
34
+ if skip_empty_rows(r) { continue; }
35
+ if skip_rows_with_no_request_id(&header_map, r) { continue; }
35
36
 
36
- for (i, c) in r.iter().enumerate() {
37
- let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
38
- let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
39
- let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
40
- let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
41
- let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
37
+ let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
38
+ let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
39
+ let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
40
+ let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
41
+ let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
42
42
 
43
+ for (i, c) in r.iter().enumerate() {
43
44
  match *c {
44
45
  Data::Empty => Ok(()),
45
46
  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
68
69
  Ok(())
69
70
  }
70
71
 
72
+ fn skip_empty_rows(r: &[Data]) -> bool {
73
+ if r.iter().all(|c| c == &Data::Empty) {
74
+ return true;
75
+ }
76
+ false
77
+ }
78
+
79
+ fn skip_rows_with_no_request_id(header_map: &HashMap<String, usize>, r: &[Data]) -> bool {
80
+ if let Some(request_id) = header_map.get("Request Id") {
81
+ if r[*request_id] == Data::Empty {
82
+ return true;
83
+ }
84
+ }
85
+ false
86
+ }
87
+
71
88
  fn missing_header(ruby: &Ruby, header: &str) -> magnus::Error {
72
89
  magnus::Error::new(ruby.exception_standard_error(), format!("Missing '{}' header in xls", header))
73
90
  }
Binary file
Binary file
Binary file
Binary file
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CsvUtils
4
- VERSION = '0.1.3'
4
+ VERSION = '0.1.5'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: patchwork_csv_utils
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.5
5
5
  platform: arm64-darwin
6
6
  authors:
7
7
  - kingsley.hendrickse