csv-utils 0.3.5 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc87e9b60715e648c97c91c1bbe562eb72a6fd964782abf3f1468588c053537b
-  data.tar.gz: c368dda5d1b829a6dff9ac934e42b716c8c704d3a4605f8c4b195d1a10bcc94e
+  metadata.gz: 4b7bb7c09d9a5e892099f17668fa81bc6c3ef0484c07d2fc3132c6f08499c092
+  data.tar.gz: 62147da18e71e5fc859171be36024cec21841944ae94384bb8fe001160856272
 SHA512:
-  metadata.gz: f8ead05ff26fcb2540403bcb47e5eacad33fcacf58f65ff48442406d0556f6dc5a23164258303a779a718ebc6bd8d232f6bad93d20d49275da05988bb0cc39c1
-  data.tar.gz: f5c9d16c15fc3af24947cb1aeb122962f26483cfba282a6676b1a47c8ecc9504952785898a0c94c771520b60fc3fbc84f3453c76ba9ebd896f0e19e546b23f69
+  metadata.gz: f1053082c41f279781b51bbad925efa79490eed9824e4de348043a0371c5dbafc541e1f4649a5ac0d0e4fe2b0b749551daa0164945d32466dfdb1791576de93c
+  data.tar.gz: 193ce400ddda5c1fbb2b6fd81c79394de884e63e2aa5653965d96d1b712903d839235dbedd9ca7b52a9833a817418b2204840e58504280e14128dec9c47e4482

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.0.0

data/Gemfile.lock

@@ -1,50 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ast (2.4.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    ast (2.4.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     inheritance-helper (0.1.5)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.86.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    unicode-display_width (1.7.0)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   inheritance-helper
@@ -54,4 +56,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.2.3

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

@@ -35,20 +35,24 @@ id_column_name = ARGV[1]
 headers = csv.shift
 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)
+id_column_name ||= headers[0]
+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)
+
 out = nil
-if id_column_num
-  out = CSV.open('utf8-correctsion.csv', 'wb')
-  out << [id_column_name, 'Row', 'Col', 'Header', 'Value']
+out_proc = Proc.new do |row|
+  out ||=
+    begin
+      out = CSV.open('utf8-correctsion.csv', 'wb')
+      out << [id_column_name, 'Row', 'Col', 'Header', 'Value']
+      out
+    end
+
+  out << row
 end
 
 csv_lineno = 1
@@ -61,12 +65,12 @@ while (row = csv.shift)
   end
 
   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)))
       puts "row(#{csv_lineno}),col(#{idx + 1}) #{headers[idx]}: converted to UTF-8 from #{detect_encoding(col)} \"#{col_utf8_encoded}\""
-      out << [row[id_column_num], csv_lineno, (idx + 1), headers[idx], col_utf8_encoded]
+      out_proc.call [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

data/csv-utils.gemspec

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

data/lib/csv-utils.rb

@@ -2,6 +2,7 @@ require 'csv'
 
 # Collection of tools for working with CSV files.
 module CSVUtils
+  autoload :CSVCompare, 'csv_utils/csv_compare'
   autoload :CSVExtender, 'csv_utils/csv_extender'
   autoload :CSVIterator, 'csv_utils/csv_iterator'
   autoload :CSVOptions, 'csv_utils/csv_options'

data/lib/csv_utils/csv_compare.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# CSVUtils::CSVCompare purpose is to determine which rows in the secondary_data_file need to be created, deleted or updated
+# **requires both CSV files to be sorted on the same columns, CSVUtils::CSVSort can accomplish this
+# In order to receive updates, update_comparison_columns must configured or use inheritance and change the update_row? method
+class CSVUtils::CSVCompare
+  # primary_data_file is the source of truth
+  # compare_proc used to compare the id column(s)
+  # update_comparison_columns column(s) to compare for equality, ex: updated_at, timestamp, hash
+  #  caveat: update_comparison_columns need to be in both csv files
+  attr_reader :primary_data_file,
+              :update_comparison_columns,
+              :compare_proc
+
+  def initialize(primary_data_file, update_comparison_columns=nil, &block)
+    @primary_data_file = primary_data_file
+    @update_comparison_columns = update_comparison_columns
+    @compare_proc = block
+  end
+
+  def compare(secondary_data_file)
+    src = CSV.open(primary_data_file)
+    src_headers = src.shift
+    dest = CSV.open(secondary_data_file)
+    dest_headers = dest.shift
+
+    read_next_src = true
+    read_next_dest = true
+
+    while(!src.eof? || !dest.eof?)
+      src_record = next_record_from_file(src_headers, src) if read_next_src
+      dest_record = next_record_from_file(dest_headers, dest) if read_next_dest
+
+      if ! src_record
+        read_next_src = false
+        read_next_dest = true
+
+        yield :delete, dest_record
+      elsif ! dest_record
+        read_next_src = true
+        read_next_dest = false
+
+        yield :create, src_record
+      elsif compare_proc.call(src_record, dest_record) == 0
+        read_next_src = true
+        read_next_dest = true
+
+        yield(:update, src_record) if update_row?(src_record, dest_record)
+      elsif compare_proc.call(src_record, dest_record) > 0
+        read_next_src = false
+        read_next_dest = true
+
+        yield :delete, dest_record
+      else
+        read_next_src = true
+        read_next_dest = false
+
+        yield :create, src_record
+      end
+    end
+
+    src.close
+    dest.close
+  end
+
+  private
+
+  def next_record_from_file(headers, file)
+    return nil if file.eof?
+
+    Hash[headers.zip(file.shift)]
+  end
+
+  def update_row?(src_record, dest_record)
+    return false unless update_comparison_columns
+
+    update_comparison_columns.each do |column_name|
+      return true unless src_record[column_name] == dest_record[column_name]
+    end
+
+    false
+  end
+end

data/lib/csv_utils/csv_iterator.rb

@@ -2,6 +2,8 @@
 class CSVUtils::CSVIterator
   include Enumerable
 
+  attr_reader :prev_row
+
   class RowWrapper < Hash
     attr_accessor :lineno
 
@@ -12,7 +14,7 @@ class CSVUtils::CSVIterator
     end
 
     def to_pretty_s
-      reject { |_, v| v.strip.empty? }
+      reject { |_, v| v.nil? || v.strip.empty? }
         .each_with_index
         .map { |(k, v), idx| sprintf('  %-3d %s: %s', idx+1, k, v) }
         .join("\n") + "\n"
@@ -33,9 +35,11 @@ class CSVUtils::CSVIterator
       lineno += 1
     end
 
+    @prev_row = nil
     while (row = @src_csv.shift)
       lineno += 1
       yield RowWrapper.create(headers, row, lineno)
+      @prev_row = row
     end
   end
 

data/lib/csv_utils/csv_report.rb

@@ -9,19 +9,20 @@ module CSVUtils
         if csv.is_a?(String)
           @must_close = true
           mode = csv_options.delete(:mode) || 'wb'
-          CSV.open(csv, mode, csv_options)
+          CSV.open(csv, mode, **csv_options)
         else
           @must_close = false
           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_sort.rb

@@ -25,9 +25,9 @@ class CSVUtils::CSVSort
   private
 
   def merge_sort_csv_files(src_csv_file1, src_csv_file2, dest_csv_file)
-    src1 = CSV.open(src_csv_file1, 'rb', csv_options)
-    src2 = CSV.open(src_csv_file2, 'rb', csv_options)
-    dest = CSV.open(dest_csv_file, 'wb', csv_options)
+    src1 = CSV.open(src_csv_file1, 'rb', **csv_options)
+    src2 = CSV.open(src_csv_file2, 'rb', **csv_options)
+    dest = CSV.open(dest_csv_file, 'wb', **csv_options)
 
     if @headers
       dest << @headers
@@ -66,7 +66,7 @@ class CSVUtils::CSVSort
   end
 
   def create_sorted_csv_part_files(batch_size, &block)
-    src = CSV.open(csv_file, 'rb', csv_options)
+    src = CSV.open(csv_file, 'rb', **csv_options)
 
     @headers = src.shift if has_headers
 
@@ -74,7 +74,7 @@ class CSVUtils::CSVSort
     create_batch_part_proc = Proc.new do
       batch.sort!(&block)
       @csv_part_files << "#{new_csv_file}.part.#{@csv_part_files.size}"
-      CSV.open(@csv_part_files.last, 'wb', csv_options) do |csv|
+      CSV.open(@csv_part_files.last, 'wb', **csv_options) do |csv|
         csv << @headers if @headers
         batch.each { |row| csv << row }
       end
@@ -107,6 +107,6 @@ class CSVUtils::CSVSort
       File.unlink(csv_part_file2)
     end
 
-    FileUtils.mv(@csv_part_files.last, new_csv_file)
+    FileUtils.mv(@csv_part_files.last || @csv_file, new_csv_file)
   end
 end

data/lib/csv_utils/csv_wrapper.rb

@@ -20,7 +20,7 @@ class CSVUtils::CSVWrapper
   def open(csv, mode, csv_options)
     if csv.is_a?(String)
       @close_when_done = true
-      @csv = CSV.open(csv, mode, csv_options)
+      @csv = CSV.open(csv, mode, **csv_options)
     else
       @close_when_done = false
       @csv = csv

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.10
 platform: ruby
 authors:
 - Doug Youch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -49,6 +49,7 @@ files:
 - bin/csv-validator
 - csv-utils.gemspec
 - lib/csv-utils.rb
+- lib/csv_utils/csv_compare.rb
 - lib/csv_utils/csv_extender.rb
 - lib/csv_utils/csv_iterator.rb
 - lib/csv_utils/csv_options.rb
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: CSV Utils