edn-abnf 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b5019bb0f6f80ce030b7af41a9a354c5a73caa653a151618766444d293fea1
-  data.tar.gz: '09c8ac9b5f3fffba27602bf2ecfdcf21d85ac00e26298fedf829c403a09a6c31'
+  metadata.gz: e0cfa7f5a3324396126a17a2530147bff309fec468d512ede0ca8c436591f44c
+  data.tar.gz: 6850c6fa052ba8b687ac8a0332ed05f27a32781e5132c76754dfd24ad2928e55
 SHA512:
-  metadata.gz: bc5fbfc1624358d1308ec3d42de5738558eef3c7601c67a6e32a1a4008423fb865506c6c9a5272f0e8288d25899d7f4dd5cda106ec727c0301837b85f1af5a7b
-  data.tar.gz: 1cdee66c10564ec2b0633bdd3d02ad25711a5c81e6de5cef7bb2042cb30c912d5a72d55b3444e066ac42f1690209397049868cdbdce75088193dac019452d1e6
+  metadata.gz: dd717eab5c11238c954e70ecf9575524aa1826fccbe7d885c9ac9e5946783314181443ddd17c6af22e5b18a841f472252871e14a3d480e701cdba8c996142658
+  data.tar.gz: ae2f0a9e57e9d4cb64cf3ea2f00f7f5d3e8e47141c2ec1e05276f6c4c3d859661d76003617c9b22c7773cbf067603bdf883c788ad670335e97c4757a25ff1b15

data/bin/edn-abnf

@@ -41,7 +41,7 @@ require 'ostruct'
 
 $error = 0
 
-output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"decoder-test"]
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector"]
 
 $options = OpenStruct.new
 begin
@@ -65,6 +65,9 @@ begin
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end
+    opts.on("-c", "--[no-]cbor", "input is encoded CBOR data item, not EDN") do |v|
+      $options.cbor = v
+    end
     opts.on("-tFMT", "--to=FMT",
             output_formats,
             "Target format (#{output_formats.join("/")}, default: diag)") do |v|
@@ -90,12 +93,8 @@ rescue Exception => e
   exit 1
 end
 
-
 if !$options.edn
-  if ARGV == []
-    warn op
-    exit 1
-  end
+  ARGF.binmode if $options.cbor
   $options.edn = ARGF.read
 else
   if ARGV != []
@@ -106,6 +105,10 @@ end
 edn_file = $options.edn
 
 if $options.lines
+  if $options.cbor
+    warn "*** -l and -c don't combine"
+    exit 1
+  end
   CSV.parse(edn_file) do |ok, ednin, out|
     if ok[0] == "#"
       puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
@@ -165,11 +168,18 @@ if $options.lines
 end
 
 begin
-  edn = EDN.from_edn(edn_file)
-  result = edn.tree               # XXX .tree?
+  if $options.cbor
+    result = CBOR.decode(edn_file)
+  else
+    edn = EDN.from_edn(edn_file)
+    result = edn.tree               # XXX .tree?
+  end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
   puts "** #{e}"
   exit 1
+rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
+  puts "** (encoded CBOR input:) #{e}"
+  exit 1
 end
 
 case $options.target
@@ -200,12 +210,13 @@ when :pretty, :hex, :cbor
   else
     fail "Cannot happen"
   end
-when :"decoder-test"
+when :"test-vector"
   fail "Not a map" unless Hash === result
   tests = result.delete("tests")
   fail "tests not an array" unless Array === tests
-  if result.delete("fail")
-    p result
+  failing_tests = result.delete("fail")
+  puts result.inspect << ", #{tests.size} tests"
+  if failing_tests
     tests.each do |t|
       encoded = t.delete("encoded")
       fail t unless encoded
@@ -220,23 +231,26 @@ when :"decoder-test"
       end
     end
   else
-    p result
     tests.each do |t|
       encoded = t.delete("encoded")
       fail t unless encoded
-      roundtrip = t.delete("roundtrip")
-      fail "not implemented: roundtrip is #{roundtrip.inspect} in #{t.inspect}" if roundtrip
-      # p t
+      roundtrip = t.delete("roundtrip") { true } # default is true
       decoded = t.delete("decoded") { :"no-decoded"}
       fail "no decoded" if decoded == :"no-decoded"
       begin
         r = CBOR.decode(encoded)
         if !r.cbor_same?(decoded)
-          puts "*** unexpected: #{r.inspect} for #{decoded.inspect} in #{t.inspect}"
+          puts "*** unexpected: decoding #{r.inspect}, expected #{decoded.inspect} in #{t.inspect}"
         end
       rescue => e
         puts "*** decode failure: #{e}"
       end
+      if roundtrip
+        rt = CBOR.encode(decoded)
+        if rt != encoded
+          puts "*** unexpected: encoding #{rt.inspect}, expected #{encoded.inspect} in #{t.inspect}"
+        end
+      end
     end
   end
 else

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.13"
+  s.version = "0.5.15"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.15
 platform: ruby
 authors:
 - Carsten Bormann