edn-abnf 0.5.37 → 0.5.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f64289932889f6db2279a914988e7216a97977abaa03d7cf94ce185d7318c2
-  data.tar.gz: 619f9b5f1e029409c668eb5a43794523519f8a8789d69bc918264ab74f8cfe4f
+  metadata.gz: 17c5fde6eec17c35da2e94196c5eb582ef05e8586c997c38b989f044460c9a03
+  data.tar.gz: 964e47d82a247a6b17a0b479a8b2ac1dacf284baa5068a4458938726980de944
 SHA512:
-  metadata.gz: '05696d0f506625417e09b429819aee2c6905d6250b85f8e8df48b66922ccea56db6c5ecc0b6657bc383daa3c9170aa9b5b5c14bc59d32eab20d80f00ce8ad7fa'
-  data.tar.gz: dbdf3d08c3ad50af80f0285692fd655855419e38e88e0e6aab9561262fce195296f9c2c96465fd2a6fe8ad46df8f79f6478a28c1b54e7dfcb4c33e8bbe16f0f8
+  metadata.gz: 1d1b16c8fcc99e5cad651830b0ddb515b1321b2f177951376128fc26fc62fd5afbf1848a119876ad54557042192dea72a679bffc3b4d1bd515bc41b2520c4558
+  data.tar.gz: 8bc3c115e0b0576c4796d65846064747a7254fd9e9082ca4a99048d3130f485134a8fdd5a40d677a2239b50acb7b3a9d69c69c0a0c52609f43ecbc8a71881a4e

data/bin/edn-abnf

@@ -104,6 +104,9 @@ begin
     opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
       $options.fallback = v
     end
+    opts.on("-b", "--[no-]brace", "retry parsind with braces around added") do |v|
+      $options.brace = v
+    end
     opts.on("-wCOL", "--wrap=COL", Integer, "EDN: wrap at column COL") do |v|
       $options.wrap = v
     end
@@ -200,7 +203,15 @@ begin
   if $options.cbor
     result = CBOR.decode(edn_file)
   else
-    edn = EDN.from_edn(edn_file)
+    if $options.brace
+      begin
+        edn = EDN.from_edn(edn_file)
+      rescue ArgumentError # Parse error
+        edn = EDN.from_edn("{\n" + edn_file + "}\n")
+      end
+    else
+      edn = EDN.from_edn(edn_file)
+    end
     result = edn.tree               # XXX .tree?
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.37"
+  s.version = "0.5.39"
   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/cbor-diag-support.rb

@@ -64,6 +64,9 @@ module CBOR
   end
 
   class Xbox < Box
+    def encoding; value.encoding end
+    def size; value.size end
+    def b; value.b end
     def to_cbor
       enc = CBOR.encode(value)
       if ei = options[:ei]

data/lib/cbor-diagnostic-app/t1_b1.rb

@@ -0,0 +1,32 @@
+require "cbor-diagnostic-app/0"
+
+class CBOR_DIAG::Helper
+  def self.decode_string(app_prefix, s, to_text = false)
+    ret = if CBOR::Sequence === s
+            args = s.elements
+          else
+            args = [s]
+          end.map { |el|
+      unless String === el || el.respond_to?(:value) && String === el.value
+        raise ArgumentError.new("cbor-diagnostic: #{app_prefix}<<>>: #{el.cbor_diagnostic} not a string: Argument Error")
+      end
+      el.b
+    }.join.b # .b needed so empty array becomes byte string, too
+    if to_text
+      ret = ret.force_encoding(Encoding::UTF_8)
+    end
+    ret
+  end
+end
+
+class CBOR_DIAG::App_b1
+  def self.decode(app_prefix, s)
+    CBOR_DIAG::Helper.decode_string(app_prefix, s, false)
+  end
+end
+
+class CBOR_DIAG::App_t1
+  def self.decode(app_prefix, s)
+    CBOR_DIAG::Helper.decode_string(app_prefix, s, true)
+  end
+end

data/lib/parser/edn-util.rb

@@ -111,8 +111,9 @@ class Treetop::Runtime::SyntaxNode
   end
 end
 
-
-require 'cbor-diagnostic-app/dt'
-require 'cbor-diagnostic-app/ip'
+# MTI app-extensions:
 require 'cbor-diagnostic-app/h'
 require 'cbor-diagnostic-app/b64'
+require 'cbor-diagnostic-app/dt'
+require 'cbor-diagnostic-app/ip'
+require 'cbor-diagnostic-app/t1_b1'

data/lib/parser/edngrammar.rb

@@ -4792,7 +4792,12 @@ module EDNGRAMMAR
       unless Set[*strings.map(&:encoding)].size == 1
         warn "*** mixed streamstring #{strings.cbor_diagnostic}"
       end
-      strings.join.cbor_stream!(strings.map(&:size))
+      strings.each do |s|
+        if CBOR::Xbox === s && (ei = s.options[:ei])
+          warn "*** unimplemented encoding indicator #{ei.inspect} for #{s.inspect}"
+        end
+      end
+      strings.join.cbor_stream!(strings.map(&:size)) # XXX loses EI
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.37
+  version: 0.5.39
 platform: ruby
 authors:
 - Carsten Bormann
@@ -112,6 +112,7 @@ files:
 - lib/cbor-diagnostic-app/hgrammar.rb
 - lib/cbor-diagnostic-app/ip.rb
 - lib/cbor-diagnostic-app/ipgrammar.rb
+- lib/cbor-diagnostic-app/t1_b1.rb
 - lib/cbor-diagnostic-app/zzz.rb
 - lib/edn-abnf.rb
 - lib/parser/edn-util.rb