cbor-diag 0.10.3 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38def274f572f92dcd5b6cfd02fc4e7b0bc2006f5339f5db046e1b9bb388fcaa
-  data.tar.gz: f8027b5da38f62e5b0411f55c182fae2025768be56ed978775e491273a19e150
+  metadata.gz: 9386c9d64142f904cccc4806ce98863db188e7c730932f40cacfa5968088e43c
+  data.tar.gz: 110f77e616a233a503042a0860f5c72007bbb7f7f01ba319343ed328de2ab5aa
 SHA512:
-  metadata.gz: 8ad0cd6b46dd03e2fd5457a440bea503ece1e4dc293dde4a701f41f9434092d26e4576711afc321ceddf9a661e81e7b4ada743f37a0c25f4e04c475bbfd9fed0
-  data.tar.gz: 8a55d75ba512cbceeed3f995d10615a0666d892449c13c1b729d69858fe3180b4fe4eee2ac06dca4bb8a31787a40d0b687f0205df77bd6fae5b6226e194e18cd
+  metadata.gz: 5db4dfa3cabd1c3f14a6395558266bbb47beaf603bdbac4ee541d3b66cddca861398ecbc5830ca98b15100658add992845677d987e6db25510b230e2c02f730c
+  data.tar.gz: 315b19d49cd07961bb46bc38320310094f0632fc01c40b943ecfe6e8e85a4823c426cda3912a86b7607e6cb2552c20ab4e39d89c4040cef7c8ce2acac8b348df

data/bin/cbor2diag.rb

@@ -6,7 +6,7 @@ require 'cbor-canonical'
 
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqunN")
+options = cbor_diagnostic_process_args("cdetpqunNT")
 
 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("cdetpqunN")
+options = cbor_diagnostic_process_args("cdetpqunNT")
 
 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("cdetpqunN")
+options = cbor_diagnostic_process_args("cdetpqunNT")
 
 ARGF.binmode
 i = ARGF.read

data/bin/diag2diag.rb

@@ -9,19 +9,14 @@ require 'cbor-pretty'
 require 'cbor-diagnostic'
 
 require 'cbor-diagnostic-helper'
-options = cbor_diagnostic_process_args("cdetpqunN")
+options = cbor_diagnostic_process_args("cdetpqunNT")
 
 parser = CBOR_DIAGParser.new
 
 i = ARGF.read.b                 # binary to work around treetop performance bug
 if result = parser.parse(i)
   decoded = result.to_rb
-  out = case decoded
-        when CBOR::Sequence
-          decoded.elements
-        else
-          [decoded]
-        end.map {|x| cbor_diagnostic_output(x, options)}.join(", ")
+  out = cbor_diagnostic_output(decoded, options)
   puts out
 else
   warn "*** can't parse #{i}"

data/bin/pretty2diag.rb

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

data/cbor-diag.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.10.3"
+  s.version = "0.11.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"
   s.email = "cabo@tzi.org"
   s.license = "Apache-2.0"
   s.homepage = "http://cbor.io/"
-  s.has_rdoc = false
+  # s.has_rdoc = false
   # s.files = `git ls-files`.split("\n") << "lib/cbor-diag-parser.rb"
   # s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
   s.files = Dir['lib/**/*.rb'] + %w(cbor-diag.gemspec) + Dir['bin/**/*.rb']

data/lib/cbor-diagnostic-helper.rb

@@ -4,14 +4,19 @@ require 'cbor-canonical'
 
 def cbor_diagnostic_process_args(chars)
   options = ''
-  while /\A-(?:([#{chars}]+)|([#{chars}]*)a(.*))\z/ === ARGV[0]
+  while /\A-(?:([#{chars}]+)|([#{chars}]*)([aw])(.*))\z/ === ARGV[0]
     ARGV.shift
     options << $1 if $1
     options << $2 if $2
-    if s = $3
+    if (o = $3) && (s = $4)
       s = ARGV.shift if s == ""
-      s.split(",").each do |a|
-        require "cbor-diagnostic-app/#{a}"
+      case o
+      when "a"
+        s.split(",").each do |a|
+          require "cbor-diagnostic-app/#{a}"
+        end
+      when "w"
+        options << "w#{s.to_i}"
       end
     end
   end
@@ -32,5 +37,7 @@ def cbor_diagnostic_output(o, options)
                     bytes_as_text: /t/ === options,
                     utf8: /u/ === options,
                     nan: /n/ === options,
-                    no_nan: /N/ === options)
+                    no_nan: /N/ === options,
+                    terminator: /T/ === options,
+                    wrap: if /w([0-9]+)/ === options; $1.to_i; end)
 end

data/lib/cbor-diagnostic.rb

@@ -9,6 +9,19 @@ class Object
   def cbor_diagnostic(_=nil)
     inspect
   end
+  def cbor__indent_helper(options)
+    indent = options[:indent] || ''
+    indent2 = indent + "  "
+    indented_options = options.merge({indent: indent2})
+    [indent, indent2, indented_options]
+  end
+
+end
+
+class Symbol
+  def cbor_diagnostic(_=nil)
+    to_s.cbor_diagnostic        # TODO add option for tagging
+  end
 end
 
 class NilClass
@@ -103,13 +116,29 @@ end
 
 class Array
   def cbor_diagnostic(options = {})
-    "[#{"_ " if cbor_stream?}#{map {|x| x.cbor_diagnostic(options)}.join(", ")}]"
+    indent, indent2, indented_options = cbor__indent_helper(options)
+    pieces = map {|x| x.cbor_diagnostic(indented_options)}
+    one_line = "[#{"_ " if cbor_stream?}#{pieces.join(", ")}]"
+    if !(wrap = options[:wrap]) || pieces == [] || one_line.length + indent.length < wrap # XXX
+      one_line
+    else
+      open, close = options[:terminator] ? ["\n#{indent2}", ",\n#{indent}"] : [" ", " "]
+      "[#{"_" if cbor_stream?}#{open}#{pieces.join(",\n#{indent2}")}#{close}]"
+    end
   end
 end
 
 class Hash
   def cbor_diagnostic(options = {})
-    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}#{cbor_map_lost_warning}}"
+    indent, indent2, indented_options = cbor__indent_helper(options)
+    pieces = map {|x| x.map {|y| y.cbor_diagnostic(indented_options)}.join(": ")} # XXX key/value split
+    one_line = "{#{"_ " if cbor_stream?}#{pieces.join(", ")}#{cbor_map_lost_warning}}"
+    if !(wrap = options[:wrap]) || pieces == [] || one_line.length + indent.length < wrap # XXX
+      one_line
+    else
+      open, close = options[:terminator] ? ["\n#{indent2}", ",\n#{indent}"] : [" ", " "]
+      "{#{"_" if cbor_stream?}#{open}#{pieces.join(",\n#{indent2}")}#{close}#{cbor_map_lost_warning}}"
+    end
   end
 end
 
@@ -124,9 +153,16 @@ class CBOR::Sequence
     if elements == []
       "/ empty CBOR sequence /"
     else
-      elements.map{ |el|
-        el.cbor_diagnostic(options)
-      }.join(", ")
+      indent, _indent2, indented_options = cbor__indent_helper(options)
+      pieces = elements.map{ |el|
+        el.cbor_diagnostic(indented_options)
+      }
+      one_line = pieces.join(", ")
+      if !(wrap = options[:wrap]) || one_line.length + indent.length < wrap # XXX
+        one_line
+      else
+        "#{pieces.join(",\n#{indent}")}#{",\n" if options[:terminator]}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.1
 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.7.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []