cbor-diag 0.9.8 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0f990a039f1c2b0c08af5ff06a25868210f0aaf219810674e254fb3e1dabe9
-  data.tar.gz: 812d69e74907bb80861a277c60f58a17522fa14869eeddc8b2ecfcd78533cb12
+  metadata.gz: 56baddf10e207846f9ef83665454cf578d5ba570523d62f56a5912138096fded
+  data.tar.gz: 19f2e413f8be97389c6663c225d0ba3a5152e1732d600a26beb81a140b9ba346
 SHA512:
-  metadata.gz: 40d28a0d95ffdfcf1badd9dda4d1200385306fe5ceb53492ec6ed246ffe08b763583a0c364d33714c174ffcea4002e57ff46448a0d82a52de5fc7c1247b72a60
-  data.tar.gz: 42c5aaa0fcb2600d6ef515db1d8e9739ba769c2d4ba65e8b4d9948932b08e532f20edee1ed7f7ecbf883186b6f744a404d519fc1f5cb9d03f447fc73172146e8
+  metadata.gz: 94ec9f6276a20a619ccc9e6453e342738ce856ab6d7cba72f9a9d5f16c1b75ce91d7438dbace16ebca9636838e78a5477c764ec65bd0d2ad4f60e2a994d1dee1
+  data.tar.gz: 37c410853afacedda5b238d83c4792781a4bf7a7007f5792222cf64a37beb9000b3375b79d9022ec69ff534ec1f8151ea06155f352b435ad2eab5ba8d3ba0945

data/bin/cbor2diag.rb

@@ -6,7 +6,7 @@ require 'cbor-canonical'
 
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqun")
+options = cbor_diagnostic_process_args("cdetpqunN")
 
 ARGF.binmode
 i = ARGF.read

data/bin/cborleader2diag.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqun")
+options = cbor_diagnostic_process_args("cdetpqunN")
 
 ARGF.binmode
 i = ARGF.read

data/bin/cborseq2diag.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqun")
+options = cbor_diagnostic_process_args("cdetpqunN")
 
 ARGF.binmode
 i = ARGF.read

data/bin/diag2diag.rb

@@ -9,7 +9,7 @@ require 'cbor-pretty'
 require 'cbor-diagnostic'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqun")
+options = cbor_diagnostic_process_args("cdetpqunN")
 
 parser = CBOR_DIAGParser.new
 

data/bin/pretty2diag.rb

@@ -9,7 +9,7 @@ end
 
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqun")
+options = cbor_diagnostic_process_args("cdetpqunN")
 
 
 i = extractbytes(ARGF)

data/cbor-diag.gemspec

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

@@ -1542,7 +1542,7 @@ module CBOR_DIAG
   module Appstring2
     #'
                def to_rb
-                 data = s.elements.map(&:partval).join.b
+                 data = s.elements.map(&:partval).join.force_encoding(Encoding::UTF_8)
                  app = a.text_value
                  # Find a better place to put a default initialization
                  CBOR_DIAG.const_set(:APPS, Hash.new { |h, k|
@@ -3507,9 +3507,11 @@ module CBOR_DIAG
     r0
   end
 
-end
 
-class CBOR_DIAGParser < Treetop::Runtime::CompiledParser
-  include CBOR_DIAG
+  class Parser < Treetop::Runtime::CompiledParser
+    include CBOR_DIAG
+  end
 end
 
+CBOR_DIAGParser = CBOR_DIAG::Parser
+

data/lib/cbor-diagnostic-app/float.rb

@@ -0,0 +1,27 @@
+class CBOR_DIAG::App_float
+  SIZES = {
+    2 => "\xf9".b.freeze,
+    4 => "\xfa".b.freeze,
+    8 => "\xfb".b.freeze,
+  }
+
+  def self.decode(_, s)
+    if CBOR::Sequence === s
+      if s.elements.size != 1
+        raise ArgumentError.new("cbor-diagnostic: float<< #{s.inspect[1...-1]} >>: Argument Error")
+      end
+      s = s.first
+    end
+    unless String === s
+      raise ArgumentError.new("cbor-diagnostic: float<< #{s.inspect} >>: Argument Error")
+    end
+    if s.encoding != Encoding::BINARY
+      s = s.gsub(/\s/, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+    end
+    ssize = SIZES[s.size]
+    unless ssize
+      raise ArgumentError.new("cbor-diagnostic: float<< #{s.inspect} >> size #{s.size} mismatch: Argument Error")
+    end
+    CBOR::decode(ssize + s)
+  end
+end

data/lib/cbor-diagnostic-helper.rb

@@ -31,5 +31,6 @@ def cbor_diagnostic_output(o, options)
   o.cbor_diagnostic(try_decode_embedded: /e/ === options,
                     bytes_as_text: /t/ === options,
                     utf8: /u/ === options,
-                    nan: /n/ === options)
+                    nan: /n/ === options,
+                    no_nan: /N/ === options)
 end

data/lib/cbor-diagnostic.rb

@@ -19,9 +19,14 @@ end
 
 class Float
   def cbor_diagnostic(options = {})           # do a little bit of JSON.stringify gaming (ECMA-262, 9.8.1)
-    if options[:nan] && nan?
-      pl = cbor_nan_toggle
-      return "nan'#{('%a' % pl).gsub("+", "")}'"
+    if nan?
+      if options[:nan]
+        pl = cbor_nan_toggle
+        return "nan'#{('%a' % pl).gsub("+", "")}'"
+      elsif !options[:no_nan]
+        hex = to_cbor[1..-1].bytes.map{|x| "%02x" % x}.join
+        return "float'#{hex}'" unless hex == "7e00"
+      end
     end
     a = abs
     if a < 1 && a >= 1e-6

data/lib/cbor-pure.rb

@@ -302,8 +302,18 @@ module CBOR
         raise "two-byte simple is #{val} but must be between 32 and 255" unless val >= 32;
         Simple.new(val)
       when 25; Half.decode(val)
-      when 26; s.unpack("g").first # cannot go directly from val
-      when 27; s.unpack("G").first #   in Ruby
+      when 26;
+        v = s.unpack("g").first # cannot go directly from val in Ruby
+        if v.nan?
+          # work around quiet bit always set with unpack("g"):
+          # https://bugs.ruby-lang.org/issues/20662
+          qbit = s.getbyte(1)[6]
+          vbytes = [v].pack("G")
+          vbytes.setbyte(1, vbytes.getbyte(1) & 0xf7 | qbit << 3)
+          v = vbytes.unpack("G").first
+        end
+        v
+      when 27; s.unpack("G").first # cannot go directly from val in Ruby
       else
         Simple.new(val)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.1
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - lib/cbor-diag-parser.rb
 - lib/cbor-diagnostic-app/0.rb
 - lib/cbor-diagnostic-app/dt.rb
+- lib/cbor-diagnostic-app/float.rb
 - lib/cbor-diagnostic-app/hash.rb
 - lib/cbor-diagnostic-app/nan.rb
 - lib/cbor-diagnostic-helper.rb