fastcsv 0.0.5 → 0.0.6

data/ext/fastcsv/fastcsv.rl

@@ -104,7 +104,7 @@ typedef struct {
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -112,11 +112,12 @@ typedef struct {
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
 
   action new_row {
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -160,6 +161,8 @@ typedef struct {
   field = unquoted | quoted;
 
   # @see Ragel Guide: 6.3 Scanners
+  # > Entering
+  # % Leaving
   # An unquoted field can be zero-length.
   main := |*
     field col_sep;
@@ -466,6 +469,13 @@ static VALUE raw_parse(int argc, VALUE *argv, VALUE self) {
     else if (io) {
       have = pe - ts;
       memmove(buf, ts, have);
+      // @see https://github.com/hpricot/hpricot/blob/master/ext/hpricot_scan/hpricot_scan.rl#L92
+      if (d->start > ts) {
+        d->start = buf + (d->start - ts);
+      }
+      if (mark_row_sep > ts) {
+        mark_row_sep = buf + (mark_row_sep - ts);
+      }
       te = buf + (te - ts);
       ts = buf;
     }

data/fastcsv.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "fastcsv"
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["James McKinney"]
   s.homepage    = "https://github.com/jpmckinney/fastcsv"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastcsv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - James McKinney
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fast Ragel-based CSV parser, compatible with Ruby's CSV