edn-abnf 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dfe85683dcf245892881927e2282ef6d37f7cf4f1af908fd0d42311f1ab3df0
-  data.tar.gz: 4b1f2852badbe29367e0a2a74e21fb7c0a66991b29a1770ad9b6828fc4a5c007
+  metadata.gz: 3bcd4eb027bdd536dd68495888d729d0bd74647daa157fe2ba8f674432f6a8d8
+  data.tar.gz: 3fcc1ece75ccda7eca35284880b26232f6014528d17e0abd46ef73c86c2dc7da
 SHA512:
-  metadata.gz: 6cf2a94c9c99cc4d8514bcc43cd6510e9680039f32f56424ac3591acbe7124b074c3cc7fb86a9bd121a353d268adb6e72aef1fa0dad18439f4ee8b52de5834a2
-  data.tar.gz: b073d04f739667786be52f5a97dde7889573f9630a111f44528e0664fe3ae0a9cce8333f5b1e846833629018d363b1492464c3d976788d72b8ffa05f90719914
+  metadata.gz: c2820714dc0bca0ac2196af9f156062423db534c166de6b18dd0e243638b808d2906b3bcd2cf0e2d7fcbb6555fa42f21213c1026983ac586e1793735b21bfcd1
+  data.tar.gz: dc913cf9e16dfc2655c086042c477ac664f43ac179bfd06939cc063426360e1e62a1173f84b7413cc97a4f4b7f663a399b3eaaf7e7099f48d1c1c6feeef12614

data/bin/edn-abnf

@@ -34,6 +34,8 @@ require 'ostruct'
 
 $error = 0
 
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor]
+
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
@@ -53,8 +55,8 @@ begin
       $options.edn = v
     end
     opts.on("-tFMT", "--to=FMT",
-            [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex],
-            "Target format (default: diag)") do |v|
+            output_formats,
+            "Target format (#{output_formats.join("/")}, default: diag)") do |v|
       $options.target = v
     end
     opts.on("-aAPP", "--app=APP", "Load application extension") do |v|
@@ -66,17 +68,21 @@ begin
         end
       end
     end
+    opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
+      $options.fallback = v
+    end
   end
   op.parse!
 rescue Exception => e
   warn e
+  warn op
   exit 1
 end
 
 
 if !$options.edn
   if ARGV == []
-    puts op
+    warn op
     exit 1
   end
   $options.edn = ARGF.read
@@ -165,17 +171,23 @@ when :yaml
   puts result.to_yaml
 when :edn, :diag, nil
   puts result.cbor_diagnostic
-when :pretty, :hex
+when :pretty, :hex, :cbor
   # XXX can't do Box yet
   enc = if CBOR::Sequence === result
           result.to_cborseq
         else
           result.to_cbor
         end
-  if $options.target == :pretty
+  case $options.target
+  when :pretty
     puts CBOR::pretty_seq(enc)
-  else
+  when :hex
     puts enc.bytes.map{|x| "%02x" % x}.join
+  when :cbor
+    $stdout.binmode
+    print enc
+  else
+    fail "Cannot happen"
   end
 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.5.5"
+  s.version = "0.5.7"
   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"

data/lib/parser/edn-util.rb

@@ -5,11 +5,26 @@ end
 require 'treetop'
 require_relative './edngrammar'
 
+class CBOR_DIAG::App_ # fallback!
+  def self.decode(app_prefix, s)
+    if CBOR::Sequence === s
+      args = s.elements
+    else
+      args = [s]
+    end
+    CBOR::Tagged.new(999, [app_prefix, args])
+  end
+end
+
 module EDNGRAMMAR
   const_set(:APPS, Hash.new { |h, k|
               h[k] = begin ::CBOR_DIAG.const_get("App_#{k.downcase}")
                      rescue NameError
-                       raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
+                       if $options.fallback
+                         ::CBOR_DIAG::App_
+                       else
+                         raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
+                       end
                      end
             }) unless const_defined?(:APPS)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler