cbor-diag 0.5.2 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cae376f67f107a4ed6bb608651c4bec9cb0cfcd5c1358b550de3526f8f0074b4
-  data.tar.gz: f8bb4444a580def29def96821f5bf6b66df06a7952a408b519f53d4588671b1a
+  metadata.gz: f7ce2154bebe9237e19250a539bbd30ef39834545bfd2a6e3300f21b1fab9d96
+  data.tar.gz: 5986f189ccf5d06fc90fda46890cbbc97768929355b039d823cb6046768c5cca
 SHA512:
-  metadata.gz: 4959ea26cad2ed447d866a2c10ef7dac25e43719c5b79056fdfa6162277904798fa95be5029b6ba9eca51e707487c97fe9a9647cb4257e685eebf7ae5d3fa2b0
-  data.tar.gz: ddf871f586e7d120bb0395a6c52eba584116640edf9f88eee85e7ac289543c346f244cd7dac01e466d169327672004a36a3a20fae14753fe4594ba59ef8209aa
+  metadata.gz: cdc1056ab81a9eb943ddcf1e63025634d51d61a3bd2f06bc98f10aa220b322fb5d0742e1511c8c144df9c0d1ce63be2d810e16395e15e2c48418c6bad9242950
+  data.tar.gz: 3e9e5ec91bce71170dae957881de0453b3d4841bfe3e5936f6600e8fc299190038cf6be591e3b3cfca186a93bd9170bf0ef15ae0bee4b425b213a9becec32910

data/bin/cbor2diag.rb

@@ -1,7 +1,13 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
 
+
+if ARGV[0] == "-e"
+  embcbor = true
+  ARGV.shift
+end
+
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-puts o.cbor_diagnostic
+puts o.cbor_diagnostic(try_decode_embedded: !!embcbor)

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

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

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/bin/cborseq2yaml.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'cbor-pure'
+
+class Array
+  def to_yaml_style()
+    all? {|x| Integer === x } && length < 20 ? :inline : super
+  end
+end
+
+ARGF.binmode
+i = ARGF.read
+while i != ''
+  o, i = CBOR.decode_with_rest(i)
+  puts YAML.dump(o)
+end
+

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.2"
+  s.version = "0.5.8"
   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.2
+  version: 0.5.8
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2020-12-23 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,6 +73,10 @@ executables:
 - cbor2json.rb
 - cbor2pretty.rb
 - cbor2yaml.rb
+- cborleader2diag.rb
+- cborseq2json.rb
+- cborseq2neatjson.rb
+- cborseq2yaml.rb
 - diag2cbor.rb
 - diag2pretty.rb
 - json2cbor.rb
@@ -73,6 +91,10 @@ 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
 - bin/json2cbor.rb
@@ -90,7 +112,7 @@ homepage: http://cbor.io/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []