cbor-diag 0.5.20 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dbeccb9b1a15bac6beb52ab1388adddac2c19cf5fce92d2184de8120326fb5e
-  data.tar.gz: ccd67a87d8e7c04518e0fc7852e4eac5076182cdbe58a97b7e2daea13acbfc53
+  metadata.gz: 9df17c4bf389a5b7b62a40e0dbe1fb86f8c10df05d0110cf0c6af8ddf83350ce
+  data.tar.gz: 8f853c4e98726ef055378775e21ae90f7192cc9568f77ec782f8d9744324169c
 SHA512:
-  metadata.gz: 1f1cadddbfc82820493a77b7c50eb1bbb365be5a61016ee155f5ab88895f667d4c789d03b6d8e78983b5a765d34c316053dfbe8b730716f3d2979061759624b4
-  data.tar.gz: e3eff5464c68065fb23c2158fba3209880878edb8ecb04bc225bd757b572343f23513856da112377517f2318c5d8c0f2872579e2faa197088eda952ac4e01e48
+  metadata.gz: bbec8c671dc5c080c7abe04f7f2ccd41a611d22f806190a7b41486906bcbe27bcb034fe92271533f4d17ca66732977c8a39ad7f7d5261139bb11f88a577b8d0f
+  data.tar.gz: 83229ae2d83a31294d5ec93fd760e1d8d6056ad1226e5febb1090eab6a7afc16d6bd9511b04943c3ea776640dcdd61a27b86e6682970ba3182af66fb3a4387ee

data/bin/cbor2json.rb

@@ -6,7 +6,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdpq]+)\z/ === ARGV[0]
+while /\A-([cdpqj]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -18,4 +18,8 @@ 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/json2cbor.rb

@@ -6,7 +6,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdpqv]+)\z/ === ARGV[0]
+while /\A-([cdpqvj]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +14,10 @@ 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

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.20"
+  s.version = "0.6.1"
   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-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.20
+  version: 0.6.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,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:
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation