cbor-diag 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a24a03600aade04721f48ff64a5b1dc708bb23f52e9c579072ddeb25f14dab
-  data.tar.gz: ffd756ef269c0176c07ec8570e098adcee32fa7f505a25bf2e87bfee1007a7a9
+  metadata.gz: 38def274f572f92dcd5b6cfd02fc4e7b0bc2006f5339f5db046e1b9bb388fcaa
+  data.tar.gz: f8027b5da38f62e5b0411f55c182fae2025768be56ed978775e491273a19e150
 SHA512:
-  metadata.gz: 85030b510f22cd8d78259dadba6af46be60de6ec95a61b1b8dfaded0a9efaa42ba6bd33f4c4edbf8f5856bbbd59510366c4b196f6adf6109f6129b450f28fdf0
-  data.tar.gz: c71f5e097c5891f0bfe21f1540e0b329e40c56b14baf381aff4da47dcc5d4676f6e9074d544f95e33619c5c8837c3685f16121dd9717da3d7367785400e32bdc
+  metadata.gz: 8ad0cd6b46dd03e2fd5457a440bea503ece1e4dc293dde4a701f41f9434092d26e4576711afc321ceddf9a661e81e7b4ada743f37a0c25f4e04c475bbfd9fed0
+  data.tar.gz: 8a55d75ba512cbceeed3f995d10615a0666d892449c13c1b729d69858fe3180b4fe4eee2ac06dca4bb8a31787a40d0b687f0205df77bd6fae5b6226e194e18cd

data/cbor-diag.gemspec

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

@@ -2730,7 +2730,7 @@ module CBOR_DIAG
   module Map3
     def to_rb
       r = if e = a1.elements
-        Hash[ [e[0].to_rb] + e[2].elements.map {|x| x.kp.to_rb } ]
+        Hash.cbor_from_entries([e[0].to_rb] + e[2].elements.map {|x| x.kp.to_rb })
       else
         {}
       end

data/lib/cbor-diagnostic.rb

@@ -109,7 +109,7 @@ end
 
 class Hash
   def cbor_diagnostic(options = {})
-    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}}"
+    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}#{cbor_map_lost_warning}}"
   end
 end
 

data/lib/cbor-pretty.rb

@@ -18,16 +18,22 @@ class String
     ret.encode(Encoding::UTF_16BE) # exception if bad
     ret
   end
+  attr_accessor :cbor_warnings
 end
 
 
 module CBOR
-  def self.pretty(s, indent = 0, max_target = 40)
-    Buffer.new(s).pretty_item_final(indent, max_target)
+  def self.pretty(s, indent = 0, max_target = 40, warnings: nil)
+    b = Buffer.new(s)
+    warnings ||= s.cbor_warnings
+    b.warnings = warnings if warnings
+    b.pretty_item_final(indent, max_target)
   end
 
-  def self.pretty_seq(s, indent = 0, max_target = 40)
+  def self.pretty_seq(s, indent = 0, max_target = 40, warnings: nil)
     b = Buffer.new(s)
+    warnings ||= s.cbor_warnings
+    b.warnings = warnings if warnings
     res = ''                    # XXX: not all indented the same
     while !b.empty?
       res << b.pretty_item_final(indent, max_target, true)
@@ -37,16 +43,24 @@ module CBOR
 
   class Buffer
 
+  attr_accessor :warnings
+
   def take_and_print(n, prefix = '')
     s = take(n)
     @out << prefix
     @out << s.hexbytes
     s
   end
-  
+
+  def warning_message
+    if warnings
+      warnings[@item_pos]
+    end
+  end
+
   def pretty_item_streaming(ib)
     res = nil
-    @out << " # #{MT_NAMES[ib >> 5]}(*)\n"
+    @out << " # #{MT_NAMES[ib >> 5]}(*)#{warning_message}\n"
     @indent += 1
     case ib >>= 5
     when 2, 3, 4, 5
@@ -62,6 +76,7 @@ module CBOR
   MT_NAMES = ["unsigned", "negative", "bytes", "text", "array", "map", "tag", "primitive"]
 
   def pretty_item
+    @item_pos = @pos
     ib = take_and_print(1, '   ' * @indent).ord
     ai = ib & 0x1F
     val = case ai
@@ -73,7 +88,7 @@ module CBOR
           when 31; return pretty_item_streaming(ib)
           else raise "unknown additional information #{ai} in ib #{ib}"
           end
-    @out << " # #{MT_NAMES[ib >> 5]}(#{val})\n"
+    @out << " # #{MT_NAMES[ib >> 5]}(#{val})#{warning_message}\n"
     @indent += 1
     case ib >>= 5
     when 6

data/lib/cbor-pure.rb

@@ -35,6 +35,31 @@ module CBOR
   end
   Object.send(:include, CoreExt)
 
+  class ::Hash
+    attr_accessor :cbor_entries
+    def self.cbor_from_entries(entries)
+      h = Hash[entries]
+      if h.size != entries.size   # dupkeys found
+        h.cbor_entries = entries
+      end
+      h
+    end
+    def cbor_map_push(key, value, entries)
+      entries << [key, value]
+      n = size
+      self[key] = value
+      if n == size # key was overwritten
+        self.cbor_entries = entries
+      end
+    end
+    def cbor_map_lost_warning
+      if cbor_entries
+        lost = cbor_entries.size - size
+        " / #{lost} DUP KEY#{"S" if lost > 1} LOST / "
+      end
+    end
+  end
+
   class Break
   end
   BREAK = Break.new.freeze
@@ -217,6 +242,9 @@ module CBOR
         d.each {|di| add(di)}
       end
     when Hash
+      if warning = d.cbor_map_lost_warning
+        (@buffer.cbor_warnings ||= {})[@buffer.bytesize] = warning
+      end
       if d.cbor_stream?
         @buffer << 0xbf
         d.each {|k, v| add(k); add(v)}
@@ -266,8 +294,10 @@ module CBOR
     when 5
       result = Hash.new
       result.cbor_stream!
+      entries = []
       while (key = decode_item(true)) != BREAK
-        result[key] = decode_item
+        value = decode_item
+        result.cbor_map_push(key, value, entries)
       end
       result
     when 7
@@ -327,7 +357,7 @@ module CBOR
     when 2; take(val).force_encoding(Encoding::BINARY)
     when 3; take(val).force_encoding(Encoding::UTF_8)
     when 4; atleast(val); Array.new(val) { decode_item }
-    when 5; atleast(val<<1); Hash[Array.new(val) {[decode_item, decode_item]}]
+    when 5; atleast(val<<1); Hash.cbor_from_entries(Array.new(val) {[decode_item, decode_item]})
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Carsten Bormann
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []