cbor-diag 0.5.6 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae41bb7e1848fa9d94cab6800cefabdd26d548269cd0266c95b5b58871285823
-  data.tar.gz: 103c9fb602ddae05b03c3fd0b995a4404e69f19d2ef26485d9a1fd564fdcc469
+  metadata.gz: 799e03826e188ceb7e806525aef9d4971cea0053c07f1094bac526b1e99a29e7
+  data.tar.gz: 7efd3e6f5d50032221b1e2f04002f687d9aa6e68d4d1a8ba3ec8a64dc70abab0
 SHA512:
-  metadata.gz: 36e147a02dfbd2acc023b3c5af8afe6ca45e95bf31681861376188452a259fc89dcea55567dd058b0ac2bc1b1ca8d72d633f8f9be7469b362b228d48c37362c8
-  data.tar.gz: 492be6bcc3e8e01e22f324d64a622ce9df3a8da8fa92c1c97d7831cd63e6686c434f9ca153d663783feffb90129ca8f47bd9aa0ce16d0a28679d47fa49a9115e
+  metadata.gz: bef058a2dff6cc52450725c59f965d97eb8e2fc95397aaf205edf02256b4421ae20915a43773b7114e00823ee981af5056077579209ecb2526b9253be04f1db7
+  data.tar.gz: e2d64f6f25f0be0830d1e7c3d19a7f14601468d620328e4d4697a786db15262a8e970745d3d162e617d2bd0ee1aecedbbb42dbff847e7770303de62f44983a3d

data/bin/cbor2diag.rb

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
 
+options = ''
+while /\A-([etu]+)\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,
+                       utf8: /u/ === options)

data/bin/cborseq2diag.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'cbor-diagnostic'
+
+options = ''
+while /\A-([etu]+)\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,
+                          utf8: /u/ === 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.6"
+  s.version = "0.5.11"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.11
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-18 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,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []