tolq-parsers-csv 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9710a9952e758a16ef163907a4dc149a99de1027
-  data.tar.gz: e52fb0b7058978b6558768cf2797a4eb76867ac6
+  metadata.gz: 94ccec23f2b9ed6aca02230487b8f7066fb43412
+  data.tar.gz: 4a26a86c228b7eba43c1c915b80c7142bb1d4103
 SHA512:
-  metadata.gz: f8dbb132f786549eeafee7fcbf3577de810631252849d401e5621492bd664689c638f8a333dda0800954702eab613adaa5c1357b55c7289c0bfe93ede7a239c4
-  data.tar.gz: 2e67d3d8065f4a913299932006ddcce301fd050f05ef1265495a25a1f37553c76ce1db9ceb5dd82ec1eb7f7ebe44379108446ca974ad7e95bc84b8cfcb1a9945
+  metadata.gz: 919650c2a4c132df4c99da194ff8414dd07587c8bb197eb9347be49588b2620937102c623cd702996250482c7186bcb5f8ee8f9d97204c5f5be3a18ca143582f
+  data.tar.gz: 47e1cb3b4642cb89e82e8033088d7fd712299fe0a2cb161a87fa90b89d50257b4ece2c55850bb5a95a46049b83302df998b11b809d4e0297eb5791051c1a0908

data/lib/csv/parser.rb

@@ -1,6 +1,7 @@
 require 'csv'
 
 module Tolq::Parsers::CSV
+  class ParseError < StandardError; end
   class Parser
 
     # Helper method to convert a CSV into a annotated hash. Note that format
@@ -11,11 +12,15 @@ module Tolq::Parsers::CSV
     # @return [Hash] Hash representation of csv, i.e. { 'A1' => 'Hello World'
     def self.to_hash(csv_io, **parse_opts)
       rdata = {}
-      CSV.new(csv_io, parse_opts).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
+      begin
+        CSV.new(csv_io, parse_opts).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
+          end
         end
+      rescue CSV::MalformedCSVError => e
+        raise ParseError.new(e.message)
       end
 
       rdata
@@ -56,12 +61,16 @@ module Tolq::Parsers::CSV
 
     def extract_request_data_from_csv(csv_text, parse_opts)
       rdata = {}
-      CSV.new(csv_text, parse_opts).each.with_index do |row, rowidx|
-        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
+      begin
+        CSV.new(csv_text, parse_opts).each.with_index do |row, rowidx|
+          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
+          end
         end
+      rescue CSV::MalformedCSVError => e
+        raise ParseError.new(e.message)
       end
 
       rdata

data/lib/csv/version.rb

@@ -1,7 +1,7 @@
 module Tolq
   module Parsers
     module CSV
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

metadata

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