xcsv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff9165c5564192166cd4dba6c141e7cbec377d7e89b1e83aefeeed16a5f14e1
-  data.tar.gz: a8d607ec64710a73488358e07481f99a62d12f2fb09fe9747b44893ebc6c6860
+  metadata.gz: 42eb140ee193e61a54d51f784eb2e793bcb4811892344b1edb3e0a0146eb92b1
+  data.tar.gz: cdd5a40fa9e4faf7586bae3c8d42689cadfc6f969cbfe6e384c65c687a1228a8
 SHA512:
-  metadata.gz: 78a1b77ae1f099e37966c93fca1669feb1c02bdb0f8e760bd1b8db36b9484eb3180041f2b704bf7dd5ba948bf6f25683b7924c27bb358911a8bf534463711a93
-  data.tar.gz: f3bb8a94f289faf706a65576f7d51b36f2c13504c76dd874813e34ee1572217ab3f5c9be2ba8db9e7381108dfdad95734d93960632dd08c6f4a82f1d39dce5ca
+  metadata.gz: 21f528621774e3da62632ab9b5669764270cce4ef6aed37d81b0d6630b5b56a1569a919da2755f19e246718e92840747b3e1b4032cc918d6d029fa08ab6b9575
+  data.tar.gz: 70a4c13f561575d12d48e0a40e2691cd6485f5b0d5d8152c2e6e6ab6b33eed9343f80f4736b0529dbc8c72f1b27dd422783c82072b069241bcb0dd84528ab003

data/.gitignore

@@ -1,2 +1,5 @@
 /target
 *.so
+/*.gem
+/.bundle
+/vendor/bundle

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcsv (0.1.0)
+    xcsv (0.2.0)
       helix_runtime (= 0.7.5)
 
 GEM
@@ -34,9 +34,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.17)
-  xcsv!
   rake (~> 12.3)
   rspec (~> 3.8)
+  xcsv!
 
 BUNDLED WITH
    1.17.1

data/README.md

@@ -8,15 +8,14 @@ Fast CSV reader based on [Rust CSV crate](https://docs.rs/csv/1.0.2/csv/)
 
    Don't miss this message:
 
-	```
-	Rust is installed now. Great!
+   ```
+   Rust is installed now. Great!
 
-	To get started you need Cargo's bin directory ($HOME/.cargo/bin) in your PATH 
-	environment variable. Next time you log in this will be done automatically.
+   To get started you need Cargo's bin directory ($HOME/.cargo/bin) in your PATH 
+   environment variable. Next time you log in this will be done automatically.
 
-	To configure your current shell run source $HOME/.cargo/env
-
-	```
+   To configure your current shell run source $HOME/.cargo/env
+   ```
 
 2. `gem install xcsv`
 
@@ -34,7 +33,7 @@ end
 csv_reader = XSV.new("foo.csv")
 csv_reader.take(10).to_a #=> [[col1, ...], [col1, ...], ...]
 
-# While loop
+# while loop
 csv_reader = XSV.new("bar.csv") 
 while (rec = csv_reader.next) do
   rec #=> [col1, col2, col3, ...]
@@ -58,7 +57,7 @@ end
 
 # XCSV
 csv_reader = XCSV.new('sample.csv')
-while (l = csv_reader.next) do
+while (rec = csv_reader.next) do
 end
 
 # CSV

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "xcsv"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/lib/xcsv.rb

@@ -1,12 +1,23 @@
 require 'helix_runtime'
 require 'xcsv/native'
+require 'xcsv/version'
 
 class XCSV
   include Enumerable
 
+  def self.open(path)
+    xcsv = new(path)
+    xcsv.open
+    begin
+      yield xcsv
+    ensure
+      xcsv.close
+    end
+  end
+
   def each
-    while (r = self.next) do
-      yield r
+    while (rec = self.next) do
+      yield rec
     end
   end
 end

data/lib/xcsv/version.rb

@@ -1,3 +1,3 @@
 class XCSV
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/src/lib.rs

@@ -12,14 +12,10 @@ use std::ops::{Deref, DerefMut};
 use flate2::read::GzDecoder;
 use regex::Regex;
 
-use helix::{FromRuby, CheckResult};
-use helix::sys::{VALUE};
-
 type CSVIterType = Iterator<Item=Result<csv::StringRecord, csv::Error>>;
 
 struct CSVIter {
     iter: Box<CSVIterType>,
-    path: String,
 }
 
 impl Deref for CSVIter {
@@ -38,7 +34,7 @@ impl DerefMut for CSVIter {
 
 impl std::fmt::Debug for CSVIter {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "CSVIter: {}", self.path)
+        write!(f, "CSVIter")
     }
 }
 
@@ -48,61 +44,62 @@ impl Clone for CSVIter {
     }
 }
 
-impl FromRuby for CSVIter {
-    type Checked = CSVIter;
-
-    fn from_ruby(value: VALUE) -> CheckResult<CSVIter> {
-        let checked_path = String::from_ruby(value)?;
-
-        let path = String::from_checked(checked_path);
-
-        let gz_regex = Regex::new("\\.gz\\z").unwrap();
+ruby! {
+    class XCSV {
+        struct {
+            path: String,
+            iter: Option<CSVIter>,
+        }
 
-        let buf_reader = 
-            match File::open(path.clone()) {
-                Ok(f)   => BufReader::new(f),
-                Err(e)  => raise!(format!("Error while opening file: {}", e)),
-            };
+        def initialize(helix, path: String) {
+            XCSV { helix, path, iter: None }
+        }
 
-        let gz_reader: Box<Read> =
-            if gz_regex.is_match(&path) {
-                Box::new(GzDecoder::new(buf_reader)) 
-            } else {
-                Box::new(buf_reader)  
-            };
+        def open(&mut self) -> Result<(), helix::Error> {
+            self.iter = None;
 
-        let csv_reader =
-            csv::ReaderBuilder::new()
-                .has_headers(false)
-                .from_reader(gz_reader);
+            let gz_regex = Regex::new("\\.gz\\z").unwrap();
 
-        Ok(CSVIter{iter: Box::new(csv_reader.into_records()), path: path})
-    }
+            let buf_reader = 
+                match File::open(&self.path) {
+                    Ok(f)   => BufReader::new(f),
+                    Err(e)  => raise!(e.to_string()),
+                };
 
-    fn from_checked(checked: CSVIter) -> CSVIter {
-        checked
-    }
-}
+            let gz_reader: Box<Read> =
+                if gz_regex.is_match(&self.path) {
+                    Box::new(GzDecoder::new(buf_reader)) 
+                } else {
+                    Box::new(buf_reader)  
+                };
 
-ruby! {
-    class XCSV {
-        struct {
-            iter: CSVIter,
-        }
+            let csv_reader =
+                csv::ReaderBuilder::new()
+                    .has_headers(false)
+                    .from_reader(gz_reader);
 
-        def initialize(helix, iter: CSVIter) {
-            XCSV { helix, iter }
+            self.iter = Some(CSVIter{iter: Box::new(csv_reader.into_records())});
+            Ok(())
         }
 
         def next(&mut self) -> Result<Option<Vec<String>>, helix::Error> {
-            match self.iter.next() {
-                Some(Ok(record)) =>
-                    Ok(Some(record.iter().map(|s| s.to_string()).collect())), 
-                Some(Err(e)) =>
-                    raise!(e.to_string()),
+            match self.iter {
+                Some(ref mut iter) =>
+                    match iter.next() {
+                        Some(Ok(record)) =>
+                            Ok(Some(record.iter().map(|s| s.to_string()).collect())), 
+                        Some(Err(e)) =>
+                            raise!(e.to_string()),
+                        None =>
+                            Ok(None)
+                    }
                 None =>
-                    Ok(None)
+                    raise!("closed file")
             }
         }
+
+        def close(&mut self) -> () {
+            self.iter = None
+        }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcsv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Moroz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helix_runtime
@@ -80,6 +80,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/console
 - extconfig.rb
 - lib/xcsv.rb
 - lib/xcsv/version.rb