edn-abnf 0.5.11 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0256ffcfa25350ebaec7f12b1e7453022cb598d940e277f1802372517af2f010
-  data.tar.gz: 63d04404a325565ef62008b5df88eb4396e0851b68527f104108b2e8e1b7f4b3
+  metadata.gz: 69b5019bb0f6f80ce030b7af41a9a354c5a73caa653a151618766444d293fea1
+  data.tar.gz: '09c8ac9b5f3fffba27602bf2ecfdcf21d85ac00e26298fedf829c403a09a6c31'
 SHA512:
-  metadata.gz: e91c759504595744b197f522fdd6de6ba1a07add5f994e9adf40899d5e0281fe5ab53d184b841b13f27a9e1ae4cc81786ef3767b6d32cb659125bf9bc1ed56a1
-  data.tar.gz: 4cd259259f9c11a5ff2acdad7da471b98087e5053529b56ec7e144eb207c3caab547041e8fa3eefbcb7a72e17a961152e6e0ff77fab3a983f72ef8a0083ac6d0
+  metadata.gz: bc5fbfc1624358d1308ec3d42de5738558eef3c7601c67a6e32a1a4008423fb865506c6c9a5272f0e8288d25899d7f4dd5cda106ec727c0301837b85f1af5a7b
+  data.tar.gz: 1cdee66c10564ec2b0633bdd3d02ad25711a5c81e6de5cef7bb2042cb30c912d5a72d55b3444e066ac42f1690209397049868cdbdce75088193dac019452d1e6

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,45 @@ 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
+  if result.delete("fail")
+    p result
+    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
+    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
+      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}"
+        end
+      rescue => e
+        puts "*** decode failure: #{e}"
+      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.11"
+  s.version = "0.5.13"
   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

@@ -1991,7 +1991,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|@rawdelim = rd.text_value}.call(s0)
+      r3 = lambda {|(rd)|@rawdelimlength = rd.text_value.length}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2040,7 +2040,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelim.length}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2089,7 +2089,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length < @rawdelim.length}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length < @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -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.11
+  version: 0.5.13
 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: []