cbor-diag 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb38c1e59dd1701b41b72b2bb232a6a51d43a75b30e77b5e269825fd39211d5
-  data.tar.gz: 4c0c047f677f11812efb56acf1383b5772c716cfffab33e09f82b513fc8b12ef
+  metadata.gz: d46971cb4fe65291d5659c969853e2776bc803a4260d3831107ee5b801c0fc76
+  data.tar.gz: e54c7b33742851467b3b631220a65558f5493c61eb011a973a5283191d4cbe0c
 SHA512:
-  metadata.gz: 05677c580fb68683da31074517d9b34e295347b1741bb05a2584b7736bdc43898b9114866deef5cbfbb0d2f741567c2ad8c189f95c80839acf3dd0f9aedba5ef
-  data.tar.gz: af9a7d645cfaadf0668b9d3f1cdbc43c35771258f65530853d862e679efe83bb02c04bf594bc3bd1d9dc030f452e87f3bd7549f9c96bc7863b29e955d6ae2f9a
+  metadata.gz: bbc73e462fd6fa8a3e44255d4d85847512a320a2e75d141c657849cd21fd1c975429fcaea9798e257ffb681bebec3c6f19d1f50461cc8f36b04a73592ba61fc8
+  data.tar.gz: dad9a127145e629293892154b6b7e51dde44151138f7596f006226ed238a6bc74740f291b40818123d435a25b0f6eb739cb67a8c7c74f3c1c49cd4ab207fe386

data/bin/cbor2diag.rb

@@ -4,19 +4,11 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdetpqu]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdetpqu")
 
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
-puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,
-                       bytes_as_text: /t/ === options,
-                       utf8: /u/ === options)
+puts cbor_diagnostic_output(o, options)

data/bin/cbor2json.rb

@@ -5,19 +5,14 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpqj]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpqj")
 
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 if /j/ === options
   require 'cbor-transform-j'
   o = CBOR::Transform_j.new.transform(o)

data/bin/cbor2yaml.rb

@@ -12,17 +12,11 @@ class Array
   end
 end
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
+o = cbor_diagnostic_item_processing(o, options)
 puts YAML.dump(o)

data/bin/cborleader2diag.rb

@@ -4,11 +4,8 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdetpqu]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdetpqu")
 
 ARGF.binmode
 i = ARGF.read
@@ -16,10 +13,4 @@ o,r = CBOR.decode_with_rest(i)
 if r != ''
   warn "** ignoring rest of #{r.bytesize} bytes after first CBOR data item"
 end
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,
-                       bytes_as_text: /t/ === options,
-                       utf8: /u/ === options)
+puts cbor_diagnostic_output(o, options)

data/bin/cborseq2diag.rb

@@ -4,11 +4,8 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdetpqu]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdetpqu")
 
 ARGF.binmode
 i = ARGF.read
@@ -20,13 +17,7 @@ while !i.empty?
     puts "/ *** Garbage at byte #{totalsize-i.bytesize}: #{e.message} /"
     exit 1
   end
-  o = o.to_packed_cbor if /p/ === options
-  o = o.to_unpacked_cbor if /q/ === options
-  o = o.cbor_pre_canonicalize if /c/ === options
-  o = o.cbor_prepare_deterministic if /d/ === options
-  out = o.cbor_diagnostic(try_decode_embedded: /e/ === options,
-                          bytes_as_text: /t/ === options,
-                          utf8: /u/ === options)
+  out = cbor_diagnostic_output(o, options)
   if i.empty?
     puts out
   else

data/bin/cborseq2json.rb

@@ -4,19 +4,13 @@ require 'cbor-pure'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
-  o = o.to_packed_cbor if /p/ === options
-  o = o.to_unpacked_cbor if /q/ === options
-  o = o.cbor_pre_canonicalize if /c/ === options
-  o = o.cbor_prepare_deterministic if /d/ === options
+  o = cbor_diagnostic_item_processing(o, options)
   puts JSON.pretty_generate(o)
 end

data/bin/cborseq2neatjson.rb

@@ -5,19 +5,14 @@ require 'neatjson'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
-  o = o.to_packed_cbor if /p/ === options
-  o = o.to_unpacked_cbor if /q/ === options
-  o = o.cbor_pre_canonicalize if /c/ === options
-  o = o.cbor_prepare_deterministic if /d/ === options
+  o = cbor_diagnostic_item_processing(o, options)
   puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)
 end

data/bin/cborseq2yaml.rb

@@ -12,21 +12,17 @@ class Array
   end
 end
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
-  o = o.to_packed_cbor if /p/ === options
-  o = o.to_unpacked_cbor if /q/ === options
-  o = o.cbor_pre_canonicalize if /c/ === options
-  o = o.cbor_prepare_deterministic if /d/ === options
+  o = cbor_diagnostic_item_processing(o, options)
   puts YAML.dump(o)
 end
 

data/bin/diag2cbor.rb

@@ -7,6 +7,9 @@ unless ''.respond_to? :b
 end
 require 'cbor-pretty'
 
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("X") # XXX
+
 parser = CBOR_DIAGParser.new
 
 $stdout.binmode

data/bin/diag2diag.rb

@@ -7,25 +7,9 @@ unless ''.respond_to? :b
 end
 require 'cbor-pretty'
 require 'cbor-diagnostic'
-require 'cbor-packed'
-require 'cbor-deterministic'
-require 'cbor-canonical'
 
-options = ''
-while /\A-([cdetpqu]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
-
-def diagnostic(o, options)
-  o = o.to_packed_cbor if /p/ === options
-  o = o.to_unpacked_cbor if /q/ === options
-  o = o.cbor_pre_canonicalize if /c/ === options
-  o = o.cbor_prepare_deterministic if /d/ === options
-  puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,
-                         bytes_as_text: /t/ === options,
-                         utf8: /u/ === options)
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdetpqu")
 
 parser = CBOR_DIAGParser.new
 
@@ -37,8 +21,8 @@ if result = parser.parse(i)
           decoded.elements
         else
           [decoded]
-        end.map {|x| diagnostic(x, options)}.join(", ")
-  print out
+        end.map {|x| cbor_diagnostic_output(x, options)}.join(", ")
+  puts out
 else
   puts "*** can't parse #{i}"
   puts "*** #{parser.failure_reason}"

data/bin/diag2pretty.rb

@@ -4,6 +4,9 @@ require 'treetop'
 require 'cbor-diag-parser'
 require 'cbor-pretty'
 
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("X") # XXX
+
 parser = CBOR_DIAGParser.new
 
 i = ARGF.read

data/bin/json2cbor.rb

@@ -5,11 +5,9 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpqvj]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpqvj")
 
 $stdout.binmode
 i = ARGF.read
@@ -18,10 +16,7 @@ if /j/ === options
   require 'cbor-transform-j'
   o = CBOR::Transform_jr.new.transform(o)
 end
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 o = CBOR.encode(o)
 print o
 warn "JSON size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/json2json.rb

@@ -5,16 +5,10 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 i = ARGF.read
 o = JSON.load(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 puts JSON.pretty_generate(o)

data/bin/json2neatjson.rb

@@ -6,17 +6,10 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
-$stdout.binmode
 i = ARGF.read
 o = JSON.load(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/json2yaml.rb

@@ -13,16 +13,10 @@ class Array
   end
 end
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 i = ARGF.read
 o = JSON.load(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 puts YAML.dump(o)

data/bin/pretty2diag.rb

@@ -7,6 +7,11 @@ def extractbytes(s)
   s.each_line.map {|ln| ln.sub(/#.*/, '')}.join.scan(/[0-9a-fA-F][0-9a-fA-F]/).map {|b| b.to_i(16).chr(Encoding::BINARY)}.join
 end
 
+
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdetpqu")
+
+
 i = extractbytes(ARGF)
 o = CBOR.decode(i)
-puts o.cbor_diagnostic
+puts cbor_diagnostic_output(o, options)

data/bin/yaml2cbor.rb

@@ -6,19 +6,13 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpqv]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpqv")
 
 $stdout.binmode
 i = ARGF.read
 o = YAML.load(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 o = CBOR.encode(o)
 print o
 warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/yaml2json.rb

@@ -7,16 +7,10 @@ require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
-options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
-  options << $1
-  ARGV.shift
-end
+require 'cbor-diagnostic-helper'
+options = cbor_diagnostic_process_args("cdpq")
 
 i = ARGF.read
 o = YAML.load(i)
-o = o.to_packed_cbor if /p/ === options
-o = o.to_unpacked_cbor if /q/ === options
-o = o.cbor_pre_canonicalize if /c/ === options
-o = o.cbor_prepare_deterministic if /d/ === options
+o = cbor_diagnostic_item_processing(o, options)
 puts JSON.pretty_generate(o)

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.6.3"
+  s.version = "0.7.0"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-parser.rb

@@ -226,18 +226,24 @@ module CBOR_DIAG
                           r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
                           r0 = r11
                         else
-                          r12 = _nt_embedded
+                          r12 = _nt_appstring
                           if r12
                             r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
                             r0 = r12
                           else
-                            r13 = _nt_streamstring
+                            r13 = _nt_embedded
                             if r13
                               r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
                               r0 = r13
                             else
-                              @index = i0
-                              r0 = nil
+                              r14 = _nt_streamstring
+                              if r14
+                                r14 = SyntaxNode.new(input, (index-1)...index) if r14 == true
+                                r0 = r14
+                              else
+                                @index = i0
+                                r0 = nil
+                              end
                             end
                           end
                         end
@@ -1519,6 +1525,131 @@ module CBOR_DIAG
     r0
   end
 
+  module Appstring0
+  end
+
+  module Appstring1
+    def a
+      elements[0]
+    end
+
+    def s
+      elements[2]
+    end
+
+  end
+
+  module Appstring2
+    #'
+               def to_rb
+                 data = s.elements.map(&:partval).join.b
+                 app = a.text_value
+                 # Find a better place to put a default initialization
+                 CBOR_DIAG::APPS ||= Hash.new { |h, k|
+                   h[k] = begin CBOR_DIAG.const_get("App_#{app}")
+                          rescue NameError
+                            raise ArgumentError.new("cbor-diagnostic: Unknown application-oriented extension #{k}")
+                          end
+                 }
+                 CBOR_DIAG::APPS[app].decode(app, data)
+               end
+  end
+
+  def _nt_appstring
+    start_index = index
+    if node_cache[:appstring].has_key?(index)
+      cached = node_cache[:appstring][index]
+      if cached
+        node_cache[:appstring][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    i1, s1 = index, []
+    if has_terminal?(@regexps[gr = '\A[a-z]'] ||= Regexp.new(gr), :regexp, index)
+      r2 = true
+      @index += 1
+    else
+      terminal_parse_failure('[a-z]')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        if has_terminal?(@regexps[gr = '\A[a-z0-9]'] ||= Regexp.new(gr), :regexp, index)
+          r4 = true
+          @index += 1
+        else
+          terminal_parse_failure('[a-z0-9]')
+          r4 = nil
+        end
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Appstring0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("'", false, index))
+        r5 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\'"')
+        r5 = nil
+      end
+      s0 << r5
+      if r5
+        s6, i6 = [], index
+        loop do
+          r7 = _nt_bstring_part
+          if r7
+            s6 << r7
+          else
+            break
+          end
+        end
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        s0 << r6
+        if r6
+          if (match_len = has_terminal?("'", false, index))
+            r8 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"\'"')
+            r8 = nil
+          end
+          s0 << r8
+        end
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Appstring1)
+      r0.extend(Appstring2)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:appstring][start_index] = r0
+
+    r0
+  end
+
   module Bstring0
     def s
       elements[1]

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

@@ -0,0 +1,17 @@
+require 'time'
+
+# Using Time#iso8601 creates the following bugs:
+# * dt'1970-01-01T10:00:00' is accepted and gives local time
+# * dt'1970-01-01T10:00:00.0Z' gives an integer instead of a float
+# Probably should copy over Time#xmlschema and fix that for us.
+
+class CBOR_DIAG::App_dt
+  def self.decode(_, s)
+    t = Time.iso8601(s)
+    if t.subsec != 0
+      t.to_f
+    else
+      t.to_i
+    end
+  end
+end

data/lib/cbor-diagnostic-helper.rb

@@ -0,0 +1,35 @@
+require 'cbor-packed'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+def cbor_diagnostic_process_args(chars)
+  options = ''
+  while /\A-(?:([#{chars}]+)|a(.*))\z/ === ARGV[0]
+    ARGV.shift
+    if $1
+      options << $1
+    else
+      s = $2
+      s = ARGV.shift if s == ""
+      s.split(",").each do |a|
+        require "cbor-diagnostic-app/#{a}"
+      end
+    end
+  end
+  options
+end
+
+def cbor_diagnostic_item_processing(o, options)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
+  o = o.cbor_pre_canonicalize if /c/ === options
+  o = o.cbor_prepare_deterministic if /d/ === options
+  o
+end
+
+def cbor_diagnostic_output(o, options)
+  o = cbor_diagnostic_item_processing(o, options)
+  o.cbor_diagnostic(try_decode_embedded: /e/ === options,
+                    bytes_as_text: /t/ === options,
+                    utf8: /u/ === options)
+end

data/lib/cbor-diagnostic-parser.rb

@@ -0,0 +1,3 @@
+require 'treetop'
+require 'cbor-diag-parser'
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,9 @@ files:
 - bin/yaml2json.rb
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb
+- lib/cbor-diagnostic-app/dt.rb
+- lib/cbor-diagnostic-helper.rb
+- lib/cbor-diagnostic-parser.rb
 - lib/cbor-diagnostic.rb
 - lib/cbor-pretty.rb
 - lib/cbor-pure.rb