cbor-diag 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3528a462928a5e354625093ab38377abd4591b29b8d9c1b999ec8dc46c4b71ce
-  data.tar.gz: 727c825e585e16487d995a4d501726bbe383f26221a2747e6a1b0945fa8ef1dd
+  metadata.gz: 9b0da5131896552d6bd336a401413b35987ce36a8a007a4f495f6be129bb96b9
+  data.tar.gz: a3e51b152b59cadf5b5dda60c1bc2cfc7b8356cccced607ae5b7f5998945b60c
 SHA512:
-  metadata.gz: 46c6dbc28aaf1c2dc8938206ff90b66ab9920b6822dbf47ddbcdb32d465d76c5233400d4401625df25e1c4b99d1afd335b30277c2aee253940abf471ac7c1eee
-  data.tar.gz: '029468920932c7d281d03c11030611c363a275db28386e4db273f57e729841cc822ef18bfd704a5f6f825ce7ff8a1e184095127f4721b828b35dea7f859d584e'
+  metadata.gz: 9939f8edabf591e7e17bf0294589e6208e44f4656ed59c62cabc562e295fc765b2075391320ff51e0fd499c24f305ae372de450d6461f9b68e8d47d0be8575d6
+  data.tar.gz: 57c99ecad423f8c1a556a5e40e24aac0f5fb0fb6efcedb1d3c35ceac94a27a67aabe7215d31f6dc9e57e36633fe69cd81faa903402cb2b78f0030459bcea4d09

data/bin/cborseq2pretty.rb

@@ -4,8 +4,4 @@ require 'cbor-pretty'
 
 ARGF.binmode
 i = ARGF.read
-while !i.empty?
-  o, ni = CBOR.decode_with_rest(i)
-  puts CBOR::pretty(i[0...i.size-ni.size])
-  i = ni
-end
+puts CBOR::pretty_seq(i)

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.12"
+  s.version = "0.5.13"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 7049}
   s.author = "Carsten Bormann"

data/lib/cbor-pretty.rb

@@ -17,6 +17,15 @@ module CBOR
     Buffer.new(s).pretty_item_final(indent, max_target)
   end
 
+  def self.pretty_seq(s, indent = 0, max_target = 40)
+    b = Buffer.new(s)
+    res = ''                    # XXX: not all indented the same
+    while !b.empty?
+      res << b.pretty_item_final(indent, max_target, true)
+    end
+    res
+  end
+
   class Buffer
 
   def take_and_print(n, prefix = '')
@@ -72,11 +81,13 @@ module CBOR
     nil
   end
 
-  def pretty_item_final(indent = 0, max_target = 40)
+  def pretty_item_final(indent = 0, max_target = 40, seq = false)
     @out = ''
     @indent = indent
     pretty_item
-    raise if @pos != @buffer.size
+    unless seq
+      raise if @pos != @buffer.size
+    end
     target = [@out.each_line.map {|ln| ln =~ /#/ || 0}.max, max_target].min
     @out.each_line.map {|ln|
       col = ln =~ /#/

data/lib/cbor-pure.rb

@@ -314,6 +314,10 @@ module CBOR
     ret
   end
 
+  def empty?
+    @pos == buffer.size
+  end
+
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler