cbor-diag 0.5.17 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce766a02a4e89480afebeacc8d954f187bed26e306e4100529cc7174a3a7493e
-  data.tar.gz: ade034f6ae05df4ddc29a100b523c6ed19127cfc7b83ee37e2f5482c6212fb49
+  metadata.gz: ec43541ce38545a4f655d2850def66df52e470aeacd8619606d3f93d67b1c754
+  data.tar.gz: b9775671d09e6d633857c05dacb9eca09d58549b1f3610a2522950611e2335df
 SHA512:
-  metadata.gz: 61c8f2391568315618435c2470d442b7d0d1baf378f302dcbaf089179d4fc3a3af818ff95dba546264d86d44f1da8a4abc8e5450e121d557796eb07f16064571
-  data.tar.gz: b4f20f51b47a6b2771d2c1a42668dcdf6a25b49e8d7a020254e1ae5a60f2c896cdd972b80a416d3f3026ddbf89d29d03f67ea9cc97be7045a5e48d9c4b5a9b00
+  metadata.gz: 0e3d37804d954244631ef72c5e1adb278ab014d1e0b5f202bd624d036c06e6ec9e89955022acc1b0e58305ff0ef121f933761229026c84ebb2e084c896c5e47d
+  data.tar.gz: 3ecad4f3ae9bc6f146c8e0c02558c2dfa05a4c8a5fe19a648e4b64b95431e5d2c1ab335f5143783652e25a5b6b054eefbe88ebb747212ce209a124ddd9d087fd

data/bin/cbor2diag.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -12,6 +13,8 @@ end
 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,

data/bin/cbor2json.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpqj]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -13,6 +14,12 @@ end
 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
+if /j/ === options
+  require 'cbor-transform-j'
+  o = CBOR::Transform_j.new.transform(o)
+end
 puts JSON.pretty_generate(o)

data/bin/cbor2yaml.rb

@@ -2,6 +2,7 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -12,7 +13,7 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -20,6 +21,8 @@ end
 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
 puts YAML.dump(o)

data/bin/cborleader2diag.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -15,6 +16,8 @@ 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,

data/bin/cborseq2diag.rb

@@ -1,18 +1,27 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 ARGF.binmode
 i = ARGF.read
+totalsize = i.bytesize
 while !i.empty?
-  o, i = CBOR.decode_with_rest(i)
+  begin
+    o, i = CBOR.decode_with_rest(i)
+  rescue Exception => e
+    puts "/ *** Garbage at byte #{totalsize-i.bytesize}: #{e.message} /"
+    break
+  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,

data/bin/cborseq2json.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +14,8 @@ 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
   puts JSON.pretty_generate(o)

data/bin/cborseq2neatjson.rb

@@ -6,7 +6,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -15,6 +15,8 @@ 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
   puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/cborseq2yaml.rb

@@ -2,6 +2,7 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -12,7 +13,7 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -22,6 +23,8 @@ 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
   puts YAML.dump(o)

data/bin/diag2diag.rb

@@ -0,0 +1,45 @@
+#!/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-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
+
+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/json2cbor.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdv]+)\z/ === ARGV[0]
+while /\A-([cdpqvj]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -13,6 +14,12 @@ end
 $stdout.binmode
 i = ARGF.read
 o = JSON.load(i)
+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.encode(o)

data/bin/json2json.rb

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 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
 puts JSON.pretty_generate(o)

data/bin/json2neatjson.rb

@@ -2,11 +2,12 @@
 require 'json'
 require 'cbor-pure'
 require 'neatjson'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +15,8 @@ end
 $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
 puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/json2yaml.rb

@@ -3,6 +3,7 @@ require 'psych.rb'              # WTF
 require 'yaml'
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -13,13 +14,15 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 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
 puts YAML.dump(o)

data/bin/yaml2cbor.rb

@@ -2,11 +2,12 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdv]+)\z/ === ARGV[0]
+while /\A-([cdpqv]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +15,8 @@ end
 $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.encode(o)

data/bin/yaml2json.rb

@@ -3,17 +3,20 @@ require 'json'
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 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
 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.5.17"
+  s.version = "0.6.2"
   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"
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'neatjson'
   s.add_dependency 'cbor-deterministic'
   s.add_dependency 'cbor-canonical'
+  s.add_dependency 'cbor-packed'
 end

data/lib/cbor-transform-j.rb

@@ -0,0 +1,68 @@
+require 'cbor-transform'
+unless defined?(JSON)
+  require 'json'
+end
+require 'base64'
+
+class CBOR::Transform_j < CBOR::Transform
+
+  # CBOR::Transform_j.new(1).transform [1, "a", "b".b, CBOR::Simple.new(2), CBOR::Tagged.new(1, 2), {"a"=> 1, 2=> 3}]
+
+  def transform_simple(obj)
+    {'@@!s': obj.value}
+  end
+
+  def transform_bytes(obj)
+    {'@@!b': ::Base64.urlsafe_encode64(obj, padding: false)}
+  end
+
+  def transform_hash(obj)
+    Hash[obj.map {|k, v| [ (
+                             kt = transform(k)
+                             if (String === kt && kt.encoding != Encoding::BINARY)
+                               kt
+                             else
+                               '@@!:' << JSON.generate(kt)
+                             end
+                           ),
+                           transform(v)]}]
+  end
+
+  def transform_tag(obj)
+    {"@@!t#{obj.tag}": transform(obj.value)}
+  end
+
+end
+
+class CBOR::Transform_jr < CBOR::Transform
+
+  # >> CBOR::Transform_jr.new(1).transform(JSON.parse(JSON.generate(a = CBOR::Transform_j.new(1).transform([1, "a", "b".b, CBOR::Simple.new(2), CBOR::Tagged.new(1, 2), {"a"=> 1, 2=> 3, {3=>4}=>5}]))))
+  # => [1, "a", "b", #<struct CBOR::Simple value=2>, #<struct CBOR::Tagged tag=1, value=2>, {"a"=>1, 2=>3, {3=>4}=>5}]
+  # >> a
+  # => [1, "a", {:"@@!b"=>"Yg"}, {:"@@!s"=>2}, {:"@@!t1"=>2}, {"a"=>1, "@@!:2"=>3, "@@!:{\"@@!:3\":4}"=>5}]
+
+  def transform_hash(obj)
+    if obj.size == 1 && obj.keys.first =~ /\A@@!([a-z].*)/
+      cookie = $1
+      value = obj.values.first
+      case cookie
+      when "s"
+        CBOR::Simple.new(value)
+      when "b"
+        ::Base64.urlsafe_decode64(value)
+      when /\At(\d+)\z/
+        CBOR::Tagged.new($1.to_i, value)
+      else
+        fail ArgumentError.new("Unknown CBOR-JSON encoding @@!#{cookie}")
+      end
+    else
+      Hash[obj.map {|k, v| [ transform(
+                               if k =~ /\A@@!:(.*)\z/
+                                 JSON.parse($1)
+                               else
+                                 k
+                               end), transform(v)]}]
+    end
+  end
+
+end

data/lib/cbor-transform.rb

@@ -0,0 +1,72 @@
+class CBOR::Transform
+
+  def transform(obj)
+    case obj
+    when NilClass
+      transform_nil(obj)
+    when FalseClass, TrueClass
+      transform_bool(obj)
+    when CBOR::Simple
+      transform_simple(obj)
+    when Float
+      transform_float(obj)
+    when Integer
+      transform_integer(obj)
+    # XXX should probably handle Symbol
+    when String
+      case obj.encoding
+      when Encoding::BINARY
+        transform_bytes(obj)
+      else
+        transform_text(obj)
+      end
+    when Array
+      transform_array(obj)
+    when Hash
+      transform_hash(obj)
+    when CBOR::Tagged
+      transform_tag(obj)
+    end
+  end
+
+  def transform_nil(obj)
+    obj
+  end
+
+  def transform_bool(obj)
+    obj
+  end
+
+  def transform_simple(obj)
+    obj
+  end
+
+  def transform_float(obj)
+    obj
+  end
+
+  def transform_integer(obj)
+    obj
+  end
+
+  def transform_bytes(obj)
+    obj
+  end
+
+  def transform_text(obj)
+    obj
+  end
+
+  def transform_array(obj)
+    obj.map {|x| transform(x)}
+  end
+
+  def transform_hash(obj)
+    Hash[obj.map {|k, v| [transform(k), transform(v)]}]
+  end
+
+  def transform_tag(obj)
+    CBOR::Tagged.new(transform(obj.tag), transform(obj.value))
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.6.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cbor-packed
+  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:
@@ -109,6 +123,7 @@ executables:
 - cborseq2pretty.rb
 - cborseq2yaml.rb
 - diag2cbor.rb
+- diag2diag.rb
 - diag2pretty.rb
 - json2cbor.rb
 - json2json.rb
@@ -134,6 +149,7 @@ files:
 - bin/cborseq2pretty.rb
 - bin/cborseq2yaml.rb
 - bin/diag2cbor.rb
+- bin/diag2diag.rb
 - bin/diag2pretty.rb
 - bin/json2cbor.rb
 - bin/json2json.rb
@@ -149,6 +165,8 @@ files:
 - lib/cbor-diagnostic.rb
 - lib/cbor-pretty.rb
 - lib/cbor-pure.rb
+- lib/cbor-transform-j.rb
+- lib/cbor-transform.rb
 - lib/half.rb
 homepage: http://cbor.io/
 licenses:
@@ -169,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation