cbor-diag 0.5.5 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5412d8c84a3817a547ef58b0533cc2d6669a4bf348ca89e47b9df48b7bb3dfe
-  data.tar.gz: 335516f432fc310852e56ace91cbdb2ed0c141883d877b2c62aef1557cf856e4
+  metadata.gz: 6860bf8b982a54e759b642bce8fcfc410c944ffb194ebd76942a9d791108d2f2
+  data.tar.gz: d26df44cd7ff9616bf8ad80cc2785d633bdeb86e338084c3ce7b71fc4467ab5c
 SHA512:
-  metadata.gz: a8f5c21b327d527fd3682d97a52684a3cf1526c00997e6978c6252ca53c495ae01722a437f15ff2377e619e429f5a89ed01732ab953edfdbe7ac7c345a77be30
-  data.tar.gz: 3d0e26906c4d3e46f415db082ffc95c0589fd9c430abcd2cf1199f4d789ace055978d9678f88d55dfa0fba1a583b1b6c23aa784baae3828a4c504aa32ab39bde
+  metadata.gz: 1562d3a70922fd80e4a4721e377ae4de759bf018727f9918c4181e320427f39e03610ad1c9df0ca7189a8ad4cb6457b35ccc464fdefe883375f82ed6a91fb77f
+  data.tar.gz: 54a47f48c5fdea45e52c9e408118978ba924586835c7fe1efe03c1ece3a5c70ae72f09a140aecde8a6a06882ac822a35ad20de4451b388e3bcc7b1cd29ffb1f3

data/bin/cbor2diag.rb

@@ -1,7 +1,13 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
 
+options = ''
+while /\A-([et]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-puts o.cbor_diagnostic
+puts o.cbor_diagnostic(try_decode_embedded: /e/ === options, bytes_as_text: /t/ === options)

data/bin/cborseq2diag.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'cbor-diagnostic'
+
+options = ''
+while /\A-([et]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+ARGF.binmode
+i = ARGF.read
+while !i.empty?
+  o, i = CBOR.decode_with_rest(i)
+  out = o.cbor_diagnostic(try_decode_embedded: /e/ === options, bytes_as_text: /t/ === options)
+  if i.empty?
+    puts out
+  else
+    print out << ', '
+  end
+end

data/cbor-diag.gemspec

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

@@ -2265,7 +2265,7 @@ module CBOR_DIAG
   module B64string2
     #"
                 def to_rb;
-                  t = s.text_value.chars.each_slice(4).map(&:join)
+                  t = s.text_value.gsub(/\s/, '').chars.each_slice(4).map(&:join)
                   if last = t[-1]
                     last << "=" * (4 - last.size)
                   end
@@ -2297,11 +2297,11 @@ module CBOR_DIAG
       i2, s2 = index, []
       s3, i3 = [], index
       loop do
-        if has_terminal?(@regexps[gr = '\A[0-9a-zA-Z_\\-+/]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[0-9a-zA-Z_\\-+/\\s]'] ||= Regexp.new(gr), :regexp, index)
           r4 = true
           @index += 1
         else
-          terminal_parse_failure('[0-9a-zA-Z_\\-+/]')
+          terminal_parse_failure('[0-9a-zA-Z_\\-+/\\s]')
           r4 = nil
         end
         if r4
@@ -2315,11 +2315,11 @@ module CBOR_DIAG
       if r3
         s5, i5 = [], index
         loop do
-          if has_terminal?(@regexps[gr = '\A[=]'] ||= Regexp.new(gr), :regexp, index)
+          if has_terminal?(@regexps[gr = '\A[=\\s]'] ||= Regexp.new(gr), :regexp, index)
             r6 = true
             @index += 1
           else
-            terminal_parse_failure('[=]')
+            terminal_parse_failure('[=\\s]')
             r6 = nil
           end
           if r6

data/lib/cbor-diagnostic.rb

@@ -46,6 +46,20 @@ class String
       "(_ #{lengths.map{|l| r = self[pos, l].cbor_diagnostic(options); pos += l; r}.join(", ")})"
     else
       if encoding == Encoding::BINARY
+        if options[:try_decode_embedded] && self != ''
+          begin
+            rest = self
+            result = []
+            while rest != ''
+              dv, rest = CBOR.decode_with_rest(rest)
+              result << dv
+            end
+            return "<< #{result.map{|x| x.cbor_diagnostic(options)}.join(", ")} >>"
+          rescue RuntimeError => e
+            # that didn't work out, so continue with other options
+            # puts e.backtrace
+          end
+        end
         if options[:bytes_as_text] && (u8 = dup.force_encoding(Encoding::UTF_8)).valid_encoding?
           "'#{u8.cbor_diagnostic(options)[1..-2].gsub("'", "\\\\'")}'" # \' is a backref, so needs \\'
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.10
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ executables:
 - cbor2pretty.rb
 - cbor2yaml.rb
 - cborleader2diag.rb
+- cborseq2diag.rb
 - cborseq2json.rb
 - cborseq2neatjson.rb
 - cborseq2yaml.rb
@@ -92,6 +93,7 @@ files:
 - bin/cbor2pretty.rb
 - bin/cbor2yaml.rb
 - bin/cborleader2diag.rb
+- bin/cborseq2diag.rb
 - bin/cborseq2json.rb
 - bin/cborseq2neatjson.rb
 - bin/cborseq2yaml.rb
@@ -112,7 +114,7 @@ homepage: http://cbor.io/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []