cddl 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29d5d85e11598502b09d04e3b08a7ada9b6d0d8a9eb0e425bb01da81b92532b
-  data.tar.gz: 61c2a191c264c34600f0b66a8e7cfb2ea1359f3954676828a56a63aa25e3015c
+  metadata.gz: b43f61521d3730b97b25f84b2d978fad5ee52034a4e106f524c90c2457c1f6f3
+  data.tar.gz: b0750334302b1feabc654b5d69ea0feedf969997f403ab7fd96db0eb76213b6d
 SHA512:
-  metadata.gz: 671d119f1cb328151c0631cbcd808f5a32d1f82d6c715a64cb5e5c9702b3452c996278a6b5055613de74b00f76489a9874037b336ac3a760947d4a2526d84cc9
-  data.tar.gz: 8146d9b66bb87e84b2179507fb9144012676be726dd5f4312da2482a047e46429a6d41d5b1d49097724aa8cfd68519be06e6e8f860e97f0cbc187de0c20242ca
+  metadata.gz: 5e96654b3760ed3a0b104f64b9f6f431b562a6ce1c40d4df887af646e6fe906f879c8fccf24ff5fb0090e3e5daefcd22e22290cee9dc87802fc7581c7e4257dd
+  data.tar.gz: ad3fb0fc1c243463575274678efeb2ee28c54303bc0db07e146e0742d77800af41d159683885c6d90d84a2f94685c4443a237cb31406bd8e3f513c3367e05af1

data/bin/cddl

@@ -22,6 +22,13 @@ def usage
   exit EX_USAGE
 end
 
+def utfify(s)
+  s.force_encoding(Encoding::UTF_8).scrub { |c|
+      warn "*** replaced invalid UTF-8 byte sequence #{c.inspect} by U+FFFD REPLACEMENT CHARACTER"
+      0xFFFD.chr(Encoding::UTF_8)
+  }
+end
+
 def read_arg(arg, remember_fn = true)
   if arg == "-"
     $fn = "(stdin)" if remember_fn
@@ -29,15 +36,12 @@ def read_arg(arg, remember_fn = true)
   else
     usage unless arg
     $fn = arg if remember_fn
-    File.read(arg, mode: "rb").force_encoding(Encoding::UTF_8).scrub { |c|
-      warn "*** replaced invalid UTF-8 byte sequence #{c.inspect} by U+FFFD REPLACEMENT CHARACTER"
-      0xFFFD.chr(Encoding::UTF_8)
-    }
+    File.read(arg, mode: "rb")
   end
 end
 
 def parser
-  @parser ||= CDDL::Parser.new(read_arg(ARGV[0], false))
+  @parser ||= CDDL::Parser.new(utfify(read_arg(ARGV[0], false)))
 end
 
 def my_pp(v)
@@ -102,7 +106,12 @@ begin
       instance = if $sequence
                    CBOR.decode("\x9f".b << instance.b << "\xff".b)
                  else
-                   CBOR.decode(instance.b) rescue JSON.load(instance)
+                   begin
+                     CBOR.decode(instance.b)
+                   rescue => e
+                     warn e.inspect if verbose
+                     JSON.load(utfify(instance))
+                   end
                  end
       instance = instance.cbor_clone if $annotate && ENV["EXPERIMENTAL_ANNOTATE"]
       warn "#{fn}:" if verbose
@@ -110,6 +119,7 @@ begin
       # my_pp ann
       instance.cbor_add_annotations_from(ann) rescue nil
       my_diag(instance) if $annotate
+      warn "ann: #{!!ann}" if verbose
       unless ann
         retcode = 1
       end

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.12.1'
+  s.version = '0.12.3'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/data/cddl.abnf

@@ -41,7 +41,7 @@ grpent = [occur S] [memberkey S] type optcom
        / [occur S] groupname [genericarg] optcom ; preempted by above
        / [occur S] "(" S group S ")" optcom
 
-memberkey = type1 S "=>"
+memberkey = type1 S ["^" S] "=>"
           / bareword S ":"
           / value S ":"
 

data/test-data/valemb.cddl

@@ -0,0 +1,16 @@
+cwt = [
+  bstr .cbor protected-map,
+  unprotected-map,
+  bstr .cbor payload-map,
+  bstr ; signature
+]
+
+protected-map = {
+   &(alg: 1) => int, 
+   ? &(typ: 16) => text,
+   * key => any   
+}
+
+unprotected-map = ()
+key = "key"
+payload-map = { payload: "map"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -263,6 +263,7 @@ files:
 - test-data/toerless0.cddl
 - test-data/toerless1.cddl
 - test-data/two_anonymous_groups.cddl
+- test-data/valemb.cddl
 - test-data/wrong1.cddl
 - test-data/wrong1a.cddl
 - test-data/wrong2.cddl
@@ -290,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.