cevennes 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb788c6c511d207dbeb25a03ffb061da5485de2
-  data.tar.gz: 9a20b7faae773a410f8c04d919810099529f664d
+  metadata.gz: e8fcfbf02c5a728c9a6364a0fe67a61003fa18fa
+  data.tar.gz: 72361059d05b8c7cca589fa099d4e92a58ca704d
 SHA512:
-  metadata.gz: 33684d80bfff9bab6755492edf1e97f09928d992619f5af5704e962c2f1a160ac110d7f587386b3ad2a5b9a3402247ef9ec11b1a65170c74ba7b016f7933ff1e
-  data.tar.gz: c348f6108095abe5c00201ff3ac39948d607cdc7e5f222af64fe4e9f841734625f1a79f31524ba23bd68f7a04cc7b7ebe92f3cf0b758ef385b02d241d6f3dad4
+  metadata.gz: fd04c1d5c12954d091a75b55ccb0078757a35bfc1d7d7dc6fcf2cf3d23ecb6929ec47d05adbfc13be1646a4ca6040a05135b9ce4664a5f5947b5413e01bf4fd0
+  data.tar.gz: ee72cda27967a186dfea52a61ef67256b69f3d56ec95c0c3d0e61bc1084a74a35a59e3025a8a5666e29e7ebfc649c8c6d48a16dda7a64bc4919fbeee255252ee

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## cevennes 0.10.0  released 2018-09-03
+
+- Weave in additions at the right spot
+- Indicate line numbers
+
+
 ## cevennes 0.9.0  released 2018-09-03
 
 - Implement first version of Cevennes.diff(id, cvs0, cvs1)

data/README.md

@@ -9,6 +9,13 @@ Diffs CSVs by lines, focusing on a single ID
 ## usage
 
 TODO
+```
+csv0 = %{
+  }
+csv1 = %{
+  }
+pp Cevennes.diff('ISIN', csv0, csv1)
+```
 
 ## LICENSE
 

data/lib/cevennes.rb

@@ -4,7 +4,7 @@ require 'csv'
 
 module Cevennes
 
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 
   class << self
 
@@ -20,16 +20,20 @@ module Cevennes
         h0
           .collect { |k, v|
             v1 = h1[k]
-            if v1 == v
-              [ '=', v, nil ]
+            if v1 == nil
+              [ '-', *v, -1, nil ]
+            elsif v1[1] == v[1]
+              [ '=', *v, v[0], nil ]
             else
-              [ v1 == nil ? '-' : '!', v, v1 ]
+              [ '!', *v, *v1 ]
             end }
-          .compact +
-        (h1.keys - h0.keys)
-          .collect { |k|
-            v = h1[k]
-            [ '+', nil, h1[k] ] }
+
+      (h1.keys - h0.keys)
+        .collect { |k| h1[k] }
+        .reverse
+        .each { |lnum, line|
+          i = d.index { |a, _, _, l1, _| l1 > lnum } || d.length
+          d.insert(i, [ '+', -1, nil, lnum, line ]) }
 
       s = d.inject({}) { |h, (a, _, _)| h[a] = (h[a] || 0) + 1; h }
       s['l0'] = h0.length - 1
@@ -43,16 +47,17 @@ module Cevennes
     def hash(id, csv)
 
       csva = ::CSV.parse(reencode(csv))
-        .reject { |row| row.compact.empty? }
-        .drop_while { |row| ! row.include?(id) }
+        .each_with_index.collect { |row, i| [ 1 + i, row ] }
+        .reject { |i, row| row.compact.empty? }
+        .drop_while { |i, row| ! row.include?(id) }
 
-      i = csva[0].index(id)
+      idi = csva[0][1].index(id)
 
       csva[1..-1]
-        .inject({ keys: csva[0] }) { |h, row|
+        .inject({ keys: csva[0] }) { |h, (i, row)|
           if row.compact.length > 1
-            k = row[i]
-            h[k] = row if k
+            k = row[idi]
+            h[k] = [ i, row ] if k
           end
           h }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cevennes
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - John Mettraux