cbor-diag 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af225452a464f0da9d3c7e3773df7960b8cceb61
-  data.tar.gz: 89b51efa1e56a620a871ebb28e07f307acb7f912
+  metadata.gz: d862488b37e86df16ba27e69a7e2bdb28c0fb039
+  data.tar.gz: bf923d105ff2c9770430b0ac401720daff93573b
 SHA512:
-  metadata.gz: bfee8e6a5331f98b65527ff59b09c2db6c63103928ddcae82c6e3e7a4fb2baa3592ce39abc8b4b384288db30bee81ac4935d822c2ca07839005ad66a0a0a3eb5
-  data.tar.gz: ae170dd44bf170ba2ee46b1124b1309785d85142a8016579d1823ff704ff4d26db7b1a865b28b6b64bf51e8f26e6b0140bc83cb4e090839af9551088ea1430d8
+  metadata.gz: b0ac9fda4585effeae900c06727e737c33d20872f0c7ed1703d428cceb80c36d5289d8d06a6dfda1b6f8d2e905888cb29a7edd54942d1eb556ed48e739e38a39
+  data.tar.gz: 6e76c59d8011d343a9d1d8e90cc14d9f1e4f1b4a886c006ae30bd5eb36eddb7997301a48b060846e4e811c45a5e539040e9117088e32d47c3c7c831839526b31

data/bin/pretty2diag.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'cbor-pretty'
+require 'cbor-diagnostic'
+
+
+def extractbytes(s)
+  s.each_line.map {|ln| ln.sub(/#.*/, '')}.join.scan(/[0-9a-fA-F][0-9a-fA-F]/).map {|b| b.to_i(16).chr(Encoding::BINARY)}.join
+end
+
+i = extractbytes(ARGF)
+o = CBOR.decode(i)
+puts o.cbor_diagnostic

data/cbor-diag.gemspec

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

@@ -4,19 +4,19 @@ unless defined?(CBOR)
 end
 
 class Object
-  def cbor_diagnostic
+  def cbor_diagnostic(_=nil)
     inspect
   end
 end
 
 class NilClass
-  def cbor_diagnostic
+  def cbor_diagnostic(_=nil)
     "null"
   end
 end
 
 class Float
-  def cbor_diagnostic           # do a little bit of JSON.stringify gaming (ECMA-262, 9.8.1)
+  def cbor_diagnostic(_=nil)           # do a little bit of JSON.stringify gaming (ECMA-262, 9.8.1)
     a = abs
     if a < 1 && a >= 1e-6
       inspect.sub(/(\d)[.](\d+)e-(\d+)/) {"0.#{"0" * ($3.to_i - 1)}#{$1}#{$2}"}
@@ -40,35 +40,43 @@ class String
   def hexbytes(sep = '')
     bytes.map{|x| "%02X" % x}.join(sep)
   end
-  def cbor_diagnostic
+  def cbor_diagnostic(options = {})
     if lengths = cbor_stream?
       pos = 0
-      "(_ #{lengths.map{|l| r = self[pos, l].cbor_diagnostic; pos += l; r}.join(", ")})"
+      "(_ #{lengths.map{|l| r = self[pos, l].cbor_diagnostic(options); pos += l; r}.join(", ")})"
     else
       if encoding == Encoding::BINARY
-        "h'#{hexbytes}'"
+        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
+          "h'#{hexbytes}'"
+        end
       else
-        inspect.encode(Encoding::UTF_16BE).bytes.each_slice(2).map {
-          |c1, c2| c = (c1 << 8)+c2; c < 128 ? c.chr : '\u%04x' % c }.join
+        if options[:utf8]
+          inspect
+        else
+          inspect.encode(Encoding::UTF_16BE).bytes.each_slice(2).map {
+            |c1, c2| c = (c1 << 8)+c2; c < 128 ? c.chr : '\u%04x' % c }.join
+        end
       end
     end
   end
 end
 
 class Array
-  def cbor_diagnostic
-    "[#{"_ " if cbor_stream?}#{map(&:cbor_diagnostic).join(", ")}]"
+  def cbor_diagnostic(options = {})
+    "[#{"_ " if cbor_stream?}#{map {|x| x.cbor_diagnostic(options)}.join(", ")}]"
   end
 end
 
 class Hash
-  def cbor_diagnostic
-    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic}: #{v.cbor_diagnostic}}}.join(", ")}}"
+  def cbor_diagnostic(options = {})
+    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}}"
   end
 end
 
 class CBOR::Tagged
-  def cbor_diagnostic
-    "#{tag}(#{data.cbor_diagnostic})"
+  def cbor_diagnostic(options = {})
+    "#{tag}(#{data.cbor_diagnostic(options)})"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ executables:
 - json2cbor.rb
 - json2pretty.rb
 - pretty2cbor.rb
+- pretty2diag.rb
 - yaml2cbor.rb
 extensions: []
 extra_rdoc_files: []
@@ -77,6 +78,7 @@ files:
 - bin/json2cbor.rb
 - bin/json2pretty.rb
 - bin/pretty2cbor.rb
+- bin/pretty2diag.rb
 - bin/yaml2cbor.rb
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb