edn-abnf 0.5.12 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ba3b4253e30d6651e6e0727be9f658b58a36679baee743474049a28311ed6f0
-  data.tar.gz: caa326ac4833ab0a14d3706f582e7b6d2101422a03e94b9469da1271fa80a5a2
+  metadata.gz: 14d01eaa954b101a5d9b1a38cba3f8c26e5e6c6dbc8c18229c8d09fc8d03eb70
+  data.tar.gz: 6edb1eacbac4466bfcc4825880eae1c96c93a5af3d4a14cb5104a2c8d203ef98
 SHA512:
-  metadata.gz: 3839a117495a4250634de8da4be6eda871d57e0eb62a1a92255c087befe3bcc05cea05e58a973cb6bba4af22146f6b4e8f47bd72a1accf80585b7743bec08be2
-  data.tar.gz: 183f1878a8a73bee41172e9b079089d03e425eabcd52ab66fe69b4357b2e52a96c1b7b0ec64920fd6b6549f331652292911ec392c4d5e605d2aff53ad796146e
+  metadata.gz: 154a66988a780298dace8e6604b2a7bac226944384c869981fcf181e41c873ae19ca31193349c1cc094aec49b84075da6c622cc0691d974823860329dce0a15c
+  data.tar.gz: 48a564790134c0d21ffc19beefff2456892e3472356c021f2e5181adc333e96ea63882046c56572dd7935a17e6f129e47b86161dc796f121697b53da5525eb0f

data/bin/edn-abnf

@@ -5,6 +5,7 @@ require 'yaml'
 require 'treetop'
 require 'json'
 require 'cbor-pretty'
+require 'cbor-deterministic'
 
 # Temporary fix for name conflicts between cbor-diag and edn-abnf
 diag_path = $LOAD_PATH.grep(/gems\/cbor-diag/).first
@@ -40,7 +41,7 @@ require 'ostruct'
 
 $error = 0
 
-output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor]
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"decoder-test"]
 
 $options = OpenStruct.new
 begin
@@ -199,6 +200,49 @@ when :pretty, :hex, :cbor
   else
     fail "Cannot happen"
   end
+when :"decoder-test"
+  fail "Not a map" unless Hash === result
+  tests = result.delete("tests")
+  fail "tests not an array" unless Array === tests
+  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
+      begin
+        r = CBOR.decode(encoded)
+        fail "#{encoded.inspect} unexpectedly decodes, as #{r.cbor_diagnostic}"
+      rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError
+        # p [r, t, encoded]
+      rescue => e
+        puts "*** Unexpected error:"
+        p [e, r, t, encoded.hexi]
+      end
+    end
+  else
+    tests.each do |t|
+      encoded = t.delete("encoded")
+      fail t unless encoded
+      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: 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
   warn ["Unknown target format: ", $options.target].inspect
 end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.12"
+  s.version = "0.5.14"
   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"

data/lib/cbor-diag-support.rb

@@ -1,4 +1,10 @@
 module CBOR
+  module CoreExt                 # extend cbor-pure
+    def cbor_same?(other)
+      to_deterministic_cbor == other.to_deterministic_cbor
+    end
+  end
+
   Box = Struct.new(:value, :options) do
     def to_s
       value.to_s

data/lib/cbor-diagnostic-app/b64grammar.rb

@@ -669,11 +669,9 @@ module B64GRAMMAR
     r0
   end
 
-
-  class Parser < Treetop::Runtime::CompiledParser
-    include B64GRAMMAR
-  end
 end
 
-B64GRAMMARParser = B64GRAMMAR::Parser
+class B64GRAMMARParser < Treetop::Runtime::CompiledParser
+  include B64GRAMMAR
+end
 

data/lib/cbor-diagnostic-app/dtgrammar.rb

@@ -707,11 +707,9 @@ module DTGRAMMAR
     r0
   end
 
-
-  class Parser < Treetop::Runtime::CompiledParser
-    include DTGRAMMAR
-  end
 end
 
-DTGRAMMARParser = DTGRAMMAR::Parser
+class DTGRAMMARParser < Treetop::Runtime::CompiledParser
+  include DTGRAMMAR
+end
 

data/lib/cbor-diagnostic-app/hgrammar.rb

@@ -763,11 +763,9 @@ module HGRAMMAR
     r0
   end
 
-
-  class Parser < Treetop::Runtime::CompiledParser
-    include HGRAMMAR
-  end
 end
 
-HGRAMMARParser = HGRAMMAR::Parser
+class HGRAMMARParser < Treetop::Runtime::CompiledParser
+  include HGRAMMAR
+end
 

data/lib/cbor-diagnostic-app/ipgrammar.rb

@@ -1690,11 +1690,9 @@ module IPGRAMMAR
     r0
   end
 
-
-  class Parser < Treetop::Runtime::CompiledParser
-    include IPGRAMMAR
-  end
 end
 
-IPGRAMMARParser = IPGRAMMAR::Parser
+class IPGRAMMARParser < Treetop::Runtime::CompiledParser
+  include IPGRAMMAR
+end
 

data/lib/parser/edngrammar.rb

@@ -9132,5 +9132,5 @@ module EDNGRAMMAR
   end
 end
 
-EDNGRAMMARParser = EDNGRAMMAR::Parser
+(remove_const(:EDNGRAMMARParser) if const_defined?(:EDNGRAMMARParser)) rescue nil; EDNGRAMMARParser = EDNGRAMMAR::Parser
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors:
 - Carsten Bormann
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.2
 specification_version: 4
 summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF
 test_files: []