cbor-diag 0.7.6 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b3574121e832e41781f99faacfb3d3bb0e1e444df3fce1b6cd70f58329e690
-  data.tar.gz: e1652badb328ae93c6037c264a46c5960172f20e84f2f23685bdc9f6bcce846c
+  metadata.gz: fd65812eff17fff91777d0c28f076a1fa5f65dd0a972980243e8a324f1e822a0
+  data.tar.gz: 85d593a5feb8593d0e4b24a73078aa68718208b81bb8c00836e711990a5c9d48
 SHA512:
-  metadata.gz: 6d7e56e106693d746602e936772d15d2aefce325fea284a9ddcc4eecf0e79333c05577f2f4a0fa2600f7e415ab947df01b5ee0c4a67964f2b5de1559e9430331
-  data.tar.gz: '09425230ba25ffe5b99e3725ad62408f893ee60257493ce3b4ea125254a4bdf6dd1fd36ccd9b846c028e570dce74f7e8147dde98488c864ed3e16c44b50a5a1f'
+  metadata.gz: 14a85c16fdbd914650a52bd982dddef3991e83cae52b504355dcb536be3c9eea91b14bac25d84b98e57f5daa986e76dcd420d81b1f3aebf8e81becf6d63b7e64
+  data.tar.gz: 9b24cf004311b95c512b866f71b9c05dadab3c5e676f835eac3a305f32e0cce81bae36f12ea10381918cfd3415af2ea9b644e054981bdf7de162edc1d28ddcbe

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.7.6"
+  s.version = "0.8.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"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'treetop', '~>1'
-  s.add_dependency 'json'
+  s.add_dependency 'json_pure'
   s.add_dependency 'neatjson'
   s.add_dependency 'cbor-deterministic'
   s.add_dependency 'cbor-canonical'

data/lib/cbor-diag-parser.rb

@@ -2497,7 +2497,11 @@ module CBOR_DIAG
                   if last = t[-1]
                     last << "=" * (4 - last.size)
                   end
-                  t.join.tr("-_", "+/").unpack("m0")[0]
+                  begin
+                    t.join.tr("-_", "+/").unpack("m0")[0]
+                  rescue ArgumentError
+                    raise ArgumentError.new("invalid base64 #{t}")
+                  end
                 end
   end
 

data/lib/cbor-pretty.rb

@@ -13,6 +13,11 @@ class String
   def hexbytes(sep = '')
     bytes.map{|x| HEX_FORMAT % x}.join(sep)
   end
+  def to_json_514_workaround
+    ret = to_json
+    ret.encode(Encoding::UTF_16BE) # exception if bad
+    ret
+  end
 end
 
 
@@ -76,7 +81,7 @@ module CBOR
     when 2, 3
       @out << '   ' * (@indent)
       s = take_and_print(val)
-      @out << " # #{s.force_encoding(Encoding::UTF_8).to_json rescue s.inspect}"
+      @out << " # #{s.force_encoding(Encoding::UTF_8).to_json_514_workaround rescue s.inspect}"
       @out << "\n"
     when 4; val.times { pretty_item }
     when 5; val.times { pretty_item; pretty_item}
@@ -92,9 +97,9 @@ module CBOR
     unless seq
       raise if @pos != @buffer.size
     end
-    target = [@out.each_line.map {|ln| ln =~ /#/ || 0}.max, max_target].min
+    target = [@out.each_line.map {|ln| ln.index('#') || 0}.max, max_target].min
     @out.each_line.map {|ln|
-      col = ln =~ /#/
+      col = ln.index('#')
       if col && col < target
         ln[col, 0] = ' ' * (target - col)
       end

metadata

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