rscsv 0.6.0.beta4-x86_64-linux → 0.7.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a1cd251d670bb60652d3ba4c3061bb72b34431d2a497e0f469089b33ecec06
-  data.tar.gz: 4a555184b2e2ec8741455f746a278b3cae7bafd78f743a7c92f0622b28403893
+  metadata.gz: 1592c8c05eea6f97eb710e8192f412ff6f8265d521504a4ff42d93ae8ee5a317
+  data.tar.gz: 4eb931b86e615e65e33505283de1f5a4b6cb9c6e108e2a72d414e9e56e9b0c54
 SHA512:
-  metadata.gz: 35edacb42e375b059a91e128406d17cb5b15ea8383a34b01a1228cea8a878312fe960e1b9f6717b9520e96d5708d281b997c38918508b159e5b3be2690733e0d
-  data.tar.gz: bfe7afc159f2a40eecce9cf878cb6c94371cf32b35735abfae4dee31cb87329458e737306adc472070f24f69f096e79d0fd954cd7d20aa18f89641277da25797
+  metadata.gz: e7ad76f31d97745aa5caddcd28340ba91bd86dcea5d57f633d22e7150ae726ca639e4bdb94a4e892ce7ee0dbbcd0b4c1c954951957c76a64f9d9e256a168b60c
+  data.tar.gz: 47909516a75c1520328832cbe6303afd8f58b826372646491f6784dddb4ac45613663697a34f08ea339844ae7bcc8f3b8d35d9d2967ef9480b0e1471fd4fe52c

data/README.md

@@ -3,8 +3,6 @@
 Fast CSV using Rust extensions. Can read arrays of arrays from strings and write
 strings from arrays of arrays.
 
-[![Build Status](https://travis-ci.org/lautis/rscsv.svg?branch=master)](https://travis-ci.org/lautis/rscsv)
-
 ## Installation
 
 This gem requires Rust (~> 1.17) and Cargo to be installed. With those

data/ext/rscsv/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "rscsv"
+version = "0.7.0"
+authors = ["Ville Lautanala <lautis@gmail.com>"]
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+magnus = { version = "0.7", features = ["rb-sys"] }
+csv = "1"

data/ext/rscsv/extconf.rb

@@ -0,0 +1,5 @@
+require "mkmf"
+require "rb_sys/mkmf"
+
+create_rust_makefile("rscsv/rscsv")
+

data/ext/rscsv/src/lib.rs

@@ -0,0 +1,146 @@
+use magnus::{
+    block::yield_value, function, prelude::*, Error, RArray, RString, Ruby, Value,
+};
+use std::io::Read;
+
+fn generate_lines(rows: Vec<Vec<String>>) -> Result<String, Error> {
+    let mut wtr = csv::WriterBuilder::new().from_writer(vec![]);
+    for row in rows {
+        wtr.write_record(&row)
+            .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+    }
+
+    let inner = wtr
+        .into_inner()
+        .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+
+    String::from_utf8(inner)
+        .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))
+}
+
+fn record_to_ruby_array(record: &csv::ByteRecord) -> Result<RArray, Error> {
+    let array = RArray::with_capacity(record.len());
+    for column in record.iter() {
+        let column_str = RString::from_slice(column);
+        array.push(column_str)?;
+    }
+    Ok(array)
+}
+
+struct EnumeratorRead {
+    enumerator: Value,
+    buffer: Option<Vec<u8>>,
+}
+
+impl EnumeratorRead {
+    fn new(enumerator: Value) -> Self {
+        EnumeratorRead {
+            enumerator,
+            buffer: None,
+        }
+    }
+
+    fn read_and_store_overflow(&mut self, buf: &mut [u8], value: &[u8]) -> std::io::Result<usize> {
+        if value.len() > buf.len() {
+            let (current, next) = value.split_at(buf.len());
+            buf.copy_from_slice(current);
+            self.buffer = Some(next.to_vec());
+            Ok(current.len())
+        } else {
+            buf[..value.len()].copy_from_slice(value);
+            self.buffer = None;
+            Ok(value.len())
+        }
+    }
+
+    fn read_from_external(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        let result: Result<String, Error> = self.enumerator.funcall("next", ());
+        match result {
+            Ok(string) => self.read_and_store_overflow(buf, string.as_bytes()),
+            Err(_) => {
+                // StopIteration or other exception - signal EOF
+                Ok(0)
+            }
+        }
+    }
+}
+
+impl Read for EnumeratorRead {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        match self.buffer.take() {
+            Some(ref inner) => self.read_and_store_overflow(buf, inner),
+            None => self.read_from_external(buf),
+        }
+    }
+}
+
+fn csv_reader<R: Read>(reader: R) -> csv::Reader<R> {
+    csv::ReaderBuilder::new()
+        .buffer_capacity(16 * 1024)
+        .has_headers(false)
+        .from_reader(reader)
+}
+
+fn yield_csv(enumerator: Value) -> Result<(), Error> {
+    let mut reader = csv_reader(EnumeratorRead::new(enumerator));
+    let mut record = csv::ByteRecord::new();
+
+    loop {
+        let has_record = reader
+            .read_byte_record(&mut record)
+            .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+
+        if !has_record {
+            break;
+        }
+
+        let row_array = record_to_ruby_array(&record)?;
+        let _: Value = yield_value(row_array)?;
+    }
+
+    Ok(())
+}
+
+fn parse_csv(data: String) -> Result<RArray, Error> {
+    let mut reader = csv_reader(data.as_bytes());
+    let result = RArray::new();
+
+    for record in reader.records() {
+        let record = record
+            .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+
+        let row = RArray::with_capacity(record.len());
+        for field in record.iter() {
+            row.push(RString::new(field))?;
+        }
+        result.push(row)?;
+    }
+
+    Ok(result)
+}
+
+fn generate_line(row: Vec<String>) -> Result<String, Error> {
+    let mut wtr = csv::WriterBuilder::new().from_writer(vec![]);
+    wtr.write_record(&row)
+        .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+
+    let inner = wtr
+        .into_inner()
+        .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))?;
+
+    String::from_utf8(inner)
+        .map_err(|e| Error::new(magnus::exception::runtime_error(), e.to_string()))
+}
+
+#[magnus::init]
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let reader_class = ruby.define_class("RscsvReader", ruby.class_object())?;
+    reader_class.define_singleton_method("each_internal", function!(yield_csv, 1))?;
+    reader_class.define_singleton_method("parse", function!(parse_csv, 1))?;
+
+    let writer_class = ruby.define_class("RscsvWriter", ruby.class_object())?;
+    writer_class.define_singleton_method("generate_line", function!(generate_line, 1))?;
+    writer_class.define_singleton_method("generate_lines", function!(generate_lines, 1))?;
+
+    Ok(())
+}

data/lib/rscsv/version.rb

@@ -1,3 +1,3 @@
 module Rscsv
-  VERSION = '0.6.0.beta4'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/rscsv.rb

@@ -1,6 +1,5 @@
-require 'helix_runtime'
-require 'rscsv/native'
-require 'rscsv/version'
+require_relative 'rscsv/rscsv'
+require_relative 'rscsv/version'
 
 module Rscsv
   Reader = RscsvReader
@@ -12,5 +11,6 @@ module Rscsv
       nil
     end
   end
+
   Writer = RscsvWriter
 end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rscsv
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta4
+  version: 0.7.0
 platform: x86_64-linux
 authors:
 - Ville Lautanala
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2026-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: helix_runtime
+  name: rb_sys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +129,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
+- ext/rscsv/Cargo.toml
+- ext/rscsv/extconf.rb
+- ext/rscsv/src/lib.rs
 - lib/rscsv.rb
-- lib/rscsv/native.so
+- lib/rscsv/3.0/rscsv.so
+- lib/rscsv/3.1/rscsv.so
+- lib/rscsv/3.2/rscsv.so
+- lib/rscsv/3.3/rscsv.so
+- lib/rscsv/3.4/rscsv.so
 - lib/rscsv/version.rb
-- lib/tasks/helix_runtime.rake
 homepage: https://github.com/lautis/rscsv
 licenses:
 - MIT
@@ -107,15 +153,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: Rust-powered CSV

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rscsv.gemspec
-gemspec

data/Rakefile

@@ -1,9 +0,0 @@
-require 'bundler/gem_tasks'
-require 'bundler/setup'
-require 'rspec/core/rake_task'
-import 'lib/tasks/helix_runtime.rake'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :spec => :build
-task :default => :spec

data/lib/tasks/helix_runtime.rake

@@ -1,5 +0,0 @@
-require 'helix_runtime/build_task'
-
-HelixRuntime::BuildTask.new
-
-task :default => :build