cbor-diag 0.5.3 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219440f7c8efe521712a5ff6e8d86f1e376500d79171dc9a4ddc35cfbbd29aaf
-  data.tar.gz: 80abd4c1066b9043fe545f1eb2d1f114b0fd7b0ee3f91cbcbe9c773380be05c8
+  metadata.gz: c881af90822830a91b0437b51dcc4f321c4672adf94bacea8e22b756ff87474c
+  data.tar.gz: 1c35d18f9f7df6690f4930e26da43e1f50282e0b227a8da0e905b86d262e9866
 SHA512:
-  metadata.gz: d99f7141a3869988774d483b28da6173e243e32d977f6a4d9bd1180efaf9d83aa199a27adc37a3dcb1d8fec01329cb4ef3d0be176d0ce4c7ce57d399cd42bee5
-  data.tar.gz: 261c34436a23e04ac2e8831946914585ca46464f5fd00eae106a51ca5340fc301519456bab25f893c368108742a567a72a4dcbe1bc4c6a0bc0c37e0726b13b27
+  metadata.gz: 75f6d9bccbb3f122f8873b7614b52c93a597f21447a42c9961c289611e22d00644a954307323213a0ec74ad003321fac1541499a8d1d7a0b30a262b57d014628
+  data.tar.gz: 19b4d359e3e3d9702e7aae54347e018c74999f11af36c7a88525885114ba82e4e8631287d4ab32ae344580d772c59ffe41a6f6144558e4430e04ca85e4f35b7d

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/cborleader2diag.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'cbor-diagnostic'
+
+ARGF.binmode
+i = ARGF.read
+o,r = CBOR.decode_with_rest(i)
+if r != ''
+  warn "** ignoring rest of #{r.bytesize} bytes after first CBOR data item"
+end
+puts o.cbor_diagnostic

data/bin/cborseq2neatjson.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'cbor-pure'
+require 'neatjson'
+
+ARGF.binmode
+i = ARGF.read
+while i != ''
+  o, i = CBOR.decode_with_rest(i)
+  puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)
+end

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.3"
+  s.version = "0.5.9"
   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"
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json'
+  s.add_dependency 'neatjson'
 end

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.3
+  version: 0.5.9
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: neatjson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: cbor-diag implements diagnostic notation for CBOR, RFC 7049
 email: cabo@tzi.org
 executables:
@@ -59,7 +73,9 @@ executables:
 - cbor2json.rb
 - cbor2pretty.rb
 - cbor2yaml.rb
+- cborleader2diag.rb
 - cborseq2json.rb
+- cborseq2neatjson.rb
 - cborseq2yaml.rb
 - diag2cbor.rb
 - diag2pretty.rb
@@ -75,7 +91,9 @@ files:
 - bin/cbor2json.rb
 - bin/cbor2pretty.rb
 - bin/cbor2yaml.rb
+- bin/cborleader2diag.rb
 - bin/cborseq2json.rb
+- bin/cborseq2neatjson.rb
 - bin/cborseq2yaml.rb
 - bin/diag2cbor.rb
 - bin/diag2pretty.rb
@@ -94,7 +112,7 @@ homepage: http://cbor.io/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,9 +127,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: []