cbor-diag 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d189c84e8268cba0d305a69be2be6171fb6fe5
-  data.tar.gz: 71145361b05c19d21bd26320fae09d34720ba60c
+  metadata.gz: 878d675b3f7f6e5f8f352fa4f6add752bba8dd0b
+  data.tar.gz: 7cb35a91b219b057abcab0b06c21a44a82ad8c25
 SHA512:
-  metadata.gz: ce77f679d0fcc80d9c1e60567548dbe3eb6d50af296b4e5d9f04fea10105cc1346b829fb4d41b2ef79359f946f501688b2f1ba6e051d4cb362faf676ba267eb1
-  data.tar.gz: 6b5b719f66a3add0320e6638ffb0f77e7f10edbc5e65491f626fcf4e7b89c631edd11a3f0a702041b80bd9e7ff330cb21ca924b779bd5cfe9fec477b0a5082c9
+  metadata.gz: b7e7cac5754327ee644345d61b31f6a187c1ec990d04b21292bcd5f6bffc698c6c956749875bbe37c734bd83e49e06bf377316939fc16427178110bc542b08bc
+  data.tar.gz: bdabdc08e7e9922033b445e10e7d64ec3bf3d7979aeadd35406aa20219a4b189823c09835ef8570fc6a600c1b466206690a1fc9b77d55538d40201f86f1563d3

data/bin/pretty2cbor.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+
+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
+
+print(extractbytes(ARGF))

data/bin/yaml2cbor.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'cbor-pure'
+
+if ARGV[0] == "-v"
+  verbose = true
+  ARGV.shift
+end
+
+$stdout.binmode
+i = ARGF.read
+o = CBOR.encode(YAML.load(i))
+print o
+warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if verbose

data/cbor-diag.gemspec

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

@@ -182,6 +182,11 @@ class CBOR
     self
   end
 
+  def atleast(n)
+    left = @buffer.bytesize - @pos
+    raise OutOfBytesError.new(n - left) if n > left
+  end
+
   def take(n)
     opos = @pos
     @pos += n
@@ -257,8 +262,8 @@ class CBOR
       end
     when 2; take(val).force_encoding(Encoding::BINARY)
     when 3; take(val).force_encoding(Encoding::UTF_8)
-    when 4; Array.new(val) { decode_item }
-    when 5; Hash[Array.new(val) {[decode_item, decode_item]}]
+    when 4; atleast(val); Array.new(val) { decode_item }
+    when 5; atleast(val<<1); Hash[Array.new(val) {[decode_item, decode_item]}]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,8 @@ executables:
 - diag2pretty.rb
 - json2cbor.rb
 - json2pretty.rb
+- pretty2cbor.rb
+- yaml2cbor.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -74,6 +76,8 @@ files:
 - bin/diag2pretty.rb
 - bin/json2cbor.rb
 - bin/json2pretty.rb
+- bin/pretty2cbor.rb
+- bin/yaml2cbor.rb
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb
 - lib/cbor-diagnostic.rb
@@ -100,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation