rscsv 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a9d0735fc650e4af41bd987918f7777b3999e26
-  data.tar.gz: aa023e6fa932ec1924fec51dda54fba4db101652
+SHA256:
+  metadata.gz: 40a0b9b97f5c3273d2f29e60f1124cb84f71a17ad2f3cb4aca6c57527e6fd270
+  data.tar.gz: 11d1c58a01c0a826d11cdbe8d3fcec9b1fd687dc948449471b4b536242cae054
 SHA512:
-  metadata.gz: fe6d3f9b69fae21960ed6da0f96503fec1e42af48d89f4161651bc490a2d5a6b6a2a8dd6cb0c5adbb36ef0f762a38ffa11637f377a48826f1d84f19ad74ede8e
-  data.tar.gz: 2c885429a4bcc8bb4f7b5d0c50ab0c2f88ecc6799b15949a7967a2159054e4c62ebdcf634275179b01bc008d5f53ea94882cddbd878a4f4374eb16a11ab51853
+  metadata.gz: ccb6484958de5857da020b74e52c57cf52373c777d67cb7710641832d7bdef9b71913108a0a143c70806c8b1dfe6d41f1cd6a70e008292be3bda78faf5d217cd
+  data.tar.gz: 2bef5822fad2b041333c063d05d3d5cf2565c7e022667600ce0daef586a3781df989573bf1053ecb8676de53a22c8c13101952172a05f3c70ea8e92c9ba88cdf

data/.travis.yml

@@ -1,10 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.3
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
 before_install:
-  - gem install bundler -v 1.15.4
+  - gem install bundler -v 1.16.1
   - if [ ! -e "$HOME/.cargo/bin" ]; then curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y; fi
   - export PATH="$HOME/.cargo/bin:$PATH"
   - rustup default stable

data/Cargo.lock

@@ -1,11 +1,3 @@
-[root]
-name = "rscsv"
-version = "0.3.3"
-dependencies = [
- "csv 1.0.0-beta.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "helix 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cslice"
 version = "0.3.0"
@@ -18,11 +10,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "csv"
-version = "1.0.0-beta.4"
+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.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -30,53 +22,58 @@ name = "csv-core"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "helix"
-version = "0.6.4"
+version = "0.7.2"
 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.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "libcruby-sys 0.6.4 (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)",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.31"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libcruby-sys"
-version = "0.6.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memchr"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rscsv"
+version = "0.3.3"
 dependencies = [
- "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.15"
+version = "1.0.24"
 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.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a841f3bc2c613b7a3e892c9c4404044de9dab6bc506e253bf8ef05ef906531e5"
+"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.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e131c0e8557e78f4d992b87e97cec90f8503c4b5f3af24e1183e4822736e8079"
-"checksum libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c"
-"checksum libcruby-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ee430573ef01035bdc2a4b0efe3051cf4933752ad314010189b6433e6c6e7035"
-"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7046c9d4c6c522d10b2d098f9bebe2bef227e0e74044d8c1bfcf6b476af799"
+"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"

data/Cargo.toml

@@ -8,5 +8,5 @@ authors = ["Ville Lautanala <lautis@gmail.com>"]
 crate-type = ["cdylib"]
 
 [dependencies]
-helix = "0.6.4"
+helix = "0.7.2"
 csv = "1.0.0-beta.4"

data/lib/rscsv/version.rb

@@ -1,3 +1,3 @@
 module Rscsv
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.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.6.4'
+  spec.add_dependency 'helix_runtime', '0.7.2'
   spec.add_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/src/lib.rs

@@ -4,138 +4,54 @@ extern crate csv;
 
 use std::error::Error;
 use std::io::Read;
-use std::slice::from_raw_parts;
 use helix::sys;
 use helix::sys::{ID, VALUE};
-use helix::{CheckResult, CheckedValue, ToRuby, ToRust, UncheckedValue};
+use helix::{FromRuby, CheckResult, ToRuby};
 use helix::libc::c_int;
 
-struct VecWrap<T>(Vec<T>);
-
-impl<T> UncheckedValue<VecWrap<T>> for VALUE
-where
-    VALUE: UncheckedValue<T>,
-{
-    fn to_checked(self) -> CheckResult<VecWrap<T>> {
-        if unsafe { sys::RB_TYPE_P(self, sys::T_ARRAY) } {
-            let slice = ruby_array_to_slice(self);
-            for val in slice.iter() {
-                if let Err(error) = val.to_checked() {
-                    return Err(format!("Failed to convert value for Vec<T>: {}", error));
-                }
-            }
-            Ok(unsafe { CheckedValue::<VecWrap<T>>::new(self) })
-        } else {
-            let val = unsafe { CheckedValue::<String>::new(sys::rb_inspect(self)) };
-            Err(format!(
-                "No implicit conversion of {} into Vec<String>",
-                val.to_rust()
-            ))
-        }
-    }
-}
-
-fn ruby_array_to_slice<'a>(array: VALUE) -> &'a [VALUE] {
-    let length = unsafe { sys::RARRAY_LEN(array) } as usize;
-    unsafe { from_raw_parts(sys::RARRAY_CONST_PTR(array), length) }
-}
-
-impl ToRust<VecWrap<String>> for CheckedValue<VecWrap<String>>
-where
-    VALUE: UncheckedValue<String>,
-    CheckedValue<String>: ToRust<String>,
-{
-    fn to_rust(self) -> VecWrap<String> {
-        let slice = ruby_array_to_slice(self.inner);
-        let mut vec: Vec<String> = Vec::with_capacity(slice.len());
-        for val in slice.iter() {
-            let checked = val.to_checked().unwrap();
-            vec.push(checked.to_rust());
-        }
-        VecWrap(vec)
-    }
-}
-
-impl ToRust<VecWrap<VecWrap<String>>> for CheckedValue<VecWrap<VecWrap<String>>>
-where
-    VALUE: UncheckedValue<VecWrap<String>>,
-    CheckedValue<VecWrap<String>>: ToRust<VecWrap<String>>,
-{
-    fn to_rust(self) -> VecWrap<VecWrap<String>> {
-        let slice = ruby_array_to_slice(self.inner);
-        let mut vec: Vec<VecWrap<String>> = Vec::with_capacity(slice.len());
-        for val in slice.iter() {
-            let checked = val.to_checked().unwrap();
-            vec.push(checked.to_rust());
-        }
-        VecWrap(vec)
-    }
-}
-
 #[cfg_attr(windows, link(name = "helix-runtime"))]
 extern "C" {
-    pub fn rb_ary_new_capa(capa: isize) -> VALUE;
-    pub fn rb_ary_entry(ary: VALUE, offset: isize) -> VALUE;
-    pub fn rb_ary_push(ary: VALUE, item: VALUE) -> VALUE;
     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;
 }
 
-impl ToRuby for VecWrap<csv::StringRecord> {
-    fn to_ruby(self) -> VALUE {
-        let ary = unsafe { rb_ary_new_capa(self.0.len() as isize) };
-        for row in self.0 {
-            let inner_array = unsafe { rb_ary_new_capa(row.len() as isize) };
-            for column in row.iter() {
-                unsafe {
-                    rb_ary_push(inner_array, column.to_ruby());
-                }
-            }
-            unsafe {
-                rb_ary_push(ary, inner_array);
-            }
-        }
-        ary
-    }
-}
-
-fn generate_lines(rows: VecWrap<VecWrap<String>>) -> Result<String, Box<Error>> {
+fn generate_lines(rows: Vec<Vec<String>>) -> Result<String, Box<Error>> {
     let mut wtr = csv::WriterBuilder::new().from_writer(vec![]);
-    for row in rows.0 {
-        wtr.write_record(&(row.0))?;
+    for row in rows {
+        wtr.write_record(&row)?;
     }
 
     Ok(String::from_utf8(wtr.into_inner()?)?)
 }
 
 fn record_to_ruby(record: &csv::ByteRecord) -> VALUE {
-    let inner_array = unsafe { rb_ary_new_capa(record.len() as isize) };
+    let inner_array = unsafe { sys::rb_ary_new_capa(record.len() as isize) };
     for column in record.iter() {
         unsafe {
             let column_value =
                 sys::rb_utf8_str_new(column.as_ptr() as *const i8, column.len() as i64);
-            rb_ary_push(inner_array, column_value);
+            sys::rb_ary_push(inner_array, column_value);
         }
     }
     inner_array
 }
 
-
-impl UncheckedValue<Enumerator> for VALUE {
-    fn to_checked(self) -> CheckResult<Enumerator> {
-        Ok(unsafe { CheckedValue::new(self) })
-    }
+struct Enumerator {
+    value: VALUE,
 }
 
-impl ToRust<Enumerator> for CheckedValue<Enumerator> {
-    fn to_rust(self) -> Enumerator {
-        Enumerator { value: self.inner }
+impl FromRuby for Enumerator {
+    type Checked = Enumerator;
+
+    fn from_ruby(value: VALUE) -> CheckResult<Enumerator> {
+        // TODO: validate this?
+        Ok(Enumerator { value })
     }
-}
 
-struct Enumerator {
-    value: VALUE,
+    fn from_checked(checked: Enumerator) -> Enumerator {
+        checked
+    }
 }
 
 struct EnumeratorRead {
@@ -146,7 +62,7 @@ struct EnumeratorRead {
 impl EnumeratorRead {
     fn new(value: VALUE) -> EnumeratorRead {
         EnumeratorRead {
-            value: value,
+            value,
             next: None,
         }
     }
@@ -180,14 +96,10 @@ impl EnumeratorRead {
                 0,
             )
         };
-        let slice = unsafe {
-            from_raw_parts(
-                sys::RSTRING_PTR(next) as *const u8,
-                sys::RSTRING_LEN(next) as usize,
-            )
-        };
 
-        self.read_and_store_overflow(buf, slice)
+        let string = String::from_ruby_unwrap(next);
+
+        self.read_and_store_overflow(buf, string.as_bytes())
     }
 }
 
@@ -221,43 +133,39 @@ fn yield_csv(data: Enumerator) -> Result<(), csv::Error> {
     Ok(())
 }
 
-fn parse_csv(data: String) -> Result<Vec<csv::StringRecord>, csv::Error> {
-    let mut reader = csv_reader(data.as_bytes());
-    reader
+fn parse_csv(data: String) -> Result<Vec<Vec<VALUE>>, csv::Error> {
+    csv_reader(data.as_bytes())
         .records()
-        .collect::<Result<Vec<csv::StringRecord>, csv::Error>>()
+        .map(|r| r.map(record_to_vec))
+        .collect()
+}
+
+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) {
-            match yield_csv(data) {
-                Err(_) => throw!("Error parsing CSV"),
-                Ok(_) => ()
-            }
+        def each_internal(data: Enumerator) -> Result<(), &'static str> {
+            yield_csv(data).map_err(|_| "Error parsing CSV")
         }
-        def parse(data: String) -> VecWrap<csv::StringRecord> {
-            match parse_csv(data) {
-                Err(_) => throw!("Error parsing CSV"),
-                Ok(result) => VecWrap(result)
-            }
+
+        def parse(data: String) -> Result<Vec<Vec<VALUE>>, &'static str> {
+            parse_csv(data).map_err(|_| "Error parsing CSV")
         }
     }
+
     class RscsvWriter {
-        def generate_line(row: VecWrap<String>) -> String {
+        def generate_line(row: Vec<String>) -> Result<String, &'static str> {
             let mut wtr = csv::WriterBuilder::new().from_writer(vec![]);
-            let result = wtr.write_record(&(row.0));
-            match result {
-                Err(_) => throw!("Error generating csv"),
-                Ok(_) => String::from_utf8(wtr.into_inner().unwrap()).unwrap(),
-            }
+
+            wtr.write_record(&row)
+                .map(|_| String::from_utf8(wtr.into_inner().unwrap()).unwrap())
+                .map_err(|_| "Error generating csv")
         }
 
-        def generate_lines(rows: VecWrap<VecWrap<String>>) -> String {
-            match generate_lines(rows) {
-                Err(_) => throw!("Error generating csv"),
-                Ok(csv) => csv
-            }
+        def generate_lines(rows: Vec<Vec<String>>) -> Result<String, &'static str> {
+            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.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-12-28 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.6.4
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rust-powered CSV