patchwork_csv_utils 0.1.7-x86_64-linux → 0.1.8-x86_64-linux

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: c481a9b1277460f51834e1b1b0f7c9dd95a99d0878a03dd4f556532537598262
4
- data.tar.gz: 8c124c3f8bd535d3ae10d9b5618f0161349efb49d9c1751410f74bc5e929e569
3
+ metadata.gz: 557cec4f7b89652d9701343e28ff47c43d379c8dbee9f4614964a91dc7f26cf2
4
+ data.tar.gz: 62cd2db2316ad54621d110ef397e45aa645a42e7c8ae26eba049ef69d57edb92
5
5
  SHA512:
6
- metadata.gz: ceab7828e522af6071cb642a5966908366dc08983dd8ae8d59320a81756747c3ee583f88172245bff05946d4563a162e0e3e26d3560f447bf3ba16881a0e1f8d
7
- data.tar.gz: b0ca956f8b46e3267ba80a5b5784c0a61926a69ddb0a414299f538e8d0e46aa68b521cd9ee33ca76e8732d88fab89eb7e92fcdca865a3ae6fa1f471fdb93e8b6
6
+ metadata.gz: 5c237bb939e377dfe6448053edac10c54a9eefbaf8216c844fd78ffba3af9a7b493f8ea6afd1b05ce818b623339b41ea80b468c4b3f86b285225381f54d642cb
7
+ data.tar.gz: 735cf9537f306962790b7066c7f619f6691cff530ad72b7b8d6b3c402c58fe00f2dd43e4c481fdbeb32307812f00fc6df425eeda9b2bcf7ba047580f1f5b5b38
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- patchwork_csv_utils (0.1.7)
4
+ patchwork_csv_utils (0.1.8)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -67,4 +67,4 @@ DEPENDENCIES
67
67
  rubocop (~> 1.21)
68
68
 
69
69
  BUNDLED WITH
70
- 2.4.4
70
+ 2.4.10
@@ -19,6 +19,7 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
19
19
  let mut wtr = Writer::from_path(target_path).map_err(|e| magnus_err(ruby, e, "target_path"))?;
20
20
  let headers = csv.headers().map_err(|e| magnus_err(ruby, e, "csv_path headers"))?;
21
21
  let header_map: HashMap<String, usize> = headers.iter().enumerate().map(|(i, h)| (h.to_string(), i)).collect();
22
+ let inverse_header_map: HashMap<usize, String> = headers.iter().enumerate().map(|(i, h)| (i, h.to_string())).collect();
22
23
 
23
24
  wtr.write_byte_record(headers.as_byte_record()).map_err(|e| magnus_err(ruby, e, "write_byte_record"))?;
24
25
 
@@ -41,11 +42,14 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
41
42
  let record = record.iter().enumerate().map(|(i, c)| {
42
43
  let c = c.trim_end();
43
44
  if i == *date {
44
- let current = string_to_datetime(c).ok_or(to_datetime_error(ruby, c, ri, i))?;
45
+ let current = string_to_datetime(c).ok_or(to_datetime_error(ruby, c, ri, "Date"))?;
45
46
  date_value = current;
46
47
  Ok(current.to_string())
47
48
  } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
48
- let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, i))?;
49
+ if c.is_empty() { return Ok(c.to_string()); }
50
+ let unknown = "Unknown".to_string();
51
+ let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
52
+ let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
49
53
  let datetime = transform_time_to_datetime(date_value, current_time);
50
54
  Ok(datetime.to_string())
51
55
  } else {
@@ -79,7 +83,7 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveTime) -> NaiveDateTime
79
83
  NaiveDateTime::new(t1.date(), t2)
80
84
  }
81
85
 
82
- fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: usize) -> magnus::Error {
86
+ fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
83
87
  magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
84
88
  }
85
89
 
@@ -44,6 +44,9 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
44
44
  if skip_excluded_rows(&request_id, r, &exclusions) { continue; }
45
45
  if skip_empty_rows(r) { continue; }
46
46
  if skip_rows_with_no_request_id(&request_id, r) { continue; }
47
+ if date_value_is_not_present(&date, r) {
48
+ return Err(magnus::Error::new(ruby.exception_standard_error(), format!("Date value is not present in row: {}", ri)));
49
+ }
47
50
 
48
51
  for (i, c) in r.iter().enumerate() {
49
52
  match *c {
@@ -53,7 +56,7 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
53
56
  }
54
57
  Data::Float(ref f) => write!(dest, "{}", f),
55
58
  Data::DateTime(ref d) => {
56
- let mut current = d.as_datetime().unwrap_or_default();
59
+ let mut current = d.as_datetime().ok_or(to_datetime_error(ruby, &d.to_string(), ri, "Date"))?;
57
60
  if i == *date {
58
61
  date_value = current;
59
62
  } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
@@ -74,6 +77,10 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
74
77
  Ok(())
75
78
  }
76
79
 
80
+ fn date_value_is_not_present(date: &usize, r: &[Data]) -> bool {
81
+ r[*date] == Data::Empty
82
+ }
83
+
77
84
  fn skip_excluded_rows(request_id: &usize, r: &[Data], exclusions: &Vec<String>) -> bool {
78
85
  let value = r[*request_id].to_string();
79
86
  exclusions.contains(&value.to_string())
@@ -91,6 +98,10 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveDateTime) -> NaiveDate
91
98
  NaiveDateTime::new(t1.date(), t2.time())
92
99
  }
93
100
 
101
+ fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
102
+ magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
103
+ }
104
+
94
105
  fn handle_commas<W: Write>(dest: &mut W, s: &str) -> std::io::Result<()> {
95
106
  if s.contains(",") {
96
107
  write!(dest, "{:?}", clean_strings(s).trim_end())
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.7'
4
+ VERSION = '0.1.8'
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.7
4
+ version: 0.1.8
5
5
  platform: x86_64-linux
6
6
  authors:
7
7
  - kingsley.hendrickse