tolq-parsers-csv 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a83df2ed2eeadb5c776d96a816bdd945b554cf
-  data.tar.gz: ab06afe8e05ad99c21242c6775ba1ec774385abd
+  metadata.gz: f6aa7fee3735822af2f804ba31046cac221ed33f
+  data.tar.gz: b3ac703861292f8434133e37506c899952d27ce7
 SHA512:
-  metadata.gz: d7bbd4a2281da0ed35b4c2d7ba05aa55aeb198e50e0a333b13ee00058ea8da4260561fc423f73078ce886ad8091cb9d07af36b2c0c970f639d2bf3f0987e159f
-  data.tar.gz: a952e45eccfc47a4d93135d566170f6c69f9b2ece12e5e175c7de53af39adcc4aa44824a099e683b0a8f39f2d17d45c515d7436e55707b6f3d08fda7c11ce31e
+  metadata.gz: a9a80e037baa460bafaaf03fcecab858b02c18d5199ab6daec35f5c2adcd594ce49c55ef4750ab02317cb3475def9fc553f80f45f0e3d7e7aea53d54a7b20c82
+  data.tar.gz: c75bb72caf540dfbcf4d1dea527d92e6de8022e6d11b5e10d2e9b045c3089f4856ca2ba7dac8821a9b7f42d0f0b52a0892dcc1df8de2a4bbc3891da9032ed68d

data/lib/csv/parser.rb

@@ -13,10 +13,10 @@ module Tolq::Parsers::CSV
     def self.to_hash(csv_io, **parse_opts)
       rdata = {}
       begin
-        CSV.new(csv_io, parse_opts).each.with_index do |row, rowidx|
+        CSV.new(csv_io, parse_opts.merge(self.default_options)).each.with_index do |row, rowidx|
           row.each.with_index do |col, colidx|
             charcol = ColumnHelper.column_to_char(colidx)
-            rdata["#{charcol}#{rowidx + 1}"] = col if col && col.length > 0
+            rdata["#{charcol}#{rowidx + 1}"] = fix_escaped_quotes(col) if col && col.length > 0
           end
         end
       rescue CSV::MalformedCSVError => e
@@ -59,6 +59,19 @@ module Tolq::Parsers::CSV
 
     private
 
+    def self.default_options
+      major, minor, patch = RUBY_VERSION.split(".").map(&:to_i)
+      if major >= 2 && minor >= 4
+        { liberal_parsing: true }
+      else
+        {}
+      end
+    end
+
+    def self.fix_escaped_quotes(col)
+      col.gsub(/(?<!\\)\\"/,'""')
+    end
+
     def extract_request_data_from_csv(csv_text, parse_opts)
       rdata = {}
       begin
@@ -66,7 +79,7 @@ module Tolq::Parsers::CSV
           row.each.with_index do |col, colidx|
             next if excluded?(colidx, rowidx)
             charcol = ColumnHelper.column_to_char(colidx)
-            rdata["#{charcol}#{rowidx + 1}"] = { "text" => col } if col && col.length > 0
+            rdata["#{charcol}#{rowidx + 1}"] = { "text" => self.class.fix_escaped_quotes(col) } if col && col.length > 0
           end
         end
       rescue CSV::MalformedCSVError => e

data/lib/csv/version.rb

@@ -1,7 +1,7 @@
 module Tolq
   module Parsers
     module CSV
-      VERSION = "0.3.2"
+      VERSION = "0.3.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tolq-parsers-csv
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Timon Vonk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler