cbor-diag 0.5.10 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6860bf8b982a54e759b642bce8fcfc410c944ffb194ebd76942a9d791108d2f2
-  data.tar.gz: d26df44cd7ff9616bf8ad80cc2785d633bdeb86e338084c3ce7b71fc4467ab5c
+  metadata.gz: ce766a02a4e89480afebeacc8d954f187bed26e306e4100529cc7174a3a7493e
+  data.tar.gz: ade034f6ae05df4ddc29a100b523c6ed19127cfc7b83ee37e2f5482c6212fb49
 SHA512:
-  metadata.gz: 1562d3a70922fd80e4a4721e377ae4de759bf018727f9918c4181e320427f39e03610ad1c9df0ca7189a8ad4cb6457b35ccc464fdefe883375f82ed6a91fb77f
-  data.tar.gz: 54a47f48c5fdea45e52c9e408118978ba924586835c7fe1efe03c1ece3a5c70ae72f09a140aecde8a6a06882ac822a35ad20de4451b388e3bcc7b1cd29ffb1f3
+  metadata.gz: 61c8f2391568315618435c2470d442b7d0d1baf378f302dcbaf089179d4fc3a3af818ff95dba546264d86d44f1da8a4abc8e5450e121d557796eb07f16064571
+  data.tar.gz: b4f20f51b47a6b2771d2c1a42668dcdf6a25b49e8d7a020254e1ae5a60f2c896cdd972b80a416d3f3026ddbf89d29d03f67ea9cc97be7045a5e48d9c4b5a9b00

data/bin/cbor2diag.rb

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

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-([et]+)\z/ === ARGV[0]
+while /\A-([cdetu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -11,7 +13,11 @@ ARGF.binmode
 i = ARGF.read
 while !i.empty?
   o, i = CBOR.decode_with_rest(i)
-  out = o.cbor_diagnostic(try_decode_embedded: /e/ === options, bytes_as_text: /t/ === 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)
   if i.empty?
     puts out
   else

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

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+ARGF.binmode
+i = ARGF.read
+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/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.10"
+  s.version = "0.5.17"
   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.10
+  version: 0.5.17
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,44 +66,84 @@ 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
 - cborseq2json.rb
 - cborseq2neatjson.rb
+- cborseq2pretty.rb
 - cborseq2yaml.rb
 - diag2cbor.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
 - bin/cborseq2json.rb
 - bin/cborseq2neatjson.rb
+- bin/cborseq2pretty.rb
 - bin/cborseq2yaml.rb
 - bin/diag2cbor.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