cbor-diag 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d46971cb4fe65291d5659c969853e2776bc803a4260d3831107ee5b801c0fc76
-  data.tar.gz: e54c7b33742851467b3b631220a65558f5493c61eb011a973a5283191d4cbe0c
+  metadata.gz: 36101912bb86f641e4c04004a324eba80c29a7cdcee234a2a6f1164e3ea9d516
+  data.tar.gz: 6f816256cfdba5cdab63e732e59f42ff8359c7e4d25cb53ca0ce643cd08b44f5
 SHA512:
-  metadata.gz: bbc73e462fd6fa8a3e44255d4d85847512a320a2e75d141c657849cd21fd1c975429fcaea9798e257ffb681bebec3c6f19d1f50461cc8f36b04a73592ba61fc8
-  data.tar.gz: dad9a127145e629293892154b6b7e51dde44151138f7596f006226ed238a6bc74740f291b40818123d435a25b0f6eb739cb67a8c7c74f3c1c49cd4ab207fe386
+  metadata.gz: cab76345e0b6622175a9dcafe58c90d870e45cc09fdefa521b5b1c9166090226b3a946d845df086792137002203357b6a35e1aec9e0382345e2b2fe2c4c4b9a7
+  data.tar.gz: de0383207189021f25c9e37eeb563872e74d5344b9dd2087d3394dc8162de7a1052c38d60052988208242fb66ab97833ac262c09f4f6c3877c8ae3d041afab83

data/cbor-diag.gemspec

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

@@ -1101,7 +1101,7 @@ module CBOR_DIAG
   end
 
   module StringPart0
-    def partval; text_value end
+    def partval; text_value.b end
   end
 
   module StringPart1
@@ -1545,12 +1545,12 @@ module CBOR_DIAG
                  data = s.elements.map(&:partval).join.b
                  app = a.text_value
                  # Find a better place to put a default initialization
-                 CBOR_DIAG::APPS ||= Hash.new { |h, k|
+                 CBOR_DIAG.const_set(:APPS, Hash.new { |h, k|
                    h[k] = begin CBOR_DIAG.const_get("App_#{app}")
                           rescue NameError
                             raise ArgumentError.new("cbor-diagnostic: Unknown application-oriented extension #{k}")
                           end
-                 }
+                 }) unless CBOR_DIAG.const_defined?(:APPS)
                  CBOR_DIAG::APPS[app].decode(app, data)
                end
   end

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,10 +4,14 @@
 unless defined?(CBOR)
   require 'cbor-pure'
 end
+require 'json'
+
+UPPERCASE_HEX = ENV["UPPERCASE_HEX"]
+HEX_FORMAT = UPPERCASE_HEX ? "%02X" : "%02x"
 
 class String
   def hexbytes(sep = '')
-    bytes.map{|x| "%02x" % x}.join(sep)
+    bytes.map{|x| HEX_FORMAT % x}.join(sep)
   end
 end
 
@@ -72,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}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-02-04 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.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation