cddl 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6553d8156f74c2c630f22f6069c537e53b4f34a3d436df02ce73f99e648cb5
-  data.tar.gz: 175ddf07c82ef984d40c932eb80f8a8d7cdab54823777d8e9482239251756edc
+  metadata.gz: f150cc0a1db8532ed33bd7e9cfde5aa93a32883a4bf9ea7c0197e281acebd4ed
+  data.tar.gz: af5a579a6465b21134583986899ba003b68f55964a92105b977da7765a9d5eaa
 SHA512:
-  metadata.gz: 357a054cb881ab89c00befe26adfcbf9999b8cbd19f400bdd31eccc39a0eb690e50f4552fc446dfa364086987e1187638983e3579e1a3e06084eb874e1311509
-  data.tar.gz: bf8e429cf02926f4c078e7911d73ccffb47ee3c96520f627e33673333061cd85b472e3795a122362fe615c7b73f8ac2ad6ac02290c5f9a0a9ba19ebe3b15fae6
+  metadata.gz: 4cc593dfeac8e95d31d563e098c0cdefc786a25e95245b30f2554a6a2b07fcd75476051e55ddcf350724a7ac5f69b5823b296d771d3bc2ad985c3770687d7727
+  data.tar.gz: d513213818f2b00f88864d799adea6495aa97a011da8a8f722f4091938ddd4d0bbfd27c75959fc893ad86fdbb079f93618442a93fafabb7e58b5ecdb59c87929

data/cddl.gemspec

@@ -1,13 +1,13 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.12.2'
+  s.version = '0.12.4'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
   s.add_dependency('abnc', '~> 0.1.1')
   s.add_dependency('json_pure')
   s.add_dependency('abnftt')
-  s.add_dependency('regexp-examples') # , '1.1.0')
+  s.add_dependency('regexp-examples', '~> 1.5.1') # , '1.1.0')
   s.add_dependency('colorize')
   s.add_dependency('base32', '~> 0.3')
   s.add_dependency('base45_lite', '~> 1.0')

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.2
+  version: 0.12.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-02 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -70,16 +70,16 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -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