edn-abnf 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ccd3540b2b3966eb739a688fd22322c2e0a7300e315d647b583ce5960f33f6
-  data.tar.gz: 98cdfdc738e65e68970cc9efec4d1616f54d8bfc2bcb296ec3d72c0f0363aa82
+  metadata.gz: c3897c19560ddc1c89c6a54f9ae9e71d88e1f1450589cd703261db76bfcca52c
+  data.tar.gz: 561925dbb535a93b97bce28fd6c36882a8ee73dd12e71bce99381f9f0d94dcfd
 SHA512:
-  metadata.gz: 3e3ee53333c99241e2e9c4f29b06df4b2fd148dbedece4d6287058891e299fefffa8724c914a7931f51b0a8f879449afd1264dcc2dbe3301ccd7eb007418e0bb
-  data.tar.gz: 73b08bd9557d8780e63ab65b21c71bd573f429ef1c3b29fab03773c61601d9f9ab474d8e8afdd97ac8a232cd815a57900b495ab100e0f38f85dd663a76c9d705
+  metadata.gz: a77b88f8fa087d4a5f1284cfb9735183af07a20090788e9d9b3b3eb0396005d35396cca28228842a0d7d5a9ecbbfa3debb3f6f7a86d83564df1ee2474aed52ff
+  data.tar.gz: a6c564e1577ea8dc88859465112a57a5e5d62473fa36e0f73cf3c30eeb46de0ad46f67197a826f178987b8b7dd856697e3e7c117f127909798e88715bfeda64c

data/bin/edn-abnf

@@ -10,7 +10,23 @@ require_relative '../lib/edn-abnf.rb'
 def snaky(name)
   name.gsub(/-/, "_")
 end
- 
+
+class String
+  def hexi
+    bytes.map{|x| "%02x" % x}.join
+  end
+  def xeh
+    gsub(/\s/, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+  end
+end
+
+def tree_from_edn_possibly_hex(s)
+  if s[0..1] == "h]"
+    s = s[2..-1].xeh.force_encoding(Encoding::UTF_8)
+  end
+  EDN.from_edn(s).tree
+end
+
 Encoding.default_external = Encoding::UTF_8
 require 'optparse'
 require 'ostruct'
@@ -61,17 +77,26 @@ if $options.lines
       puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
       next
     end
+    if ok[0] == "x"
+      result = tree_from_edn_possibly_hex(ednin)
+      result_hex = result.to_cbor.hexi
+      result_diag = result.cbor_diagnostic
+      puts "x #{ok}, #{ednin.inspect} / #{out} ➔ #{result_diag.inspect} / #{result_hex}" if $options.verbose
+      if result_hex != out
+          puts "** x / #{ednin.inspect} / #{out} ≠ #{result_diag.inspect} / #{result_hex}"
+      end
+      next
+    end
     begin
       ok = ok == "="
       puts "➔ #{ok}, #{ednin}, #{out}" if $options.verbose
-      edn = EDN.from_edn(ednin)
-      result = edn.tree
+      result = tree_from_edn_possibly_hex(ednin)
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
       end
       if out != diag && ok
-        outdiag = EDN.from_edn(out).tree.cbor_diagnostic
+        outdiag = tree_from_edn_possibly_hex(out).cbor_diagnostic
         if outdiag != diag
           puts "** ≡ / #{ednin.inspect} #{diag.inspect} / #{out.inspect} #{outdiag.inspect}"
         end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.2.3"
+  s.version = "0.2.5"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler