cevennes 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca28f00b6cf84aa0856a46139b68b338509c834e2b1d274692da6e91285a47f
-  data.tar.gz: 5f3bbcc3b08ecdfa698e1ffa83b75832d938558533a9c2bff25dde682ba441e1
+  metadata.gz: 874142d4ea26d4cf12e802291ed6cce2b7563cc4c894ceafce5316448b04eb43
+  data.tar.gz: ac5051a4827b1af249ea9b5225464b8418ca7afc3bb7acb09c19b39e4c362e18
 SHA512:
-  metadata.gz: 39686c8f08786c2bd98367832b5cd08d2c40720a2cdc12dc6525dd328312a8352224c9727d62656fd0d740babc0584116ead5d284b378ef707a9b8c9d13abd59
-  data.tar.gz: 6929bc321836901230437ced040830ccdd40c10aebfad03a6383c4ee700597d4813f2e85d0a93a3eccf168181deadd85493717362fec285875b7015c25b2bd57
+  metadata.gz: 910c01d225504c18b7d74d34566b1449913cdb3045450840b2097ae55e1790d9501baebc5a2677200531186e3c563cb171eff3d3de78155f63428015f5787ecd
+  data.tar.gz: 8e0472c583b7b006e0a7aa1227f859f47d0bb4d35043307ca27bbed24cea6d5a2e1f99fa737ce75cd391f83fa2f05163b8852581a41b709a30e73918a86634c6

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 # CHANGELOG.md
 
 
+## cevennes 1.5.0  released 2026-11-13
+
+* Introduce `float: 'narrow'`
+
+
+## cevennes 1.4.1  released 2026-10-20
+
+* Require colorato
+
+
 ## cevennes 1.4.0  released 2026-10-19
 
 * Bring in .to_pretty_s(diff)

data/README.md

@@ -96,6 +96,36 @@ d = Cevennes.diff('id', cvs0, cvs1, drop_equals: true)
     # the "=" entries are not included
 ```
 
+### float: 'narrow'
+
+Sometimes CSV exports turns numbers like `1.3` to strings like `"1.30"`. By using the `float: 'narrow'` option, Cevennes takes care to compare `1.3` with `1.3`.
+
+```ruby
+csv0 = %{
+id, name,          age,   city,       county
+0,  John,          33,    Alexandria, Yorkshire
+1,  Jean-Baptiste, 44.10, Galileia,   Lancashire
+4,  Matthew,       20,    Beth,       Essex
+}.strip + "\n"
+
+csv1 = %{
+id, name,          age,  city,       county
+0,  John,          33.0, Alexandria, Yorkshire
+1,  Jean-Baptiste, 44.1, Galileia,   Lancashire
+4,  Matthew,       20,   Beth,       Essex
+}.strip + "\n"
+
+d = Cevennes.diff('name', csv0, csv1)
+
+pp d[1]
+  # => [ "stats", { "!" => 2, "=" => 1, "l0" => 3, "l1" => 3 } ]
+
+d = Cevennes.diff('name', csv0, csv1, float: 'narrow')
+
+pp d[1]
+  # => [ "stats", { "=" => 3, "l0" => 3, "l1" => 3 } ]
+```
+
 
 ## LICENSE
 

data/lib/cevennes.rb

@@ -2,10 +2,12 @@
 
 require 'csv'
 
+require 'colorato'
+
 
 module Cevennes
 
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 
   class << self
 
@@ -21,9 +23,9 @@ module Cevennes
         h0
           .collect { |k, v|
             v1 = h1[k]
-            if v1 == nil         then [ '-', *v,   -1, nil ]
-            elsif v1[1] == v[1]  then [ '=', *v, v[0], nil ]
-            else                      [ '!', *v,  *v1 ]
+            if v1 == nil                 then [ '-', *v,   -1, nil ]
+            elsif rowEquals(v1, v, opts) then [ '=', *v, v[0], nil ]
+            else                              [ '!', *v,  *v1 ]
             end }
 
       (h1.keys - h0.keys)
@@ -139,6 +141,26 @@ module Cevennes
 
     protected
 
+    def rowEquals(row0, row1, opts)
+
+      row01, row11 = row0[1], row1[1]
+
+      return false if row01.length != row11.length
+
+      if opts[:float] == 'narrow'
+
+        row01.each_with_index { |c0, i| c1 = row11[i]
+          next if c0 == c1
+          cf0 = Float(c0, exception: false) || c0
+          cf1 = Float(c1, exception: false) || c1
+          return false if cf0 != cf1 }
+
+        return true
+      end
+
+      row01 == row11
+    end
+
     def strip(row)
 
       row.collect { |cell| cell.is_a?(String) ? cell.strip : cell }

metadata

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