cbor-diag 0.5.12 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3528a462928a5e354625093ab38377abd4591b29b8d9c1b999ec8dc46c4b71ce
-  data.tar.gz: 727c825e585e16487d995a4d501726bbe383f26221a2747e6a1b0945fa8ef1dd
+  metadata.gz: 222a5a85e9ce7a04e69d4620d0bbcd851500cea2b56ff6206b317f10c04bbeb8
+  data.tar.gz: 61b1b698cd6e8a0a34d532053e5f8784a1a4fe2c9c94713f75359a795926aea3
 SHA512:
-  metadata.gz: 46c6dbc28aaf1c2dc8938206ff90b66ab9920b6822dbf47ddbcdb32d465d76c5233400d4401625df25e1c4b99d1afd335b30277c2aee253940abf471ac7c1eee
-  data.tar.gz: '029468920932c7d281d03c11030611c363a275db28386e4db273f57e729841cc822ef18bfd704a5f6f825ce7ff8a1e184095127f4721b828b35dea7f859d584e'
+  metadata.gz: b43b8603b856c370d9290fe89c8b6fdc3242c0fe4124704a46c3734c9123a3d4e4da9f21fb838dc55145eae216b0277b5ed57435bcabe56f2df751c0968f6633
+  data.tar.gz: 9ae5c2a6d02c854c5e0b4cd0de9f3210ce83d7cd61c86b3eaa1585a478cc54e9df0d0aa1998f28b835483ccfb296787942a40799af717faa8971b6e74de53cc9

data/bin/cbor2diag.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 options = ''
-while /\A-([etu]+)\z/ === ARGV[0]
+while /\A-([cdetu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -10,6 +12,8 @@ end
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+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)

data/bin/cbor2json.rb

@@ -1,8 +1,18 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
 puts JSON.pretty_generate(o)

data/bin/cbor2u8.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+ARGF.binmode
+i = ARGF.read
+i.bytes.each_slice(8) do |s|
+  puts s.map {|b| "0x%02x," % b}.join(" ")
+end

data/bin/cbor2yaml.rb

@@ -2,6 +2,8 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 class Array
   def to_yaml_style()
@@ -9,7 +11,15 @@ class Array
   end
 end
 
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+o = o.cbor_prepare_deterministic if /d/ === options
+o = o.cbor_pre_canonicalize if /c/ === options
 puts YAML.dump(o)

data/bin/cborleader2diag.rb

@@ -1,5 +1,13 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cdetu]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
@@ -7,4 +15,8 @@ o,r = CBOR.decode_with_rest(i)
 if r != ''
   warn "** ignoring rest of #{r.bytesize} bytes after first CBOR data item"
 end
-puts o.cbor_diagnostic
+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)

data/bin/cborseq2diag.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 options = ''
-while /\A-([etu]+)\z/ === ARGV[0]
+while /\A-([cdetu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -11,6 +13,8 @@ ARGF.binmode
 i = ARGF.read
 while !i.empty?
   o, i = CBOR.decode_with_rest(i)
+  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)

data/bin/cborseq2json.rb

@@ -1,10 +1,20 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.cbor_pre_canonicalize if /c/ === options
+  o = o.cbor_prepare_deterministic if /d/ === options
   puts JSON.pretty_generate(o)
 end

data/bin/cborseq2neatjson.rb

@@ -2,10 +2,20 @@
 require 'json'
 require 'cbor-pure'
 require 'neatjson'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.cbor_pre_canonicalize if /c/ === options
+  o = o.cbor_prepare_deterministic if /d/ === options
   puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)
 end

data/bin/cborseq2pretty.rb

@@ -4,8 +4,4 @@ require 'cbor-pretty'
 
 ARGF.binmode
 i = ARGF.read
-while !i.empty?
-  o, ni = CBOR.decode_with_rest(i)
-  puts CBOR::pretty(i[0...i.size-ni.size])
-  i = ni
-end
+puts CBOR::pretty_seq(i)

data/bin/cborseq2yaml.rb

@@ -2,6 +2,8 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 class Array
   def to_yaml_style()
@@ -9,10 +11,19 @@ class Array
   end
 end
 
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.cbor_pre_canonicalize if /c/ === options
+  o = o.cbor_prepare_deterministic if /d/ === options
   puts YAML.dump(o)
 end
 

data/bin/diag2cbor.rb

@@ -13,7 +13,14 @@ $stdout.binmode
 
 i = ARGF.read.b                 # binary to work around treetop performance bug
 if result = parser.parse(i)
-  print(CBOR::encode(result.to_rb))
+  decoded = result.to_rb
+  out = case decoded
+        when CBOR::Sequence
+          CBOR::encode_seq(decoded.elements)
+        else
+          CBOR::encode(decoded)
+        end
+  print out
 else
   puts "*** can't parse #{i}"
   puts "*** #{parser.failure_reason}"

data/bin/diag2diag.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'treetop'
+require 'cbor-diag-parser'
+unless ''.respond_to? :b
+  require 'cbor-diagnostic'     # for .b
+end
+require 'cbor-pretty'
+require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cdetu]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+def diagnostic(o, 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
+
+parser = CBOR_DIAGParser.new
+
+i = ARGF.read.b                 # binary to work around treetop performance bug
+if result = parser.parse(i)
+  decoded = result.to_rb
+  out = case decoded
+        when CBOR::Sequence
+          decoded.elements
+        else
+          [decoded]
+        end.map {|x| diagnostic(x, options)}.join(", ")
+  print out
+else
+  puts "*** can't parse #{i}"
+  puts "*** #{parser.failure_reason}"
+end

data/bin/diag2pretty.rb

@@ -8,7 +8,14 @@ parser = CBOR_DIAGParser.new
 
 i = ARGF.read
 if result = parser.parse(i)
-  puts(CBOR::pretty(CBOR::encode(result.to_rb)))
+  decoded = result.to_rb
+  puts case decoded
+        when CBOR::Sequence
+          "# CBOR sequence with #{decoded.elements.size} elements\n" <<
+            CBOR::pretty_seq(CBOR::encode_seq(decoded.elements))
+        else
+          CBOR::pretty(CBOR::encode(decoded))
+        end
 else
   puts "*** can't parse #{i}"
   puts "*** #{parser.failure_reason}"

data/bin/json2cbor.rb

@@ -1,14 +1,20 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
-if ARGV[0] == "-v"
-  verbose = true
+options = ''
+while /\A-([cdv]+)\z/ === ARGV[0]
+  options << $1
   ARGV.shift
 end
 
 $stdout.binmode
 i = ARGF.read
-o = CBOR.encode(JSON.load(i))
+o = JSON.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+o = CBOR.encode(o)
 print o
-warn "JSON size: #{i.size} bytes, CBOR size: #{o.size} bytes." if verbose
+warn "JSON size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/json2json.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = JSON.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+puts JSON.pretty_generate(o)

data/bin/json2neatjson.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'cbor-pure'
+require 'neatjson'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+$stdout.binmode
+i = ARGF.read
+o = JSON.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/json2yaml.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'json'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+class Array
+  def to_yaml_style()
+    all? {|x| Integer === x } && length < 20 ? :inline : super
+  end
+end
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = JSON.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+puts YAML.dump(o)

data/bin/yaml2cbor.rb

@@ -2,14 +2,20 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
-if ARGV[0] == "-v"
-  verbose = true
+options = ''
+while /\A-([cdv]+)\z/ === ARGV[0]
+  options << $1
   ARGV.shift
 end
 
 $stdout.binmode
 i = ARGF.read
-o = CBOR.encode(YAML.load(i))
+o = YAML.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+o = CBOR.encode(o)
 print o
-warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if verbose
+warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/yaml2json.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = YAML.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+puts JSON.pretty_generate(o)

data/cbor-diag.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.12"
+  s.version = "0.5.19"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
-  s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 7049}
+  s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742}
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
   s.license = "Apache-2.0"
@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json'
   s.add_dependency 'neatjson'
+  s.add_dependency 'cbor-deterministic'
+  s.add_dependency 'cbor-canonical'
 end

data/lib/cbor-diag-parser.rb

@@ -10,10 +10,38 @@ module CBOR_DIAG
 
   module Text0
     def ows1
-      elements[0]
+      elements[1]
     end
 
     def value
+      elements[2]
+    end
+
+    def ows2
+      elements[3]
+    end
+  end
+
+  module Text1
+    def value
+      elements[0]
+    end
+
+    def ows
+      elements[1]
+    end
+
+    def an
+      elements[2]
+    end
+  end
+
+  module Text2
+    def ows1
+      elements[0]
+    end
+
+    def a1
       elements[1]
     end
 
@@ -22,8 +50,19 @@ module CBOR_DIAG
     end
   end
 
-  module Text1
-    def to_rb; value.to_rb end
+  module Text3
+    def to_rb
+      r = if e = a1.elements
+        [e[0].to_rb] + e[2].elements.map {|x| x.value.to_rb }
+      else
+        []
+      end
+      if r.size == 1
+        r.first
+      else
+        CBOR::Sequence.new(r)
+      end
+    end
   end
 
   def _nt_text
@@ -41,17 +80,75 @@ module CBOR_DIAG
     r1 = _nt_ows
     s0 << r1
     if r1
-      r2 = _nt_value
+      i3, s3 = index, []
+      r4 = _nt_value
+      s3 << r4
+      if r4
+        r5 = _nt_ows
+        s3 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            i7, s7 = index, []
+            if (match_len = has_terminal?(',', false, index))
+              r8 = true
+              @index += match_len
+            else
+              terminal_parse_failure('\',\'')
+              r8 = nil
+            end
+            s7 << r8
+            if r8
+              r9 = _nt_ows
+              s7 << r9
+              if r9
+                r10 = _nt_value
+                s7 << r10
+                if r10
+                  r11 = _nt_ows
+                  s7 << r11
+                end
+              end
+            end
+            if s7.last
+              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+              r7.extend(Text0)
+            else
+              @index = i7
+              r7 = nil
+            end
+            if r7
+              s6 << r7
+            else
+              break
+            end
+          end
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s3 << r6
+        end
+      end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Text1)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
       s0 << r2
       if r2
-        r3 = _nt_ows
-        s0 << r3
+        r12 = _nt_ows
+        s0 << r12
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Text0)
-      r0.extend(Text1)
+      r0.extend(Text2)
+      r0.extend(Text3)
     else
       @index = i0
       r0 = nil

data/lib/cbor-pretty.rb

@@ -17,6 +17,15 @@ module CBOR
     Buffer.new(s).pretty_item_final(indent, max_target)
   end
 
+  def self.pretty_seq(s, indent = 0, max_target = 40)
+    b = Buffer.new(s)
+    res = ''                    # XXX: not all indented the same
+    while !b.empty?
+      res << b.pretty_item_final(indent, max_target, true)
+    end
+    res
+  end
+
   class Buffer
 
   def take_and_print(n, prefix = '')
@@ -72,11 +81,13 @@ module CBOR
     nil
   end
 
-  def pretty_item_final(indent = 0, max_target = 40)
+  def pretty_item_final(indent = 0, max_target = 40, seq = false)
     @out = ''
     @indent = indent
     pretty_item
-    raise if @pos != @buffer.size
+    unless seq
+      raise if @pos != @buffer.size
+    end
     target = [@out.each_line.map {|ln| ln =~ /#/ || 0}.max, max_target].min
     @out.each_line.map {|ln|
       col = ln =~ /#/

data/lib/cbor-pure.rb

@@ -64,6 +64,16 @@ module CBOR
     alias_method :inspect, :to_s
   end
 
+  Sequence = Struct.new(:elements) do
+    def to_s
+      elements.map(&:to_s).join(", ")
+    end
+    alias_method :inspect, :to_s
+    def to_cborseq
+      CBOR.encode_seq(self)
+    end
+  end
+
   def self.encode(d)
     Buffer.new.add(d).buffer
   end
@@ -314,6 +324,10 @@ module CBOR
     ret
   end
 
+  def empty?
+    @pos == buffer.size
+  end
+
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.19
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,12 +66,41 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: cbor-diag implements diagnostic notation for CBOR, RFC 7049
+- !ruby/object:Gem::Dependency
+  name: cbor-deterministic
+  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'
+- !ruby/object:Gem::Dependency
+  name: cbor-canonical
+  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: cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742
 email: cabo@tzi.org
 executables:
 - cbor2diag.rb
 - cbor2json.rb
 - cbor2pretty.rb
+- cbor2u8.rb
 - cbor2yaml.rb
 - cborleader2diag.rb
 - cborseq2diag.rb
@@ -80,18 +109,24 @@ executables:
 - cborseq2pretty.rb
 - cborseq2yaml.rb
 - diag2cbor.rb
+- diag2diag.rb
 - diag2pretty.rb
 - json2cbor.rb
+- json2json.rb
+- json2neatjson.rb
 - json2pretty.rb
+- json2yaml.rb
 - pretty2cbor.rb
 - pretty2diag.rb
 - yaml2cbor.rb
+- yaml2json.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/cbor2diag.rb
 - bin/cbor2json.rb
 - bin/cbor2pretty.rb
+- bin/cbor2u8.rb
 - bin/cbor2yaml.rb
 - bin/cborleader2diag.rb
 - bin/cborseq2diag.rb
@@ -100,12 +135,17 @@ files:
 - bin/cborseq2pretty.rb
 - bin/cborseq2yaml.rb
 - bin/diag2cbor.rb
+- bin/diag2diag.rb
 - bin/diag2pretty.rb
 - bin/json2cbor.rb
+- bin/json2json.rb
+- bin/json2neatjson.rb
 - bin/json2pretty.rb
+- bin/json2yaml.rb
 - bin/pretty2cbor.rb
 - bin/pretty2diag.rb
 - bin/yaml2cbor.rb
+- bin/yaml2json.rb
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb
 - lib/cbor-diagnostic.rb