cddl 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b496a36874447ba9821e185ef347fd7360ec404f7b1fc3fb33f5d2d94c33443
-  data.tar.gz: be328f5d7b8fe8426bb7b60b11be9d378d6f26f0e3c5598578c75efb5696663a
+  metadata.gz: 652f1e63847fbed19fceeca1ed0b695b25b5f8aa6d312b2bd17f21c0ac7c6549
+  data.tar.gz: d55f4a0bff69a37b1c6101b11eb003eb93c00df24ede1dded8d7be9844b4afb1
 SHA512:
-  metadata.gz: f8ec72cbdeeb7eb1ecb2b7cd4173af652b06efe76c1ddbb0e8017248f1c9edbec499c7bb6c82099b52fa963f1ac7dd7062ed8e11b0142bcf8197c62166999fb4
-  data.tar.gz: 59cdd71d13a5d9232f5244a644f42f908cd26de059c20f4787ad3e1cae09454145ebff8aa16e69d1efb52bb9387e06940983543b7a3626e76e72188d3f54b13a
+  metadata.gz: 6622daf044d0f5a6d0ce4fe90ac57341526f7723aef0ce49e228edd2284711a44302ab0c3a1a28e3e156676db61afb4477a9b97b27269e1509034c41796ca8b9
+  data.tar.gz: 966fd633edc283925e0e4bbb5ca04cb40de60470044bbbd94e7df41fb05c185f59ff09ae4767d5dea2899491d3f82db50d3feb01a585fe03891d60f073e50557

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -1271,7 +1271,7 @@ module CDDL
                 String === d && (
                 decoded = case conop
                     when :b64u
-                      /=/ !~ d &&
+                      /[+\/=]/ !~ d &&
                       Base64.urlsafe_decode64(d)
                     when :"b64u-sloppy"
                       /[-_=]/ !~ d &&

data/test-data/b64u-strict.cddl

@@ -0,0 +1,10 @@
+a = text .b64u bytes
+
+;;gp 10
+
+;;vp "AAAA"
+;;vp "AAA-"
+;;vp "AAA_"
+;;vp "AAA+"
+;;vp "AAA/"
+;;vp "AAA="

data/test-data/enum.cddl

@@ -0,0 +1,14 @@
+              terminal-color = &basecolors
+              basecolors = (
+                black: 0,  red: 1,  green: 2,  yellow: 3,
+                blue: 4,  magenta: 5,  cyan: 6,  white: 7,
+                reserved: (8..255) .feature "extension"
+              )
+              ; extended-color = &(
+              ;   basecolors,
+              ;   orange: 8,  pink: 9,  purple: 10,  brown: 11,
+              ; )
+
+;;gp 10
+;;vp 42
+;;vp 433

data/test-data/enum1.cddl

@@ -0,0 +1,12 @@
+terminal-color = $terminal-color / text .feature "extension"
+$terminal-color /= &basecolors
+basecolors = (
+               black: "black",  red: "red",  green: "green", 
+             )
+
+pastelcolors = ( pink: "pink", mauve: "mauve", peach: "peach", lavender: "lavender" )
+$terminal-color /= &pastelcolors
+
+;;gp 10
+;;vp "florp"
+;;vp "lavender"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -163,6 +163,7 @@ files:
 - test-data/b.cddl
 - test-data/b64c-sloppy.cddl
 - test-data/b64c.cddl
+- test-data/b64u-strict.cddl
 - test-data/b64u.cddl
 - test-data/badaddr.cddl
 - test-data/base32.cddl
@@ -191,6 +192,8 @@ files:
 - test-data/dotplus3.cddl
 - test-data/dotplus4.cddl
 - test-data/dotsize.cddl
+- test-data/enum.cddl
+- test-data/enum1.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
 - test-data/feature-controller.cddl