edn-abnf 0.5.38 → 0.5.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e20181db646536c0fa4eabd1527ba580085825de03eb89e0e26f4437e215ed
-  data.tar.gz: 15e82108df4dede7ab0dc29bebbfc7c6fc5e6e028a3a16de86615d3691c6db9d
+  metadata.gz: 17c5fde6eec17c35da2e94196c5eb582ef05e8586c997c38b989f044460c9a03
+  data.tar.gz: 964e47d82a247a6b17a0b479a8b2ac1dacf284baa5068a4458938726980de944
 SHA512:
-  metadata.gz: a95ef3f7c9c857cdbff5b6d1e60854fc6c268afc3d98052c3f236686505cd10b62e6e52e8f320b35b0514039b0e77d1fb3ab09f4bc561dd4741654970fa1d4b0
-  data.tar.gz: 72ba10c6341a342dc2b19030fb0d0993094564fc398c24ec8673911ce9453eca0950e7a954829c413c348e71625481038612025a3a34cc506d346e99580b0776
+  metadata.gz: 1d1b16c8fcc99e5cad651830b0ddb515b1321b2f177951376128fc26fc62fd5afbf1848a119876ad54557042192dea72a679bffc3b4d1bd515bc41b2520c4558
+  data.tar.gz: 8bc3c115e0b0576c4796d65846064747a7254fd9e9082ca4a99048d3130f485134a8fdd5a40d677a2239b50acb7b3a9d69c69c0a0c52609f43ecbc8a71881a4e

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.38"
+  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

@@ -66,6 +66,7 @@ module CBOR
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.38
+  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