csv-utils 0.2.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85c431ad42ed20382fbe91c3696153be9437a8ee755ede313be2d6f488b3770
-  data.tar.gz: b620cfb208a7a28573160103155564875b05990f965f9206ad89bd7cb6b5fcc7
+  metadata.gz: a28b89b25aa7a6a90137b799c580aa9060d783f481000fd173281bc7e2367baf
+  data.tar.gz: 7317ece2b8970a816b5e4b5b84623a2c966c3a2f7afa7c2dd30de831f7e3ac64
 SHA512:
-  metadata.gz: 02fe7a0d34f61c54a3788739cc5455dc685cad7b627a9091f2b6e5b3ed0323bf5d162cff53150e89a431c6ab42e76e014b1350c6b47f4aeed66ef727ffe76554
-  data.tar.gz: 117d50507b9661c1d70b89df658a97649ea2562604c9dd0764f160e9294586293edbf10e9d968da0107a2f072b0e1814d105c364f91ed2c22cca509fb48f2fd6
+  metadata.gz: e057cc9795559c630e4b939c67d00547a25e0cf83ed75b15713a6c381677a718dd2ac06f975486e5cdf45a1cbfd962caf2aa13105e57a544aa4b6fd177926445
+  data.tar.gz: ee7552522db9fb683b8cbd73a94706a0a41e92135aed0c2ebec6c70754f1bcad210234b8e5b18da87322bbc6737b6f323c515a1920f09fda3230a5cdef2393d1

data/bin/csv-validator

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require 'csv'
+begin
+  require 'rchardet'
+rescue LoadError
+  $stderr.puts 'gem install rchardet'
+  exit 1
+end
+
+def utf8?(str)
+  str
+    .force_encoding('utf-8')
+    .valid_encoding?
+end
+
+def convert_to_utf8(str, current_encoding)
+  str.force_encoding(current_encoding)
+  return nil unless str.valid_encoding?
+
+  str.encode('utf-8')
+end
+
+def detect_encoding(col)
+  CharDet.detect(col)['encoding']
+end
+
+csv = CSV.open(ARGV[0], 'rb')
+out = CSV.open(ARGV[1], 'wb') if ARGV[1]
+
+headers = csv.shift
+out << headers if out
+csv_lineno = 1
+
+while (row = csv.shift)
+  csv_lineno += 1
+
+  unless row.size == headers.size
+    $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)
+
+    $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
+    else
+      $stderr.puts "row(#{csv_lineno}),col(#{idx + 1}) #{headers[idx]}: unknown character encoding"
+    end
+  end
+
+  out << row if out && converted
+end
+
+csv.close
+out.close if out

data/csv-utils.gemspec

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

data/lib/csv-utils.rb

@@ -7,4 +7,6 @@ module CSVUtils
   autoload :CSVReport, 'csv_utils/csv_report'
   autoload :CSVRow, 'csv_utils/csv_row'
   autoload :CSVSort, 'csv_utils/csv_sort'
+  autoload :CSVTransformer, 'csv_utils/csv_transformer'
+  autoload :CSVWrapper, 'csv_utils/csv_wrapper'
 end

data/lib/csv_utils/csv_extender.rb

@@ -1,20 +1,15 @@
 # Utility class for appending data to a csv file.
 class CSVUtils::CSVExtender
-  attr_reader :csv_file,
-              :new_csv_file,
-              :csv_options
-
-  def initialize(csv_file, new_csv_file, csv_options = {})
-    @csv_file = csv_file
-    @new_csv_file = new_csv_file
-    @csv_options = csv_options
+  def initialize(src_csv, dest_csv, csv_options = {})
+    @src_csv = CSVUtils::CSVWrapper.new(src_csv, 'rb', csv_options)
+    @dest_csv = CSVUtils::CSVWrapper.new(dest_csv, 'wb', csv_options)
   end
 
   def append(additional_headers)
     process(additional_headers) do |current_headers|
-      while (row = src.shift)
+      while (row = @src_csv.shift)
         additional_columns = yield row, current_headers
-        dest << (row + additional_columns)
+        @dest_csv << (row + additional_columns)
       end
     end
   end
@@ -27,13 +22,13 @@ class CSVUtils::CSVExtender
         additional_rows = yield batch, current_headers
 
         batch.each_with_index do |row, idx|
-          dest << (row + additional_rows[idx])
+          @dest_csv << (row + additional_rows[idx])
         end
 
         batch = []
       end
 
-      while (row = src.shift)
+      while (row = @src_csv.shift)
         batch << row
 
         process_batch_proc.call if batch.size >= batch_size
@@ -43,6 +38,8 @@ class CSVUtils::CSVExtender
     end
   end
 
+  private
+
   def process(additional_headers)
     current_headers = append_headers(additional_headers)
 
@@ -51,26 +48,16 @@ class CSVUtils::CSVExtender
     close
   end
 
-  def src
-    @src ||= CSV.open(csv_file, 'rb', csv_options)
-  end
-
-  def dest
-    @dest ||= CSV.open(new_csv_file, 'wb', csv_options)
-  end
-
   def close
-    src.close
-    dest.close
+    @src_csv.close
+    @dest_csv.close
   end
 
-  private
-
   def append_headers(additional_headers)
     return nil unless additional_headers
 
-    current_headers = src.shift
-    dest << (current_headers + additional_headers)
+    current_headers = @src_csv.shift
+    @dest_csv << (current_headers + additional_headers)
     current_headers
   end
 end

data/lib/csv_utils/csv_report.rb

@@ -4,7 +4,7 @@ module CSVUtils
     attr_reader :csv,
                 :must_close
 
-    def initialize(csv, csv_options = {}, &block)
+    def initialize(csv, headers = nil, csv_options = {}, &block)
       @csv =
         if csv.is_a?(String)
           @must_close = true
@@ -15,10 +15,11 @@ module CSVUtils
           csv
         end
 
-      generate(&block) if block
+      generate(headers, &block) if block
     end
 
-    def generate
+    def generate(headers = nil)
+      add_headers(headers) if headers
       yield self
       @csv.close if @must_close
     end

data/lib/csv_utils/csv_row.rb

@@ -23,10 +23,16 @@ module CSVUtils
 
         add_value_to_class_method(:csv_columns, header => options)
       end
-    end
 
-    def csv_headers
-      self.class.csv_columns.values.map { |column_options| csv_column_header(column_options) }
+      def csv_headers
+        csv_columns.values.map { |column_options| csv_column_header(column_options) }
+      end
+
+      private
+
+      def csv_column_header(column_options)
+        column_options[:header]
+      end
     end
 
     def csv_row
@@ -34,12 +40,12 @@ module CSVUtils
     end
     alias_method :to_a, :csv_row
 
-    private
-
-    def csv_column_header(column_options)
-      column_options[:header]
+    def csv_headers
+      self.class.csv_headers
     end
 
+    private
+
     def csv_column_value(column_options)
       if column_options[:proc]
         instance_eval(&column_options[:proc])

data/lib/csv_utils/csv_transformer.rb

@@ -0,0 +1,119 @@
+# Transforms a CSV given a series of steps
+class CSVUtils::CSVTransformer
+  attr_reader :headers
+
+  def initialize(src_csv, dest_csv, csv_options = {})
+    @src_csv = CSVUtils::CSVWrapper.new(src_csv, 'rb', csv_options)
+    @dest_csv = CSVUtils::CSVWrapper.new(dest_csv, 'wb', csv_options)
+  end
+
+  def read_headers
+    @headers = @src_csv.shift
+    self
+  end
+
+  def additional_data(&block)
+    steps << [:additional_data, @headers, block]
+    self
+  end
+
+  def select(&block)
+    steps << [:select, @headers, block]
+    self
+  end
+
+  def reject(&block)
+    steps << [:reject, @headers, block]
+    self
+  end
+
+  def map(new_headers, &block)
+    steps << [:map, @headers, block]
+    @headers = new_headers
+    self
+  end
+
+  def append(additional_headers, &block)
+    steps << [:append, @headers, block]
+
+    if additional_headers
+      @headers += additional_headers
+    else
+      @headers = nil
+    end
+
+    self
+  end
+
+  def each(&block)
+    steps << [:each, @headers, block]
+    self
+  end
+
+  def set_headers(headers)
+    @headers = headers
+    self
+  end
+
+  def process(batch_size = 10_000, &block)
+    batch = []
+
+    @dest_csv << @headers if @headers
+
+    steps_proc = Proc.new do
+      steps.each do |step_type, current_headers, proc|
+        batch = process_step(step_type, current_headers, batch, &proc)
+      end
+
+      batch.each { |row| @dest_csv << row }
+
+      batch = []
+    end
+                   
+    while (row = @src_csv.shift)
+      batch << row
+      steps_proc.call if batch.size >= batch_size
+    end
+
+    steps_proc.call if batch.size > 0
+
+    @src_csv.close
+    @dest_csv.close
+  end
+
+  private
+
+  def steps
+    @steps ||= []
+  end
+
+
+  def process_step(step_type, current_headers, batch, &block)
+    case step_type
+    when :select
+      batch.select! do |row|
+        block.call row, current_headers, @additional_data
+      end
+    when :reject
+      batch.reject! do |row|
+        block.call row, current_headers, @additional_data
+      end
+    when :map
+      batch.map! do |row|
+        block.call row, current_headers, @additional_data
+      end
+    when :append
+      batch.map! do |row|
+        row + block.call(row, current_headers, @additional_data)
+      end
+    when :additional_data
+      @additional_data = block.call(batch, current_headers)
+    when :each
+      batch.each do |row|
+        block.call(row, current_headers, @additional_data)
+      end
+    end
+
+    batch
+  end
+end

data/lib/csv_utils/csv_wrapper.rb

@@ -0,0 +1,47 @@
+# Wraps a CSV object, if wrapper opens the csv file it will close it
+class CSVUtils::CSVWrapper
+  attr_reader :csv
+
+  def initialize(csv, mode, csv_options)
+    open(csv, mode, csv_options)
+  end
+
+  def self.open(file, mode, csv_options = {})
+    csv = new(file, mode, csv_options)
+
+    if block_given?
+      yield csv
+      csv.close
+    else
+      csv
+    end
+  end
+
+  def open(csv, mode, csv_options)
+    if csv.is_a?(String)
+      @close_when_done = true
+      @csv = CSV.open(csv, mode, csv_options)
+    else
+      @close_when_done = false
+      @csv = csv
+    end
+  end
+
+  def <<(row)
+    csv << row
+  end
+
+  def shift
+    csv.shift
+  end
+
+  def close
+    csv.close if close_when_done?
+  end
+
+  private
+
+  def close_when_done?
+    @close_when_done
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-utils
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Doug Youch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -30,6 +30,7 @@ executables:
 - csv-change-eol
 - csv-find-error
 - csv-readline
+- csv-validator
 extensions: []
 extra_rdoc_files: []
 files:
@@ -43,6 +44,7 @@ files:
 - bin/csv-change-eol
 - bin/csv-find-error
 - bin/csv-readline
+- bin/csv-validator
 - csv-utils.gemspec
 - lib/csv-utils.rb
 - lib/csv_utils/csv_extender.rb
@@ -50,6 +52,8 @@ files:
 - lib/csv_utils/csv_report.rb
 - lib/csv_utils/csv_row.rb
 - lib/csv_utils/csv_sort.rb
+- lib/csv_utils/csv_transformer.rb
+- lib/csv_utils/csv_wrapper.rb
 - script/console
 homepage: https://github.com/dougyouch/csv-utils
 licenses: