tolq-parsers-csv 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398f33db78392da4efe8d163a03fafd6d1f00acb
-  data.tar.gz: 20d7c6a9fe73f1e763f69f602976fb28cacf01b2
+  metadata.gz: 1812d6b67495f8df13b3655c8578d65bf4fd78c6
+  data.tar.gz: bf94b7f9246532fe12d4b85a51b2a652cb44418c
 SHA512:
-  metadata.gz: 20689cfe169db3d5df8c3f6aa14c836baa5555c5ef502f5424b9417a814ddfab63c12348d60bbb370eafffa5cadc34e284ffd5fe3d66b7be5c8a609ca5d6d749
-  data.tar.gz: 805009613d66eaea3569656d6f29c13fd789d55c4ebe5c0bba3696307744c47e115c1ce0b20581235401e7eb3b736c1d7e09ad9bdb87263aa631e1328b04a981
+  metadata.gz: 289c3ba9652b4397abc6eee17e66dc2a795caf7ab076eeb44ebf4408afb58268536e37812382d38c1226dbd3724fcf7948b0ac98424cb875137938a16fde5727
+  data.tar.gz: f1a0b5f9f7d06275f4c4c6672d2322e2265679f67e748a3938f5abe3d7cddab48db3734b5da8c27f7869085610ce6a436200d3cb508a0a5d8606d7bf8f75b036

data/README.md

@@ -34,7 +34,7 @@ parser.parse(csv)
 And to unparse from the tolq format back to csv:
 
 ```ruby
-unparser = Tolq::Parsers::csv::Unparser.new
+unparser = Tolq::Parsers::CSV::Unparser.new
 unparser.unparse(tolq_api_response)
 ```
 ## Development

data/lib/csv/column_helper.rb

@@ -0,0 +1,32 @@
+module Tolq::Parsers::CSV
+  module ColumnHelper
+    # Converts column to char, zero indexed
+    def self.column_to_char(idx)
+      dividend = idx + 1
+      column_name = ""
+
+      while dividend > 0
+        modulo = (dividend - 1) % 26
+        column_name = (65 + modulo).chr + column_name
+        dividend = (dividend - modulo) / 26
+      end
+
+      column_name
+    end
+
+    # Converts char to column, zero indexed
+    def self.char_to_column(char)
+      char
+        .split('')
+        .reverse
+        .map.with_index { |c,idx| (c.ord - 64) * (26**idx)}
+        .inject(&:+) - 1
+    end
+
+    def self.from_char_notation(key)
+      char, row = key.scan(/(\w+)(\d+)/).first
+      return  row.to_i - 1, ColumnHelper.char_to_column(char)
+    end
+  end
+end
+

data/lib/csv/parser.rb

@@ -19,9 +19,12 @@ module Tolq::Parsers::CSV
     #
     # @param csv_io [IO] A string or IO object to parse
     # @param parse_opts [Hash] Options for the CSV parser (i.e. col_sep, quote_char)
+    # @param exclude [Array] List of ranges to exclude in excel notation, i.e. ["A1:A3"]
     # @return [Hash] A hash suitable to be converted to json for a Tolq api request
-    def parse(csv_io, **parse_opts)
+    def parse(csv_io, exclude: [], **parse_opts)
+      @exclude = to_numeric_exclude_ranges(exclude)
       request_data = extract_request_data_from_csv(csv_io, parse_opts)
+      return nil if request_data.empty?
 
       {
         "request" => request_data,
@@ -37,11 +40,29 @@ module Tolq::Parsers::CSV
       rdata = {}
       CSV.new(csv_text, parse_opts).each.with_index do |row, rowidx|
         row.each.with_index do |col, colidx|
-          rdata["#{rowidx}:#{colidx}"] = { "text" => col } if col && col.length > 0
+          next if excluded?(colidx, rowidx)
+          charcol = ColumnHelper.column_to_char(colidx)
+          rdata["#{charcol}#{rowidx + 1}"] = { "text" => col } if col && col.length > 0
         end
       end
 
       rdata
     end
+
+    def excluded?(colidx, rowidx)
+      !!@exclude.find do |range|
+        from, to = range
+        colidx >= from.last && colidx <= to.last &&
+          rowidx >= from.first && rowidx <= to.first
+      end
+    end
+
+    def to_numeric_exclude_ranges(exclude_arr)
+      exclude_arr.map do |exrange|
+        exrange
+          .split(":")
+          .map { |k| ColumnHelper.from_char_notation(k) }
+      end
+    end
   end
 end

data/lib/csv/unparser.rb

@@ -21,7 +21,7 @@ module Tolq::Parsers::CSV
     def build_translation_matrix(translations_hash)
       @maxcol = 0
       translations_hash.values.first.inject([]) do |matrix, (k,translation)|
-        row,col = k.split(":").map(&:to_i)
+        row,col = ColumnHelper.from_char_notation(k)
         matrix[row] ||= []
         matrix[row][col] = translation
         @maxcol = col if col > @maxcol

data/lib/csv/version.rb

@@ -1,7 +1,7 @@
 module Tolq
   module Parsers
     module CSV
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tolq-parsers-csv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Timon Vonk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/csv/column_helper.rb
 - lib/csv/parser.rb
 - lib/csv/unparser.rb
 - lib/csv/version.rb