rscsv 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a0b9b97f5c3273d2f29e60f1124cb84f71a17ad2f3cb4aca6c57527e6fd270
-  data.tar.gz: 11d1c58a01c0a826d11cdbe8d3fcec9b1fd687dc948449471b4b536242cae054
+  metadata.gz: 147b5e77ae27df3d9db307249e6dca18bdcc6c438238c7b53ccf0637288c6a9c
+  data.tar.gz: d3eea2efba98f4dcd80c0d7c67fa0684ee02f4efc3df666a1fa88a954364ed94
 SHA512:
-  metadata.gz: ccb6484958de5857da020b74e52c57cf52373c777d67cb7710641832d7bdef9b71913108a0a143c70806c8b1dfe6d41f1cd6a70e008292be3bda78faf5d217cd
-  data.tar.gz: 2bef5822fad2b041333c063d05d3d5cf2565c7e022667600ce0daef586a3781df989573bf1053ecb8676de53a22c8c13101952172a05f3c70ea8e92c9ba88cdf
+  metadata.gz: b83963c68975702176dd3fc3c16bc3d65fc211c8444cf6f36ec3ba5cd6ef954328a3034fdebfe07937fa651ab6708bf50d6646f643690f1e5b0d6d526880f601
+  data.tar.gz: a766556bb9de6518c77ee11071a7dfa8f8fb73d6d6b2035085d0a108a0146ec4540e5df0aafd3570a42fc46778149499f8bef720bcf798693930bd55b1dd28ba

data/Cargo.lock

@@ -1,8 +1,3 @@
-[[package]]
-name = "cslice"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "cstr-macro"
 version = "0.1.0"
@@ -13,67 +8,68 @@ name = "csv"
 version = "1.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "csv-core 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "csv-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "helix"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "libcruby-sys 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libcruby-sys 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.34"
+version = "0.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libcruby-sys"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memchr"
-version = "1.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "rscsv"
-version = "0.3.3"
+version = "0.5.0"
 dependencies = [
  "csv 1.0.0-beta.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "helix 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "helix 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
-"checksum cslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f8cb7306107e4b10e64994de6d3274bd08996a7c1322a27b86482392f96be0a"
 "checksum cstr-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db53fddba18cdd35477a7213a3ef6acfbfa333c31b42ce019e544c4a1420a06f"
 "checksum csv 1.0.0-beta.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e7a9e063dcebdb56c306f23e672bfd31df3da8ec5f6d696b35f2c29c2a9572f0"
-"checksum csv-core 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1fbabf21d9a52d04675cc5b032d7bae24ecdcd22646f7eefcd0496a122686c"
-"checksum helix 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf45e0f51337f76d3481ac5a29693ca6138dcfa569a671988c7c65a6536d4cf"
-"checksum libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "36fbc8a8929c632868295d0178dd8f63fc423fd7537ad0738372bd010b3ac9b0"
-"checksum libcruby-sys 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a8d944129f388f0dfd391fb8308f4e0b9cde5c83ed1e66c1ee395445ad62282c"
-"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
-"checksum serde 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "1c57ab4ec5fa85d08aaf8ed9245899d9bbdd66768945b21113b84d5f595cb6a1"
+"checksum csv-core 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4dd8e6d86f7ba48b4276ef1317edc8cc36167546d8972feb4a2b5fec0b374105"
+"checksum helix 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1a5e45d09f37327fded2b1e0939ab4c061e181b0c007f82c53ccd03e869cf085"
+"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
+"checksum libcruby-sys 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b0fb9beb529127d706dd12e26f961be3e527badb74a7b2e5d6b9d928fe6059"
+"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
+"checksum serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4763b773978e495252615e814d2ad04773b2c1f85421c7913869a537f35cb406"

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rscsv"
-version = "0.3.3"
+version = "0.5.0"
 authors = ["Ville Lautanala <lautis@gmail.com>"]
 
 [lib]
@@ -8,5 +8,5 @@ authors = ["Ville Lautanala <lautis@gmail.com>"]
 crate-type = ["cdylib"]
 
 [dependencies]
-helix = "0.7.2"
+helix = "0.7.3"
 csv = "1.0.0-beta.4"

data/lib/rscsv/version.rb

@@ -1,3 +1,3 @@
 module Rscsv
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/rscsv.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions = Dir['ext/extconf.rb']
 
-  spec.add_dependency 'helix_runtime', '0.7.2'
+  spec.add_dependency 'helix_runtime', '0.7.3'
   spec.add_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/src/lib.rs

@@ -5,21 +5,14 @@ extern crate csv;
 use std::error::Error;
 use std::io::Read;
 use helix::sys;
-use helix::sys::{ID, VALUE};
+use helix::sys::{VALUE, RubyException};
 use helix::{FromRuby, CheckResult, ToRuby};
-use helix::libc::c_int;
+use helix::libc::{c_void};
 
-#[cfg_attr(windows, link(name = "helix-runtime"))]
-extern "C" {
-    pub fn rb_block_given_p() -> c_int;
-    pub fn rb_yield(value: VALUE);
-    pub fn rb_funcall(value: VALUE, name: ID, nargs: c_int, ...) -> VALUE;
-}
-
-fn generate_lines(rows: Vec<Vec<String>>) -> Result<String, Box<Error>> {
+fn generate_lines(rows: &[Vec<String>]) -> Result<String, Box<Error>> {
     let mut wtr = csv::WriterBuilder::new().from_writer(vec![]);
     for row in rows {
-        wtr.write_record(&row)?;
+        wtr.write_record(row)?;
     }
 
     Ok(String::from_utf8(wtr.into_inner()?)?)
@@ -37,6 +30,33 @@ fn record_to_ruby(record: &csv::ByteRecord) -> VALUE {
     inner_array
 }
 
+extern fn protect_wrapper<F>(closure: *mut c_void) -> VALUE
+      where F: FnOnce() -> VALUE {
+    let closure_option = closure as *mut Option<F>;
+    unsafe {
+      (*closure_option).take().unwrap()()
+    }
+  }
+
+pub fn protect<F>(func: F) -> Result<VALUE, RubyException>
+where
+    F: FnOnce() -> VALUE,
+{
+    let mut state = sys::EMPTY_EXCEPTION;
+    let value = unsafe {
+        sys::rb_protect(
+            protect_wrapper::<F>,
+            &func as *const _ as *mut c_void,
+            &mut state,
+        )
+    };
+    if state == sys::EMPTY_EXCEPTION {
+        Ok(value)
+    } else {
+        Err(state)
+    }
+}
+
 struct Enumerator {
     value: VALUE,
 }
@@ -89,24 +109,33 @@ impl EnumeratorRead {
     }
 
     fn read_from_external(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        let next = unsafe {
-            rb_funcall(
-                self.value,
-                sys::rb_intern("next\0".as_ptr() as *const i8),
-                0,
-            )
-        };
 
-        let string = String::from_ruby_unwrap(next);
+        let value = self.value;
+        let result = protect(|| {
+            unsafe { sys::rb_funcall(
+                value,
+                sys::rb_intern("next\0".as_ptr() as *const i8),
+                0)
+            }
+        });
+        match result {
+            Ok(next) => {
+                let string = String::from_ruby_unwrap(next);
+                self.read_and_store_overflow(buf, string.as_bytes())
+            },
+            Err(state) => {
+                unsafe { sys::rb_jump_tag(state) };
+                //Err(std::io::Error::new(ErrorKind::Other, "Ruby Exception"))
+            }
+        }
 
-        self.read_and_store_overflow(buf, string.as_bytes())
     }
 }
 
 impl Read for EnumeratorRead {
     fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        match self.next.clone() {
-            Some(inner) => self.read_and_store_overflow(buf, &inner),
+        match self.next.take() {
+            Some(ref inner) => self.read_and_store_overflow(buf, inner),
             None => self.read_from_external(buf),
         }
     }
@@ -119,39 +148,45 @@ fn csv_reader<R: Read>(reader: R) -> csv::Reader<R> {
         .from_reader(reader)
 }
 
-fn yield_csv(data: Enumerator) -> Result<(), csv::Error> {
+fn yield_csv(data: &Enumerator) -> Result<(), csv::Error> {
     let mut reader = csv_reader(EnumeratorRead::new(data.value));
     let mut record = csv::ByteRecord::new();
 
     while reader.read_byte_record(&mut record)? {
         let inner_array = record_to_ruby(&record);
-        unsafe {
-            rb_yield(inner_array);
+        let result = protect(|| {
+            unsafe {
+                return sys::rb_yield(inner_array);
+            }
+        });
+
+        if result.is_err() {
+            unsafe { sys::rb_jump_tag(result.unwrap_err()) };
         }
     }
 
     Ok(())
 }
 
-fn parse_csv(data: String) -> Result<Vec<Vec<VALUE>>, csv::Error> {
+fn parse_csv(data: &str) -> Result<Vec<Vec<VALUE>>, csv::Error> {
     csv_reader(data.as_bytes())
         .records()
-        .map(|r| r.map(record_to_vec))
+        .map(|r| r.map(|v| record_to_vec(&v)))
         .collect()
 }
 
-fn record_to_vec(record: csv::StringRecord) -> Vec<VALUE> {
+fn record_to_vec(record: &csv::StringRecord) -> Vec<VALUE> {
     record.iter().map(|s| s.to_ruby().unwrap()).collect()
 }
 
 ruby! {
     class RscsvReader {
         def each_internal(data: Enumerator) -> Result<(), &'static str> {
-            yield_csv(data).map_err(|_| "Error parsing CSV")
+            yield_csv(&data).map_err(|_| "Error parsing CSV")
         }
 
         def parse(data: String) -> Result<Vec<Vec<VALUE>>, &'static str> {
-            parse_csv(data).map_err(|_| "Error parsing CSV")
+            parse_csv(&data).map_err(|_| "Error parsing CSV")
         }
     }
 
@@ -165,7 +200,7 @@ ruby! {
         }
 
         def generate_lines(rows: Vec<Vec<String>>) -> Result<String, &'static str> {
-            generate_lines(rows).map_err(|_| "Error generating csv")
+            generate_lines(&rows).map_err(|_| "Error generating csv")
         }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rscsv
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helix_runtime
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement