cbor-diag 0.7.3 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd4a194804ec997ed7310f36e5cef08c40160beb2ac8e9e033c2f99f1229ecf
-  data.tar.gz: 95586ac379631db9eb7dc8c8d80e8c1051f2687cf4e88a8c5c04eafe73182218
+  metadata.gz: 94b3574121e832e41781f99faacfb3d3bb0e1e444df3fce1b6cd70f58329e690
+  data.tar.gz: e1652badb328ae93c6037c264a46c5960172f20e84f2f23685bdc9f6bcce846c
 SHA512:
-  metadata.gz: 6ba5dcecddabf04f26857fd9ea1d4d3fc52cb8fa8dc4bfff37eab622a34fab506bda010d87246394cd289896e12a6fac7622a976a533fdb0a8f8160cc739af2e
-  data.tar.gz: 55c33fd36cfaabeb1256a27bf03dc4ad90b7e22deac9631e8d382bd903b45d096a087242773f559dd968f672719954062d8edc4c11763f3dde71ab450c7d9ad1
+  metadata.gz: 6d7e56e106693d746602e936772d15d2aefce325fea284a9ddcc4eecf0e79333c05577f2f4a0fa2600f7e415ab947df01b5ee0c4a67964f2b5de1559e9430331
+  data.tar.gz: '09425230ba25ffe5b99e3725ad62408f893ee60257493ce3b4ea125254a4bdf6dd1fd36ccd9b846c028e570dce74f7e8147dde98488c864ed3e16c44b50a5a1f'

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.7.3"
+  s.version = "0.7.6"
   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-diagnostic.rb

@@ -2,6 +2,7 @@
 unless defined?(CBOR)
   require 'cbor-pure'
 end
+require 'json'
 
 class Object
   def cbor_diagnostic(_=nil)
@@ -55,7 +56,7 @@ class String
               result << dv
             end
             return "<< #{result.map{|x| x.cbor_diagnostic(options)}.join(", ")} >>"
-          rescue RuntimeError => e
+          rescue StandardError => e
             # that didn't work out, so continue with other options
             # puts e.backtrace
           end
@@ -67,9 +68,9 @@ class String
         end
       else
         if options[:utf8]
-          inspect
+          to_json
         else
-          inspect.encode(Encoding::UTF_16BE).bytes.each_slice(2).map {
+          to_json.encode(Encoding::UTF_16BE).bytes.each_slice(2).map {
             |c1, c2| c = (c1 << 8)+c2; c < 128 ? c.chr : '\u%04x' % c }.join
         end
       end

data/lib/cbor-pretty.rb

@@ -4,6 +4,7 @@
 unless defined?(CBOR)
   require 'cbor-pure'
 end
+require 'json'
 
 UPPERCASE_HEX = ENV["UPPERCASE_HEX"]
 HEX_FORMAT = UPPERCASE_HEX ? "%02X" : "%02x"
@@ -75,7 +76,7 @@ module CBOR
     when 2, 3
       @out << '   ' * (@indent)
       s = take_and_print(val)
-      @out << " # #{s.inspect}"
+      @out << " # #{s.force_encoding(Encoding::UTF_8).to_json rescue s.inspect}"
       @out << "\n"
     when 4; val.times { pretty_item }
     when 5; val.times { pretty_item; pretty_item}

data/lib/cbor-transform-j.rb

@@ -51,7 +51,7 @@ class CBOR::Transform_jr < CBOR::Transform
       when "b"
         ::Base64.urlsafe_decode64(value)
       when /\At(\d+)\z/
-        CBOR::Tagged.new($1.to_i, value)
+        CBOR::Tagged.new($1.to_i, transform(value))
       else
         fail ArgumentError.new("Unknown CBOR-JSON encoding @@!#{cookie}")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.6
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation