edn-abnf 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ccd3540b2b3966eb739a688fd22322c2e0a7300e315d647b583ce5960f33f6
-  data.tar.gz: 98cdfdc738e65e68970cc9efec4d1616f54d8bfc2bcb296ec3d72c0f0363aa82
+  metadata.gz: 0e8b236b54352f4702a4d5995eaaab5d7578addef93777e1a722c668ac1c6202
+  data.tar.gz: 3168853cab882f8db393a9e5921a527d788f658f63fb3877c45315f9cc078ca7
 SHA512:
-  metadata.gz: 3e3ee53333c99241e2e9c4f29b06df4b2fd148dbedece4d6287058891e299fefffa8724c914a7931f51b0a8f879449afd1264dcc2dbe3301ccd7eb007418e0bb
-  data.tar.gz: 73b08bd9557d8780e63ab65b21c71bd573f429ef1c3b29fab03773c61601d9f9ab474d8e8afdd97ac8a232cd815a57900b495ab100e0f38f85dd663a76c9d705
+  metadata.gz: 5ae982135b96e6fa336b23a77d106a0d759cc112e2770cef7532dfd69ac0dee29342f5192c60ffa5aef927d0bad16960f9e9b174535200ebcf9ab568f1a030f2
+  data.tar.gz: a16821958a1e34e3cdd6dd1040440f9e964ea39adbd2af0a0f965a6246d2a8964fbeae17dcd39ad59376a43f50e7542d3085648356f66ee010d44f3346b74245

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'
@@ -30,7 +46,7 @@ begin
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
+    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format (default: diag)") do |v|
       $options.target = v
     end
   end
@@ -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
@@ -99,14 +124,14 @@ rescue ArgumentError => e
 end
 
 case $options.target
-when :basic, nil
+when :basic
   pp result
 when :neat, :json
   require 'neatjson'
   puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
 when :yaml
   puts result.to_yaml
-when :edn, :diag
+when :edn, :diag, nil
   puts result.cbor_diagnostic
 else
   warn ["Unknown target format: ", $options.target].inspect

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.3.1"
   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"
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json', '~>2'
   s.add_dependency 'neatjson', '~>0.10'
+  s.add_dependency 'cbor-diag'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: cbor-diag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: edn-abnf implements converters and miscellaneous tools for CBOR EDN's
   ABNF
 email: cabo@tzi.org