osv 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1671e82e2f6ef7e401e69fd4c30ae527a1606b6dd495bf631a3c44b336f4ef2e
-  data.tar.gz: 9d790124a6ba8fd9414525f1691880f96e0d3e2f6a4fc5ccb85cebcedb333d8c
+  metadata.gz: c67f4e48abcf76bbbe0fce6513b67464ed550287451f5fa2b4c6e8f83256fef5
+  data.tar.gz: b38342f6e6c43050b45c99ea7f3fba4334423cb10d9df39b23ed054264b35e84
 SHA512:
-  metadata.gz: 92b99239fb1ee85f1c99b7573c52d3f334a0d92b337245440246427d44854aa43162e52d5b6f15998ddeb7a15985d0c4a48230149babafbcb4715d71dac6c2e6
-  data.tar.gz: 51e048de674bb2718a9bfee89966191ad2942640d3f15113b57272e026fd8e7966e00c5185d569a0b6b161717ef0b2c66a5e9d0e0cb9a48684e1bb7ddc9b3423
+  metadata.gz: 190d1cfafc93554e5096682f1ce3ec6e9d8049b2669c471db5b27d9190a36500465d798a07e279d73d6e8569c47eaa259f48644a8f1df70138c6f5fc7a826348
+  data.tar.gz: f3c4ed3eac64aaf95e14bf7f5e60b84f2d698db586a2b8c5c6328389e0c067df298b070d4ac78eb91df444ebf23bad2e8ec74f5e7f3314f6ff0c8a248e52b263

data/ext/osv/Cargo.lock

@@ -0,0 +1,402 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "csv"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "libloading"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "magnus"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d87ae53030f3a22e83879e666cb94e58a7bdf31706878a0ba48752994146dab"
+dependencies = [
+ "magnus-macros",
+ "rb-sys",
+ "rb-sys-env",
+ "seq-macro",
+]
+
+[[package]]
+name = "magnus-macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "osv"
+version = "0.1.0"
+dependencies = [
+ "csv",
+ "magnus",
+ "rb-sys",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rb-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91dbe37ab6ac2fba187480fb6544b92445e41e5c6f553bf0c33743f3c450a1df"
+dependencies = [
+ "rb-sys-build",
+]
+
+[[package]]
+name = "rb-sys-build"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4d56a49dcb646b70b758789c0d16c055a386a4f2a3346333abb69850fa860ce"
+dependencies = [
+ "bindgen",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "shell-words",
+ "syn",
+]
+
+[[package]]
+name = "rb-sys-env"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "seq-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

data/ext/osv/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "osv"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+csv = "1.3.1"
+magnus = { version = "0.7", features = ["rb-sys"] }
+rb-sys = "0.9"
+serde = { version = "1.0", features = ["derive"] }
+serde_magnus = "0.8.1"

data/ext/osv/src/lib.rs

@@ -0,0 +1,177 @@
+use magnus::{
+    block::Yield,
+    prelude::*,
+    scan_args::{get_kwargs, scan_args},
+    Error, RString, Ruby, Value,
+};
+
+/// Initializes the Ruby extension and defines methods.
+#[magnus::init]
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let module = ruby.define_module("OSV")?;
+    module.define_module_function("for_each", magnus::method!(parse_csv, -1))?;
+    module.define_module_function("for_each_compat", magnus::method!(parse_compat, -1))?;
+    Ok(())
+}
+
+/// Helper function to get a readable from either an IO object or a file path
+fn get_readable(ruby: &Ruby, to_read: Value) -> Result<Box<dyn Read>, Error> {
+    if to_read.is_kind_of(ruby.class_io()) {
+        let reader = RubyIOReader::new(ruby, to_read)?;
+        Ok(Box::new(reader))
+    } else {
+        let path = to_read.to_r_string()?.to_string()?;
+        let file = std::fs::File::open(&path).map_err(|e| {
+            Error::new(
+                ruby.exception_runtime_error(),
+                format!("Failed to open file: {}", e),
+            )
+        })?;
+        Ok(Box::new(file))
+    }
+}
+
+/// Helper function to create a CSV reader with the given configuration
+fn create_csv_reader(
+    ruby: &Ruby,
+    to_read: Value,
+    has_headers: bool,
+    delimiter: Option<String>,
+) -> Result<csv::Reader<Box<dyn Read>>, Error> {
+    let readable = get_readable(ruby, to_read)?;
+    let delimiter = delimiter.unwrap_or_else(|| ",".to_string());
+
+    let rdr = csv::ReaderBuilder::new()
+        .has_headers(has_headers)
+        .delimiter(delimiter.as_bytes()[0])
+        .from_reader(readable);
+
+    Ok(rdr)
+}
+
+/// Common setup for CSV parsing, returns the reader and headers
+fn setup_csv_parser(
+    ruby: &Ruby,
+    to_read: Value,
+    has_headers: bool,
+    delimiter: Option<String>,
+) -> Result<(csv::Reader<Box<dyn Read>>, Vec<String>), Error> {
+    let mut rdr = create_csv_reader(ruby, to_read, has_headers, delimiter)?;
+
+    let first_row = rdr.headers().unwrap().clone();
+    let num_fields = first_row.len();
+
+    let headers = if has_headers {
+        first_row.iter().map(|h| h.to_string()).collect()
+    } else {
+        (0..num_fields).map(|i| format!("c{}", i)).collect()
+    };
+
+    Ok((rdr, headers))
+}
+
+/// Parse common arguments for CSV parsing
+fn parse_csv_args(args: &[Value]) -> Result<(Value, bool, Option<String>), Error> {
+    let parsed_args = scan_args::<(Value,), (), (), (), _, ()>(args)?;
+    let (to_read,) = parsed_args.required;
+
+    let kwargs = get_kwargs::<_, (), (Option<bool>, Option<String>), ()>(
+        parsed_args.keywords,
+        &[],
+        &["has_headers", "delimiter"],
+    )?;
+
+    let has_headers = kwargs.optional.0.unwrap_or(true);
+
+    Ok((to_read, has_headers, kwargs.optional.1))
+}
+
+/// Parses CSV data from a file and yields each row as a hash to the block.
+fn parse_csv(
+    ruby: &Ruby,
+    rb_self: Value,
+    args: &[Value],
+) -> Result<Yield<impl Iterator<Item = std::collections::HashMap<String, String>>>, Error> {
+    if !ruby.block_given() {
+        return Ok(Yield::Enumerator(rb_self.enumeratorize("for_each", args)));
+    }
+
+    let (to_read, has_headers, delimiter) = parse_csv_args(args)?;
+    let (rdr, headers) = setup_csv_parser(ruby, to_read, has_headers, delimiter)?;
+
+    let iter = rdr.into_records().filter_map(move |result| {
+        let record = result.ok()?;
+        let mut hash = std::collections::HashMap::new();
+        for (header, field) in headers.iter().zip(record.iter()) {
+            hash.insert(header.to_string(), field.to_string());
+        }
+        Some(hash)
+    });
+
+    Ok(Yield::Iter(iter))
+}
+
+fn parse_compat(
+    ruby: &Ruby,
+    rb_self: Value,
+    args: &[Value],
+) -> Result<Yield<impl Iterator<Item = Vec<String>>>, Error> {
+    if !ruby.block_given() {
+        return Ok(Yield::Enumerator(
+            rb_self.enumeratorize("for_each_compat", args),
+        ));
+    }
+
+    let (to_read, has_headers, delimiter) = parse_csv_args(args)?;
+    let (rdr, _) = setup_csv_parser(ruby, to_read, has_headers, delimiter)?;
+
+    let iter = rdr.into_records().filter_map(|result| {
+        result
+            .ok()
+            .map(|record| record.iter().map(|field| field.to_string()).collect())
+    });
+
+    Ok(Yield::Iter(iter))
+}
+
+use std::io::Read;
+
+struct RubyIOReader {
+    io_obj: Value,
+}
+
+impl Read for RubyIOReader {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        let result: RString = self.io_obj.funcall("read", (buf.len(),)).map_err(|_| {
+            std::io::Error::new(std::io::ErrorKind::Other, "Failed to read from IO")
+        })?;
+
+        // Handle EOF case
+        if result.is_nil() {
+            return Ok(0);
+        }
+
+        let rust_string = result.to_string().map_err(|_| {
+            std::io::Error::new(std::io::ErrorKind::Other, "Failed to convert to string")
+        })?;
+        let bytes = rust_string.as_bytes();
+
+        let bytes_to_copy = rust_string.len().min(buf.len());
+        buf[..bytes_to_copy].copy_from_slice(&bytes[..bytes_to_copy]);
+
+        Ok(bytes_to_copy)
+    }
+}
+
+impl RubyIOReader {
+    fn new(ruby: &Ruby, value: Value) -> Result<Self, Error> {
+        if value.is_kind_of(ruby.class_io()) {
+            Ok(RubyIOReader { io_obj: value })
+        } else {
+            Err(Error::new(
+                ruby.exception_runtime_error(),
+                "IO object is not a valid IO object",
+            ))
+        }
+    }
+}

data/lib/osv/version.rb

@@ -1,3 +1,3 @@
 module OSV
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nathan Jaremko
@@ -50,7 +50,10 @@ files:
 - Cargo.toml
 - Gemfile
 - Rakefile
+- ext/osv/Cargo.lock
+- ext/osv/Cargo.toml
 - ext/osv/extconf.rb
+- ext/osv/src/lib.rs
 - lib/osv.rb
 - lib/osv/version.rb
 homepage: https://github.com/njaremko/osv