osv 0.3.13 → 0.3.14

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osv
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Nathan Jaremko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -38,16 +38,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-description: |
-  OSV is a high-performance CSV parser for Ruby, implemented in Rust. It wraps BurntSushi's csv-rs crate to provide fast CSV parsing with support for both hash-based and array-based row formats.
-
-  Features include:
-  - Flexible input sources (file paths, gzipped files, IO objects, strings)
-  - Configurable parsing options (headers, separators, quote chars)
-  - Support for both hash and array output formats
-  - Whitespace trimming options
-  - Strict or flexible parsing modes
-  - Significantly faster than Ruby's standard CSV library
+description: |2
+      OSV is a high-performance CSV parser for Ruby, implemented in Rust.
+      It wraps BurntSushi's csv-rs crate to provide fast CSV parsing with support for both hash-based and array-based row formats.
+      Features include: Flexible input sources (file paths, gzipped files, IO objects, strings),
+      configurable parsing options (headers, separators, quote chars), support for both hash and array output formats,
+      whitespace trimming options, strict or flexible parsing modes, and is significantly faster than Ruby's standard CSV library.
 email:
 - nathan@jaremko.ca
 executables: []
@@ -67,9 +63,9 @@ files:
 - ext/osv/src/csv/header_cache.rs
 - ext/osv/src/csv/mod.rs
 - ext/osv/src/csv/parser.rs
-- ext/osv/src/csv/read_impl.rs
-- ext/osv/src/csv/reader.rs
 - ext/osv/src/csv/record.rs
+- ext/osv/src/csv/record_reader.rs
+- ext/osv/src/csv/ruby_reader.rs
 - ext/osv/src/lib.rs
 - ext/osv/src/reader.rs
 - ext/osv/src/utils.rs
@@ -84,8 +80,8 @@ metadata:
   source_code_uri: https://github.com/njaremko/osv
   readme_uri: https://github.com/njaremko/osv/blob/main/README.md
   changelog_uri: https://github.com/njaremko/osv/blob/main/CHANGELOG.md
-  rubygems_mfa_required: 'true'
   documentation_uri: https://www.rubydoc.info/gems/osv
+  funding_uri: https://github.com/sponsors/njaremko
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,75 +0,0 @@
-use super::{header_cache::StringCache, parser::RecordParser};
-use std::{io::Read, thread};
-
-pub(crate) const READ_BUFFER_SIZE: usize = 8192;
-
-pub enum ReadImpl<T: RecordParser> {
-    SingleThreaded {
-        reader: csv::Reader<Box<dyn Read>>,
-        headers: Vec<&'static str>,
-        null_string: Option<String>,
-        flexible_default: Option<String>,
-    },
-    MultiThreaded {
-        headers: Vec<&'static str>,
-        receiver: kanal::Receiver<T::Output>,
-        handle: Option<thread::JoinHandle<()>>,
-    },
-}
-
-impl<T: RecordParser> ReadImpl<T> {
-    #[inline]
-    pub fn next(&mut self) -> Option<T::Output> {
-        match self {
-            Self::MultiThreaded {
-                receiver, handle, ..
-            } => match receiver.recv() {
-                Ok(record) => Some(record),
-                Err(_) => {
-                    if let Some(handle) = handle.take() {
-                        let _ = handle.join();
-                    }
-                    None
-                }
-            },
-            Self::SingleThreaded {
-                reader,
-                headers,
-                null_string,
-                flexible_default,
-            } => {
-                let mut record = csv::StringRecord::with_capacity(READ_BUFFER_SIZE, headers.len());
-                match reader.read_record(&mut record) {
-                    Ok(true) => Some(T::parse(
-                        headers,
-                        &record,
-                        null_string.as_deref(),
-                        flexible_default.as_deref(),
-                    )),
-                    _ => None,
-                }
-            }
-        }
-    }
-
-    #[inline]
-    pub fn cleanup(&mut self) {
-        match self {
-            Self::MultiThreaded {
-                receiver,
-                handle,
-                headers,
-                ..
-            } => {
-                receiver.close();
-                if let Some(handle) = handle.take() {
-                    let _ = handle.join();
-                }
-                let _ = StringCache::clear(headers);
-            }
-            Self::SingleThreaded { headers, .. } => {
-                let _ = StringCache::clear(headers);
-            }
-        }
-    }
-}

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

@@ -1,57 +0,0 @@
-use super::{parser::RecordParser, read_impl::ReadImpl};
-use magnus::{Error, Ruby};
-use std::{borrow::Cow, io::Read};
-
-pub struct RecordReader<T: RecordParser> {
-    pub(crate) reader: ReadImpl<T>,
-}
-
-impl<T: RecordParser> RecordReader<T> {
-    #[inline]
-    pub(crate) fn get_headers(
-        ruby: &Ruby,
-        reader: &mut csv::Reader<impl Read>,
-        has_headers: bool,
-    ) -> Result<Vec<String>, Error> {
-        let first_row = reader.headers().map_err(|e| {
-            Error::new(
-                ruby.exception_runtime_error(),
-                Cow::Owned(format!("Failed to read headers: {e}")),
-            )
-        })?;
-
-        Ok(if has_headers {
-            // Pre-allocate the vector with exact capacity
-            let mut headers = Vec::with_capacity(first_row.len());
-            headers.extend(first_row.iter().map(String::from));
-            headers
-        } else {
-            // Pre-allocate the vector with exact capacity
-            let mut headers = Vec::with_capacity(first_row.len());
-            headers.extend((0..first_row.len()).map(|i| format!("c{i}")));
-            headers
-        })
-    }
-}
-
-impl<T: RecordParser> Iterator for RecordReader<T> {
-    type Item = T::Output;
-
-    #[inline]
-    fn next(&mut self) -> Option<Self::Item> {
-        self.reader.next()
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        // We can't know the exact size without reading the whole file
-        (0, None)
-    }
-}
-
-impl<T: RecordParser> Drop for RecordReader<T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.reader.cleanup();
-    }
-}