cddl 0.8.26 → 0.12.14

data/test/test-cddl.rb

@@ -275,7 +275,7 @@ b = (
   (x: int // y: int), z: int
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)
@@ -293,7 +293,7 @@ b = ( z: int
   (x: int // y: int)
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)

data/test-data/b64c-sloppy.cddl

@@ -0,0 +1 @@
+a = text .b64c-sloppy 'mnoabcdue=='

data/test-data/b64c.cddl

@@ -0,0 +1 @@
+a = text .b64c 'mnoabcd'

data/test-data/b64u-strict.cddl

@@ -0,0 +1,12 @@
+a = text .b64u bytes
+
+;;gp 10
+
+;;vp "AAAA"
+;;vp "AAA-"
+;;vp "AAA_"
+; fail with 0.11.5:
+;;vp "AAA+"
+;;vp "AAA/"
+;;vp "AAA="
+;;vp "+kd8"

data/test-data/b64u.cddl

@@ -0,0 +1 @@
+a = text .b64u 'mnoabcd'

data/test-data/base32.cddl

@@ -0,0 +1 @@
+a = text .b32 'mnoabcd'

data/test-data/base32hex.cddl

@@ -0,0 +1 @@
+a = text .h32 'mnoabcd'

data/test-data/cat-re.cddl

@@ -1,2 +1,4 @@
 foo = text .regexp myregexp
 myregexp = "A" .cat "B"
+
+;;gp 10

data/test-data/catb64.cddl

@@ -0,0 +1,8 @@
+a1 = '' .cat a2
+a2 = text .b64u ain
+; a = "e30" .b64u ain
+ain = '{}'
+
+;;gp 3
+;;vp 'e30'
+;;vp "e30"

data/test-data/decimal-warn.cddl

@@ -0,0 +1 @@
+s = [text .decimal 4711, text .base10 4712]

data/test-data/decimal.cddl

@@ -0,0 +1 @@
+a = text .decimal uint

data/test-data/decimal2.cddl

@@ -0,0 +1 @@
+a = text .decimal 4711

data/test-data/dotplus1.cddl

@@ -0,0 +1,3 @@
+a = b<13..15>
+b<T> = #7.<32 .plus T>
+; cddl dotplus1.cddl gp 10

data/test-data/dotplus2.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = #7.<T .plus 32>
+; cddl dotplus.cddl gp 10

data/test-data/dotplus3.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = 32.5 .plus T
+; cddl dotplus4.cddl gp 10

data/test-data/dotplus4.cddl

@@ -0,0 +1,3 @@
+a = d<17..19>
+d<T> = T .plus 32.5
+; cddl dotplus4.cddl gp 10

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"

data/test-data/hex.cddl

@@ -0,0 +1 @@
+a = text .hex 'mnoabcd'

data/test-data/hexlc.cddl

@@ -0,0 +1 @@
+a = text .hexlc 'mnoabcd'

data/test-data/hexuc.cddl

@@ -0,0 +1 @@
+a = text .hexuc 'mnoabcd'

data/test-data/join.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", "c"])

data/test-data/joini.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", 3])

data/test-data/joinx.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", text])

data/test-data/json.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 1, {"a": "b"}])

data/test-data/json1.cddl

@@ -0,0 +1,15 @@
+; JWT-JWS = text .join ([
+;              b64u<jwt-headers>, ".",
+;              b64u<jwt-payload>, ".",
+;              b64u<jwt-signature>])
+; ; a = jwt-headers
+; ; a = b64u<"abc"> ; fails
+; ; a = b64u<'abc'> ; succeeds
+; b64u<B> = text .b64u B
+jwt-headers = '' .cat jwt-headers1
+jwt-headers1 = text .json jwt-headermap
+jwt-headermap = { * text => any } ; simplified
+jwt-payload = bytes
+jwt-signature = bytes
+
+;;gp 10

data/test-data/json2.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 2, {"a": "b"}])

data/test-data/jwt.cddl

@@ -0,0 +1,15 @@
+JWT-JWS = text .join ([
+             b64u<jwt-headers>, ".",
+             b64u<jwt-payload>, ".",
+             b64u<jwt-signature>])
+; a = jwt-headers
+; a = b64u<"abc"> ; fails
+; a = b64u<'abc'> ; succeeds
+b64u<B> = text .b64u B
+jwt-headers = '' .cat jwt-headers1
+jwt-headers1 = text .json jwt-headermap
+jwt-headermap = { * text => any } ; simplified
+jwt-payload = bytes
+jwt-signature = bytes
+
+;;gp 10

data/test-data/prim.cddl

@@ -0,0 +1,7 @@
+start = [a, e, b, c, d]
+a = false
+e = undefined
+b = float32
+; c = #7.32
+c = #6.<12>(3)
+d = #6.13(4)

data/test-data/printf.cddl

@@ -0,0 +1,2 @@
+a = text .printf (["%8d %06d", ~arr])
+arr = [uint, uint]

data/test-data/printf0.cddl

@@ -0,0 +1 @@
+my_label = text .printf (["0x%x: %a", 4711, 81.5])

data/test-data/printf1.cddl

@@ -0,0 +1,2 @@
+my_alg_sha = hexlabel<4>
+hexlabel<K> = text .printf (["0x%04x", K])

data/test-data/printf2.cddl

@@ -0,0 +1,2 @@
+my_alg_sha = hexlabel<int>
+hexlabel<K> = text .printf (["0x%04x", K])

data/test-data/printf3.cddl

@@ -0,0 +1,2 @@
+any_alg = hexlabel<1..20>
+hexlabel<K> = text .printf (["0x%04x", K])

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,13 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.26
+  version: 0.12.14
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -28,18 +27,18 @@ dependencies:
   name: abnc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,16 +69,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
@@ -94,6 +93,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: base45_lite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: scanf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A parser, generator, and validator for CDDL
 email: cabo@tzi.org
 executables:
@@ -119,13 +160,20 @@ files:
 - test-data/abnf3.cddl
 - test-data/ambig.cddl
 - 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
+- test-data/base32hex.cddl
 - test-data/basic_syntax_example.cddl
 - test-data/bat.cddl
 - test-data/bpv7.cddl
 - test-data/bpv7a.cddl
 - test-data/bpv7b.cddl
 - test-data/cat-re.cddl
+- test-data/catb64.cddl
 - test-data/cdni-ct.cddl
 - test-data/complex-occ.cddl
 - test-data/coral.cddl
@@ -135,8 +183,17 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/decimal-warn.cddl
+- test-data/decimal.cddl
+- test-data/decimal2.cddl
 - test-data/det1.cddl
+- test-data/dotplus1.cddl
+- test-data/dotplus2.cddl
+- 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
@@ -148,6 +205,9 @@ files:
 - test-data/grasp-09.cddl
 - test-data/grasp-v1.cddl
 - test-data/grasp-v2X.cddl
+- test-data/hex.cddl
+- test-data/hexlc.cddl
+- test-data/hexuc.cddl
 - test-data/homenet-de.cddl
 - test-data/homenet-fe.cddl
 - test-data/ifmap-base-2.0v17.cddl
@@ -157,7 +217,14 @@ files:
 - test-data/jcr-ex.cddl
 - test-data/jim-cut-2.cddl
 - test-data/jim-cut.cddl
+- test-data/join.cddl
+- test-data/joini.cddl
+- test-data/joinx.cddl
+- test-data/json.cddl
+- test-data/json1.cddl
+- test-data/json2.cddl
 - test-data/jsoniodef.cddl
+- test-data/jwt.cddl
 - test-data/kevin5.cddl
 - test-data/lint1.cddl
 - test-data/map-group.cddl
@@ -178,6 +245,12 @@ files:
 - test-data/oidbat.cddl
 - test-data/patch1.cddl
 - test-data/plus.cddl
+- test-data/prim.cddl
+- test-data/printf.cddl
+- test-data/printf0.cddl
+- test-data/printf1.cddl
+- test-data/printf2.cddl
+- test-data/printf3.cddl
 - test-data/reused_named_group.cddl
 - test-data/sasl.cddl
 - test-data/sequence.cddl
@@ -190,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
@@ -198,11 +272,10 @@ files:
 - test-data/yangid.cddl
 - test-data/yaron1.cddl
 - test/test-cddl.rb
-homepage: http://github.com/cabo/cddl
+homepage: https://www.rfc-editor.org/rfc/rfc8610#appendix-F
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,15 +283,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 4.0.8
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []