cevennes 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0885436a7e993e83fcef22afb0605648f92405916461a1fdc3d36c144c67530d'
-  data.tar.gz: dd03ef25ed11cea3be74301d4bc147da9108e91e477066d4790f3906e819f67b
+  metadata.gz: 435cddee7086da63e735457390edf766d42522bf58626b95ead034c418899719
+  data.tar.gz: 20f5371e968decbfc05d062d44ae2cef6f1856716a9e58d321133b6d3089267e
 SHA512:
-  metadata.gz: 9a9c66767526700a4c699fc61f3c938e8724a86dbc8662548bd611fb0b02fcddf1ec10c6e7a8acfcb24bd04659dc5eb20b3872a81f0866475d6c20a6ab1eb815
-  data.tar.gz: 14e19d5de67104106a904e58c4678a5243dce467e7b26388c9e95d7fd2d4ef8821ae5c4f0c8b3ba488081d8819d2919d3ec418ca523304c95a2a10d82fb7340c
+  metadata.gz: ac1aa7f98147a393812a2fec1fdf6e6c714d35a5e325a7a2912f484db7d59212ee66daed23fdbe0013d11b18e737ba2b5e7f9527021ef7300cc9742c0313f80f
+  data.tar.gz: 44b7de7c27260dd623a466c880e4f9c789cf429efc6aa53671f092bfd9449f5d7c5841796da5b517faa34f9dfad202527b98ff8816b940ab4e345e0bfeb4f81b

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 # CHANGELOG.md
 
 
+## cevennes 1.3.0  released 2022-07-24
+
+- Diff already parsed CSV as well
+
+
+## cevennes 1.2.0  released 2022-07-05
+
+- Introduce `drop_equals: true`
+
+
+## cevennes 1.1.1  released 2021-02-25
+
+- Refine UTF-8 re-encoding
+- Fix `ignore_key_case: true` :-(
+- Clarify reencode
+
+
 ## cevennes 1.1.0  released 2021-02-24
 
 - Introduce `ignore_key_case: true`

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2018-2021, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2018-2022, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -28,7 +28,7 @@ build: gemspec_validate
 	mv $(NAME)-$(VERSION).gem pkg/
 
 push: build
-	gem push pkg/$(NAME)-$(VERSION).gem
+	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
 
 spec:
 	bundle exec rspec

data/README.md

@@ -1,7 +1,7 @@
 
 # cevennes
 
-[![Build Status](https://secure.travis-ci.org/jmettraux/cevennes.svg)](http://travis-ci.org/jmettraux/cevennes)
+[![tests](https://github.com/jmettraux/cevennes/workflows/test/badge.svg)](https://github.com/jmettraux/cevennes/actions)
 [![Gem Version](https://badge.fury.io/rb/cevennes.svg)](http://badge.fury.io/rb/cevennes)
 
 Diffs CSVs by lines, focusing on a single ID
@@ -56,6 +56,46 @@ The second entry is a summary of the changes, altered `!` line count, removed `-
 
 The remaining entries are the (non-)changes themselves, from line 1 to the end.
 
+Since 1.3.0, Cevennes accepts CSV strings and parsed CSV (array of arrays).
+
+
+### drop_equals: true
+
+```ruby
+require 'cevennes'
+
+cvs0 = %{
+  id,name,age
+  0,John,33
+  1,Jean-Baptiste,43
+  3,Luke,21
+}.strip + "\n"
+cvs1 = %{
+  id,name,age
+  0,John,33
+  1,Jean-Baptiste,44
+  4,Matthew,20
+}.strip + "\n"
+
+d = Cevennes.diff('id', cvs0, cvs1, drop_equals: true)
+  # ==>
+  [
+    [ 'keys', 1, [ 'id', 'name', 'age' ],
+              1, [ 'id', 'name', 'age' ] ],
+    [ 'stats',
+      { '=' => 1, '!' => 1, '-' => 1, '+' => 1,
+        'l0' => 3, 'l1' => 3 } ],
+    [ '!',  3, [ '1', 'Jean-Baptiste', '43' ],
+            3, [ '1', 'Jean-Baptiste', '44' ] ],
+    [ '-',  4, [ '3', 'Luke', '21'],
+           -1, nil ],
+    [ '+', -1, nil,
+            4, [ '4', 'Matthew', '20' ] ]
+  ]
+    #
+    # the "=" entries are not included
+```
+
 
 ## LICENSE
 

data/lib/cevennes.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 
 require 'csv'
 
 
 module Cevennes
 
-  VERSION = '1.1.0'
+  VERSION = '1.3.0'
 
   class << self
 
@@ -39,6 +40,8 @@ module Cevennes
       s['l0'] = h0.length
       s['l1'] = h1.length
 
+      d = d.reject { |e| e[0] == '=' } if opts[:drop_equals]
+
       [ [ 'keys', *ks0, *ks1 ], [ 'stats', s ] ] + d
     end
 
@@ -49,29 +52,28 @@ module Cevennes
       row.collect { |cell| cell.is_a?(String) ? cell.strip : cell }
     end
 
-    DOWNCASE_IF_POSSIBLE =
-      lambda { |x| x.respond_to?(:downcase) ? x.downcase : x }
-    IDENTITY =
-      lambda { |x| x }
+    DOWNCASE = lambda { |x| x.respond_to?(:downcase) ? x.downcase : x }
+    IDENTITY = lambda { |x| x }
 
     def hash(version, id, csv, opts)
 
-      d = opts[:ignore_key_case] ? DOWNCASE_IF_POSSIBLE : IDENTITY
+      d = opts[:ignore_key_case] ? DOWNCASE : IDENTITY
+      did = d[id]
 
-      csva = ::CSV.parse(reencode(csv))
+      csva = parse(csv)
         .each_with_index.collect { |row, i| [ 1 + i, strip(row) ] }
         .reject { |i, row| row.compact.empty? }
-        .drop_while { |i, row| ! row.find { |cell| d[cell] == id } }
+        .drop_while { |i, row| ! row.find { |cell| d[cell] == did } }
 
       fail ::IndexError.new("id #{id.inspect} not found in #{version} CSV") \
         if csva.empty?
 
       csva[0][1] =
         opts[:ignore_key_case] ?
-        csva[0][1].collect { |c| DOWNCASE_IF_POSSIBLE[c] } :
+        csva[0][1].collect { |c| DOWNCASE[c] } :
         csva[0][1]
 
-      idi = csva[0][1].index(id)
+      idi = csva[0][1].index(did)
 
       csva[1..-1]
         .inject({ keys: csva[0] }) { |h, (i, row)|
@@ -82,20 +84,33 @@ module Cevennes
           h }
     end
 
+    def parse(csv)
+
+      return csv if csv.is_a?(Array)
+      ::CSV.parse(reencode(csv))
+    end
+
     #def deflate(row)
     #  ::CSV.generate(encoding: 'UTF-8') { |csv| csv << row }.strip
     #end
 
+    ENCODINGS = %w[ Windows-1252 ISO-8859-1 UTF-8 ].freeze
+
     def reencode(s)
 
       #s = unzip(s) if s[0, 2] == 'PK'
         # no dependency on rubyzip
 
-      %w[ Windows-1252 ISO-8859-1 UTF-8 ].each do |e|
-        ss = s.force_encoding(e).encode('UTF-8') rescue nil
-        break ss if ss
-        nil
+      #return s if s.encoding == Encoding::UTF_8
+        # NO! have to force_encoding for UTF-8 as well!
+
+      s = s.dup if s.frozen?
+
+      ENCODINGS.each do |e|
+        (return s.force_encoding(e).encode('UTF-8')) rescue nil
       end
+
+      nil
     end
   end
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: cevennes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -47,7 +47,7 @@ metadata:
   bug_tracker_uri: https://github.com/jmettraux/cevennes/issues
   homepage_uri: https://github.com/jmettraux/cevennes
   source_code_uri: https://github.com/jmettraux/cevennes
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: CSV diff library
 test_files: []