nesquikcsv 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: babce6b120898ac102e11c74f0875aab80e9f3d3
-  data.tar.gz: 157179256f0993baf0856627985597086697cde7
+  metadata.gz: 3db12fc1239fab060c9570293abcf5f3460e3054
+  data.tar.gz: e37f17ee6cfba0c33b8ad2539dcd2194d3cf3b17
 SHA512:
-  metadata.gz: 14fafb70587398a3208ad4a3e81017400398c3c61eb7aef4411d75a62c7b5c2852b9badfc329168b2f443168f3b5fe6e72e97ce887594ac5dc6e33b6ee8bc92e
-  data.tar.gz: fcd3df543fc53688e46e2792764ea2380a86f523e4964baf56823193236b26c81208a8deb41f909700edb6408594b09daf1bec4f1d4023157d5b050808b40766
+  metadata.gz: 21ac6172e171f974ec968d02788173b2b4ab5c1e687d38fc9e0f6e28d7873321299389f11dbf256960ddbdea8df03e5d4f0b3fc9ea8817b95ab98e3ba1be1935
+  data.tar.gz: 50e06a368ded7336c0232d332d12421ca89fa66cec597894fc5f96ead4013525311023cf850e63aed94ef2ba398a1d9395c9ce20cc12f8d446822a7a319ad9f3

data/README.md

@@ -1,8 +1,6 @@
 # NesquikCSV
 
-Fork of the Fastest-CSV gem.
-
-Uses native C code to parse CSV lines in MRI Ruby.
+Fork of the Fastest-CSV gem to support different encodings. Uses native C code to parse CSV lines in MRI Ruby.
 
 Supports standard CSV according to RFC4180. Not the so-called "csv" from Excel.
 
@@ -16,22 +14,25 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    bundle
 
 Or install it yourself as:
 
-    $ gem install nesquikcsv
+    gem install nesquikcsv
 
 ## Usage
 
 Parse single line
 
-    NesquikCSV.parse_line("one,two,three", "UTF-8")
+    # If no encoding is specified UTF-8 is assumed
+    NesquikCSV.parse_line "one,two,three" 
      => ["one", "two", "three"]
+    NesquikCSV.parse_line "uno,dós,trés", "ASCII-8BIT"
+     => ["uno", "d\xC3\xB3s", "tr\xC3\xA9s"]
 
 Parse string in array of arrays
 
     # Defaults to UTF-8
     rows = NesquikCSV.parse(csv_data)
     # Explicitly
-    rows = NesquikCSV.parse(csv_data, "UTF-8")
+    rows = NesquikCSV.parse(csv_data, "UTF-8")

data/ext/csv_parser/parser.c

@@ -63,7 +63,7 @@ static VALUE parse_line(VALUE self, VALUE str, VALUE encoding)
                 if (state == UNQUOTED) {
                     state = IN_QUOTED;
                 }
-                else if (state == 1) {
+                else if (state == IN_QUOTED) {
                     state = QUOTE_IN_QUOTED;
                 }
                 else if (state == QUOTE_IN_QUOTED) {

data/lib/nesquikcsv/version.rb

@@ -1,3 +1,3 @@
 class NesquikCSV
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/nesquikcsv.rb

@@ -89,7 +89,7 @@ class NesquikCSV
 
   # Read next line from the wrapped IO and return as array or nil at EOF
   def shift(encoding='UTF-8')
-    if line = @io.gets
+    if line = get_line_with_quotes
       CsvParser.parse_line(line, encoding)
     else
       nil
@@ -106,12 +106,18 @@ class NesquikCSV
   def closed?
     @io.closed?
   end
-end
 
-class String
-  # Equivalent to <tt>FasterCSV::parse_line(self)</tt>
-  def parse_csv(encoding='UTF-8')
-    CsvParser.parse_line(self, encoding)
+  def get_line_with_quotes
+    line = @io.gets
+    if !line.nil?
+      while line.count('"').odd?
+        next_line = @io.gets
+        break if next_line.nil?
+        line << next_line
+      end
+    end
+    line
   end
-end
 
+
+end

data/test/tc_csv_parsing.rb

@@ -128,4 +128,12 @@ class TestCSVParsing < Test::Unit::TestCase
     assert_equal(["ñ","ó","¸"], CsvParser.parse_line("ñ,ó,¸", "UTF-8"))
   end
 
+  def test_quoted_line_break
+    assert_equal(["foo","bar,baz\nbeam","bee"], CsvParser.parse_line("foo,\"bar,baz\nbeam\",bee", "UTF-8"))
+  end
+
+  def test_quoted_line_break_at_end
+    assert_equal(["foo","bar,baz\n","bee"], CsvParser.parse_line("foo,\"bar,baz\n\",bee", "UTF-8"))
+  end
+
 end

data/test/tc_interface.rb

@@ -124,5 +124,18 @@ class TestNesquikCSVInterface < Test::Unit::TestCase
       assert_equal([["1", "2", "3"], ["4", "5"]], csv.to_a)
     end
   end
+
+  def test_multiline
+    assert_equal([["foo"],["bar"]], NesquikCSV.parse("foo\nbar"))
+  end
+
+  def test_quoted_line_break
+    assert_equal([["foo","bar,baz\nbeam","bee"],["one","two"]], NesquikCSV.parse("foo,\"bar,baz\nbeam\",bee\none,two", "UTF-8"))
+  end
+
+  def test_quoted_line_break_at_end
+    assert_equal([[nil,"foo,\nbar,baz","beam"],["one","two"]], NesquikCSV.parse(",\"foo,\nbar,baz\",beam\none,two", "UTF-8"))
+  end
+
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesquikcsv
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Juan Martty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit