csv-utils 0.3.3 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28b89b25aa7a6a90137b799c580aa9060d783f481000fd173281bc7e2367baf
-  data.tar.gz: 7317ece2b8970a816b5e4b5b84623a2c966c3a2f7afa7c2dd30de831f7e3ac64
+  metadata.gz: c0847ad28aee7ef73e5bfa9cbd0753e42fed5097ae68bfc2083f6ed2a6d08d66
+  data.tar.gz: '080a53543deadaa49e06616aa9f563818d3a5bbe13b76366f1f795f075be7e41'
 SHA512:
-  metadata.gz: e057cc9795559c630e4b939c67d00547a25e0cf83ed75b15713a6c381677a718dd2ac06f975486e5cdf45a1cbfd962caf2aa13105e57a544aa4b6fd177926445
-  data.tar.gz: ee7552522db9fb683b8cbd73a94706a0a41e92135aed0c2ebec6c70754f1bcad210234b8e5b18da87322bbc6737b6f323c515a1920f09fda3230a5cdef2393d1
+  metadata.gz: 8504ec3c569e92e3c7adc141af4077e04085b8befdad8a15c76f05405045dad52821aff1fc26d792eba4d533ea588794d9ab88f96f5c37e2cf7146624090eded
+  data.tar.gz: f4dfa17b0ec81d5923e3ff32978f584a64d567aa8c770dd7b252770f1535ae4eba578dcec105f201ae006929114c90e1615196c6d28ac6fd36bd9a89fb978617

data/bin/csv-explorer

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'csv-utils'
+require 'irb'
+
+CSV_FILE = ARGV.shift
+
+def csv
+  @csv ||= CSVUtils::CSVIterator.new(CSV_FILE)
+end
+
+IRB.start

data/bin/csv-find-error

@@ -3,10 +3,12 @@
 require 'csv'
 require 'shellwords'
 
+prev_row = nil
 begin
-  CSV.open(ARGV[0], 'rb').each { }
+  CSV.open(ARGV[0], 'rb').each { |row| prev_row = row }
 rescue CSV::MalformedCSVError => e
   puts e.class.to_s + ': ' + e.message
+  puts "previous row was #{prev_row}"
   if e.message =~ /line (\d+)/
     lineno = $1.to_i
     cmd = "csv-readline #{Shellwords.escape(ARGV[0])} #{lineno}"

data/bin/csv-validator

@@ -25,11 +25,32 @@ def detect_encoding(col)
   CharDet.detect(col)['encoding']
 end
 
+def strip_bom!(col)
+  col.sub!("\xEF\xBB\xBF".force_encoding('ASCII-8BIT'), '')
+end
+
 csv = CSV.open(ARGV[0], 'rb')
-out = CSV.open(ARGV[1], 'wb') if ARGV[1]
+id_column_name = ARGV[1]
 
 headers = csv.shift
-out << headers if out
+strip_bom!(headers[0])
+
+id_column_num = nil
+if id_column_name
+  unless headers.include?(id_column_name)
+    $stderr.puts("header #{id_column_name} not found in current set of headers")
+    exit 1
+  end
+
+  id_column_num = headers.index(id_column_name)
+end
+
+out = nil
+if id_column_num
+  out = CSV.open('utf8-correctsion.csv', 'wb')
+  out << [id_column_name, 'Row', 'Col', 'Header', 'Value']
+end
+
 csv_lineno = 1
 
 while (row = csv.shift)
@@ -39,21 +60,17 @@ while (row = csv.shift)
     $stderr.puts "row(#{csv_lineno}): invalid number of columns, expected #{headers.size} got #{row.size}"
   end
 
-  converted = false
   row.each_with_index do |col, idx|
-    next if utf8?(col)
+    next if col.nil? || utf8?(col)
 
     $stderr.puts "row(#{csv_lineno}),col(#{idx + 1}) #{headers[idx]}: none UTF-8 characters found in \"#{col}\""
     if (col_utf8_encoded = convert_to_utf8(col, detect_encoding(col)))
-      converted = true
       puts "row(#{csv_lineno}),col(#{idx + 1}) #{headers[idx]}: converted to UTF-8 from #{detect_encoding(col)} \"#{col_utf8_encoded}\""
-      row[idx] = col_utf8_encoded
+      out << [row[id_column_num], csv_lineno, (idx + 1), headers[idx], col_utf8_encoded]
     else
       $stderr.puts "row(#{csv_lineno}),col(#{idx + 1}) #{headers[idx]}: unknown character encoding"
     end
   end
-
-  out << row if out && converted
 end
 
 csv.close

data/csv-utils.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'csv-utils'
-  s.version     = '0.3.3'
+  s.version     = '0.3.8'
   s.licenses    = ['MIT']
   s.summary     = 'CSV Utils'
   s.description = 'Tools for debugging malformed CSV files'

data/lib/csv-utils.rb

@@ -3,6 +3,7 @@ require 'csv'
 # Collection of tools for working with CSV files.
 module CSVUtils
   autoload :CSVExtender, 'csv_utils/csv_extender'
+  autoload :CSVIterator, 'csv_utils/csv_iterator'
   autoload :CSVOptions, 'csv_utils/csv_options'
   autoload :CSVReport, 'csv_utils/csv_report'
   autoload :CSVRow, 'csv_utils/csv_row'

data/lib/csv_utils/csv_iterator.rb

@@ -0,0 +1,51 @@
+# Search a CSV given a series of steps
+class CSVUtils::CSVIterator
+  include Enumerable
+
+  attr_reader :prev_row
+
+  class RowWrapper < Hash
+    attr_accessor :lineno
+
+    def self.create(headers, row, lineno)
+      row_wrapper = RowWrapper[headers.zip(row)]
+      row_wrapper.lineno = lineno
+      row_wrapper
+    end
+
+    def to_pretty_s
+      reject { |_, v| v.strip.empty? }
+        .each_with_index
+        .map { |(k, v), idx| sprintf('  %-3d %s: %s', idx+1, k, v) }
+        .join("\n") + "\n"
+    end
+  end
+
+  def initialize(src_csv, csv_options = {})
+    @src_csv = CSVUtils::CSVWrapper.new(src_csv, 'rb', csv_options)
+  end
+
+  def each(headers = nil)
+    @src_csv.rewind
+
+    lineno = 0
+    unless headers
+      headers = @src_csv.shift
+      strip_bom!(headers[0])
+      lineno += 1
+    end
+
+    @prev_row = nil
+    while (row = @src_csv.shift)
+      lineno += 1
+      yield RowWrapper.create(headers, row, lineno)
+      @prev_row = row
+    end
+  end
+
+  private
+
+  def strip_bom!(col)
+    col.sub!("\xEF\xBB\xBF".force_encoding('ASCII-8BIT'), '')
+  end
+end

data/lib/csv_utils/csv_report.rb

@@ -15,13 +15,14 @@ module CSVUtils
           csv
         end
 
-      generate(headers, &block) if block
+      add_headers(headers) if headers
+
+      generate(&block) if block
     end
 
-    def generate(headers = nil)
-      add_headers(headers) if headers
+    def generate
       yield self
-      @csv.close if @must_close
+      close if @must_close
     end
 
     def append(csv_row)
@@ -37,5 +38,9 @@ module CSVUtils
     def add_headers(csv_row)
       append(csv_row.is_a?(Array) ? csv_row : csv_row.csv_headers)
     end
+
+    def close
+      @csv.close
+    end
   end
 end

data/lib/csv_utils/csv_wrapper.rb

@@ -35,6 +35,10 @@ class CSVUtils::CSVWrapper
     csv.shift
   end
 
+  def rewind
+    csv.rewind
+  end
+
   def close
     csv.close if close_when_done?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.8
 platform: ruby
 authors:
 - Doug Youch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -28,6 +28,7 @@ description: Tools for debugging malformed CSV files
 email: dougyouch@gmail.com
 executables:
 - csv-change-eol
+- csv-explorer
 - csv-find-error
 - csv-readline
 - csv-validator
@@ -42,12 +43,14 @@ files:
 - LICENSE
 - README.md
 - bin/csv-change-eol
+- bin/csv-explorer
 - bin/csv-find-error
 - bin/csv-readline
 - bin/csv-validator
 - csv-utils.gemspec
 - lib/csv-utils.rb
 - lib/csv_utils/csv_extender.rb
+- lib/csv_utils/csv_iterator.rb
 - lib/csv_utils/csv_options.rb
 - lib/csv_utils/csv_report.rb
 - lib/csv_utils/csv_row.rb