osv 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22d1d56b0eba1e23ca192db2c70e68689486e2f0032672285017e1f98a530d2
-  data.tar.gz: 6288dce70b95faf312e8aa244ba56a60c3d59b85bdd16a4a951060df78b97e1e
+  metadata.gz: 9a6579b30fb8761382666c3fcfa434d9234c3ebf508cad7b3045b9f4ebc2f8b7
+  data.tar.gz: afb793b1df201e876e955ed75904c729aa353bdee3ae374085902efdd4601603
 SHA512:
-  metadata.gz: 5399b43ecd3987c73daf09341d51a1ee8e5d060f1085e9a7aac9b823ab723ccbbc4084c5c0c9abbd36e7e17becfcfa1757af6af3666e01ef3992a27e35b5b983
-  data.tar.gz: 2a6d98b645af40ab08a5a01a2bcf5b67ce9ebff18a993e602f6b00fa2f3f80d65c63605a7f5a715286ac20751db0607c515686e4439156a4039ae24f49e95e10
+  metadata.gz: 4318353ec8b32f026d3a3c8675a26b6a6545faba213bba28ada9b0ab7d978ea8d7dd6a8e202aaefb765040cc0d54990fd94f8263bbf4ecd6a4150ab9f48e7cc6
+  data.tar.gz: d0c590105f070773f82a2e00c0c069439c55055cfe958e7eb3bcf443a83fb1d3dd1f099b93f2835a30797024451666e42f18aeaa361432824d18f77cfaa4748f

data/ext/osv/src/csv/builder.rs

@@ -80,7 +80,6 @@ impl<'a, T: RecordParser + Send + 'static> RecordReaderBuilder<'a, T> {
 
     pub fn build(self) -> Result<RecordReader<T>, Error> {
         let readable = self.get_reader()?;
-
         let mut reader = csv::ReaderBuilder::new()
             .has_headers(self.has_headers)
             .delimiter(self.delimiter)
@@ -88,14 +87,13 @@ impl<'a, T: RecordParser + Send + 'static> RecordReaderBuilder<'a, T> {
             .from_reader(readable);
 
         let headers = RecordReader::<T>::get_headers(self.ruby, &mut reader, self.has_headers)?;
-        let headers_clone = headers.clone();
         let null_string = self.null_string;
 
         let (sender, receiver) = kanal::bounded(self.buffer);
         let handle = thread::spawn(move || {
             let mut record = csv::StringRecord::new();
             while let Ok(true) = reader.read_record(&mut record) {
-                let row = T::parse(&headers_clone, &record, &null_string);
+                let row = T::parse(&headers, &record, &null_string);
                 if sender.send(row).is_err() {
                     break;
                 }

data/ext/osv/src/csv/parser.rs

@@ -2,42 +2,50 @@ use std::collections::HashMap;
 
 pub trait RecordParser {
     type Output;
-
-    fn parse(headers: &[String], record: &csv::StringRecord, null_string: &str) -> Self::Output;
+    fn parse<'a>(
+        headers: &'a [String],
+        record: &csv::StringRecord,
+        null_string: &str,
+    ) -> Self::Output;
 }
 
 impl RecordParser for HashMap<String, Option<String>> {
     type Output = Self;
-
-    fn parse(headers: &[String], record: &csv::StringRecord, null_string: &str) -> Self::Output {
-        headers
-            .iter()
-            .zip(record.iter())
-            .map(|(header, field)| {
-                let value = if field == null_string {
+    fn parse<'a>(
+        headers: &'a [String],
+        record: &csv::StringRecord,
+        null_string: &str,
+    ) -> Self::Output {
+        let mut map = HashMap::with_capacity(headers.len());
+        for (header, field) in headers.iter().zip(record.iter()) {
+            map.insert(
+                header.clone(),
+                if field == null_string {
                     None
                 } else {
                     Some(field.to_string())
-                };
-                (header.clone(), value)
-            })
-            .collect()
+                },
+            );
+        }
+        map
     }
 }
 
 impl RecordParser for Vec<Option<String>> {
     type Output = Self;
-
-    fn parse(_headers: &[String], record: &csv::StringRecord, null_string: &str) -> Self::Output {
-        record
-            .iter()
-            .map(|field| {
-                if field == null_string {
-                    None
-                } else {
-                    Some(field.to_string())
-                }
-            })
-            .collect()
+    fn parse<'a>(
+        _headers: &'a [String],
+        record: &csv::StringRecord,
+        null_string: &str,
+    ) -> Self::Output {
+        let mut vec = Vec::with_capacity(record.len());
+        for field in record.iter() {
+            vec.push(if field == null_string {
+                None
+            } else {
+                Some(field.to_string())
+            });
+        }
+        vec
     }
 }

data/lib/osv/version.rb

@@ -1,3 +1,3 @@
 module OSV
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nathan Jaremko